Attachment #161873 for bug #267830

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 267830
Collapse All | Expand All




import com.sun.tools.javac.util.Context;

import javax.swing.SwingUtilities;
import javax.tools.Diagnostic;

import org.netbeans.api.annotations.common.CheckForNull;
import org.netbeans.api.annotations.common.NonNull;

import org.netbeans.api.java.source.matching.Pattern;
import org.netbeans.api.lexer.TokenHierarchy;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.project.FileOwnerQuery;
import org.netbeans.modules.java.preprocessorbridge.spi.ImportProcessor;
import org.netbeans.modules.java.source.ElementHandleAccessor;
import org.netbeans.modules.java.source.JavadocHelper;

import org.netbeans.modules.java.source.indexing.JavaCustomIndexer;
import org.netbeans.modules.java.source.parsing.ClasspathInfoProvider;
import org.netbeans.modules.java.source.parsing.FileObjects;
import org.netbeans.modules.java.source.parsing.Hacks;
import org.netbeans.modules.java.source.parsing.JavacParser;
import org.netbeans.modules.java.source.save.DiffContext;
import org.netbeans.modules.java.source.usages.ClassIndexImpl;

            return null;
        }
    }

    /**
     * Extracts diagnostic params from a diagnostic. Gets under hood of Javac
     * Diagnostic objects and extracts parameters which are otherwise just used
     * to produce a message. <b>Keep in mind that the positions and types of parameters
     * may change in each nbjavac update!</b>
     * @param d diagnostic
     * @param index parameter index to extract
     * @return parameter value, null if index is out of range
     * @since 2.16
     */
    public static Object getDiagnosticParam(Diagnostic<?> d, int index) {
        return Hacks.getDiagnosticParam(d, index);
    }
    
    /**
     * Returns all elements of the given scope that are declared after given position in a source.

Lines 308-313 Link Here

(-)a/jshell.support/nbproject/project.xml (+1 lines)
308	<build-prerequisite/>	308	<build-prerequisite/>
309	<compile-dependency/>	309	<compile-dependency/>
310	<run-dependency>	310	<run-dependency>
		311	<specification-version>2.16</specification-version>
311	</run-dependency>	312	</run-dependency>
312	</dependency>	313	</dependency>
313	<dependency>	314	<dependency>




package org.netbeans.modules.jshell.support;

import com.sun.source.util.TreePath;
import com.sun.tools.javac.parser.Tokens;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;

import javax.swing.text.Document;
import javax.tools.Diagnostic;
import org.netbeans.api.java.source.CompilationInfo;
import org.netbeans.api.java.source.SourceUtils;
import org.netbeans.modules.java.hints.spi.OverrideErrorMessage;
//import org.netbeans.modules.java.source.parsing.Hacks;


    
    @Override
    public String createMessage(CompilationInfo info, Diagnostic d, int offset, TreePath treePath, Data data) {
        Object dp = SourceUtils.getDiagnosticParam(d, 0);
        if (dp != Tokens.TokenKind.SEMI) {
            return null;
        }
        
        int off = offset;
        final CharSequence seq = info.getSnapshot().getText();

Return to bug 267830

Lines 87-92 Link Here

(-)a/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java (-1 / +16 lines)
87	import com.sun.tools.javac.util.Context;	87	import com.sun.tools.javac.util.Context;
88		88
89	import javax.swing.SwingUtilities;	89	import javax.swing.SwingUtilities;
		90	import javax.tools.Diagnostic;
90		91
91	import org.netbeans.api.annotations.common.CheckForNull;	92	import org.netbeans.api.annotations.common.CheckForNull;
92	import org.netbeans.api.annotations.common.NonNull;	93	import org.netbeans.api.annotations.common.NonNull;
Lines 103-109 Link Here
103	import org.netbeans.api.java.source.matching.Pattern;	104	import org.netbeans.api.java.source.matching.Pattern;
104	import org.netbeans.api.lexer.TokenHierarchy;	105	import org.netbeans.api.lexer.TokenHierarchy;
105	import org.netbeans.api.lexer.TokenSequence;	106	import org.netbeans.api.lexer.TokenSequence;
106	import org.netbeans.api.project.FileOwnerQuery;
107	import org.netbeans.modules.java.preprocessorbridge.spi.ImportProcessor;	107	import org.netbeans.modules.java.preprocessorbridge.spi.ImportProcessor;
108	import org.netbeans.modules.java.source.ElementHandleAccessor;	108	import org.netbeans.modules.java.source.ElementHandleAccessor;
109	import org.netbeans.modules.java.source.JavadocHelper;	109	import org.netbeans.modules.java.source.JavadocHelper;
Lines 111-116 Link Here
111	import org.netbeans.modules.java.source.indexing.JavaCustomIndexer;	111	import org.netbeans.modules.java.source.indexing.JavaCustomIndexer;
112	import org.netbeans.modules.java.source.parsing.ClasspathInfoProvider;	112	import org.netbeans.modules.java.source.parsing.ClasspathInfoProvider;
113	import org.netbeans.modules.java.source.parsing.FileObjects;	113	import org.netbeans.modules.java.source.parsing.FileObjects;
		114	import org.netbeans.modules.java.source.parsing.Hacks;
114	import org.netbeans.modules.java.source.parsing.JavacParser;	115	import org.netbeans.modules.java.source.parsing.JavacParser;
115	import org.netbeans.modules.java.source.save.DiffContext;	116	import org.netbeans.modules.java.source.save.DiffContext;
116	import org.netbeans.modules.java.source.usages.ClassIndexImpl;	117	import org.netbeans.modules.java.source.usages.ClassIndexImpl;
Lines 1149-1154 Link Here
1149	return null;	1150	return null;
1150	}	1151	}
1151	}	1152	}
		1153
		1154	/**
		1155	* Extracts diagnostic params from a diagnostic. Gets under hood of Javac
		1156	* Diagnostic objects and extracts parameters which are otherwise just used
		1157	* to produce a message. <b>Keep in mind that the positions and types of parameters
		1158	* may change in each nbjavac update!</b>
		1159	* @param d diagnostic
		1160	* @param index parameter index to extract
		1161	* @return parameter value, null if index is out of range
		1162	* @since 2.16
		1163	*/
		1164	public static Object getDiagnosticParam(Diagnostic<?> d, int index) {
		1165	return Hacks.getDiagnosticParam(d, index);
		1166	}
1152		1167
1153	/**	1168	/**
1154	* Returns all elements of the given scope that are declared after given position in a source.	1169	* Returns all elements of the given scope that are declared after given position in a source.

Lines 42-47 Link Here

(-)a/jshell.support/src/org/netbeans/modules/jshell/support/SemicolonMissingRule.java (-4 / +6 lines)
42	package org.netbeans.modules.jshell.support;	42	package org.netbeans.modules.jshell.support;
43		43
44	import com.sun.source.util.TreePath;	44	import com.sun.source.util.TreePath;
		45	import com.sun.tools.javac.parser.Tokens;
45	import java.util.Arrays;	46	import java.util.Arrays;
46	import java.util.HashSet;	47	import java.util.HashSet;
47	import java.util.List;	48	import java.util.List;
Lines 50-55 Link Here
50	import javax.swing.text.Document;	51	import javax.swing.text.Document;
51	import javax.tools.Diagnostic;	52	import javax.tools.Diagnostic;
52	import org.netbeans.api.java.source.CompilationInfo;	53	import org.netbeans.api.java.source.CompilationInfo;
		54	import org.netbeans.api.java.source.SourceUtils;
53	import org.netbeans.modules.java.hints.spi.OverrideErrorMessage;	55	import org.netbeans.modules.java.hints.spi.OverrideErrorMessage;
54	//import org.netbeans.modules.java.source.parsing.Hacks;	56	//import org.netbeans.modules.java.source.parsing.Hacks;
55		57
Lines 64-73 Link Here
64		66
65	@Override	67	@Override
66	public String createMessage(CompilationInfo info, Diagnostic d, int offset, TreePath treePath, Data data) {	68	public String createMessage(CompilationInfo info, Diagnostic d, int offset, TreePath treePath, Data data) {
67	// Object dp = Hacks.getDiagnosticParam(d, 0);	69	Object dp = SourceUtils.getDiagnosticParam(d, 0);
68	// if (dp != Tokens.TokenKind.SEMI) {	70	if (dp != Tokens.TokenKind.SEMI) {
69	// return null;	71	return null;
70	// }	72	}
71		73
72	int off = offset;	74	int off = offset;
73	final CharSequence seq = info.getSnapshot().getText();	75	final CharSequence seq = info.getSnapshot().getText();