Bug 539163 - Refactor SemanticHighlighting class for jdt.ls usage
- to allow jdt.ls to use the new SemanticHighlighting core
classes, change the getPositionCategory() method to
be public for both SemanticHighlightingPresenter
and SemanticHighlightingPresentedCore
- have NLSHintHelperTest use SharedASTProviderCore instead
of SharedASTProvider which is deprecated
Change-Id: Ie81fb5c4c74bd06d8adc08fe77370cbdd503096e
Signed-off-by: Jeff Johnston <jjohnstn@redhat.com>
diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/javaeditor/HighlightedPositionCore.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/javaeditor/HighlightedPositionCore.java
index 9ba973a..d93dcb6 100644
--- a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/javaeditor/HighlightedPositionCore.java
+++ b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/javaeditor/HighlightedPositionCore.java
@@ -18,6 +18,8 @@
/**
* Highlighted Positions.
+ *
+ * @since 1.11
*/
public class HighlightedPositionCore extends Position {
diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingPresenterCore.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingPresenterCore.java
index 688c79b..7fd859e 100644
--- a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingPresenterCore.java
+++ b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingPresenterCore.java
@@ -466,7 +466,7 @@
/**
* @return The semantic reconciler position's category.
*/
- protected String getPositionCategory() {
+ public String getPositionCategory() {
return toString();
}
}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/nls/NLSHintHelperTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/nls/NLSHintHelperTest.java
index 6a4abc4..b9b4e88 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/nls/NLSHintHelperTest.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/nls/NLSHintHelperTest.java
@@ -17,10 +17,6 @@
import java.io.File;
import java.util.Properties;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.eclipse.jdt.testplugin.JavaProjectHelper;
import org.eclipse.jdt.testplugin.JavaTestPlugin;
@@ -51,13 +47,17 @@
import org.eclipse.jdt.core.dom.ITypeBinding;
import org.eclipse.jdt.core.dom.NodeFinder;
import org.eclipse.jdt.core.dom.TypeDeclaration;
+import org.eclipse.jdt.core.manipulation.SharedASTProviderCore;
import org.eclipse.jdt.internal.corext.refactoring.nls.AccessorClassReference;
import org.eclipse.jdt.internal.corext.refactoring.nls.NLSHintHelper;
-import org.eclipse.jdt.ui.SharedASTProvider;
import org.eclipse.jdt.ui.tests.core.ProjectTestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
/**
* Tests the NLSHintHelper.
@@ -92,7 +92,7 @@
IPackageFragment pkg= fLibrary.getPackageFragment("pkg");
IClassFile classFile= pkg.getClassFile("Client.class");
IRegion region= new Region(648, 4);
- CompilationUnit ast= SharedASTProvider.getAST(classFile, SharedASTProvider.WAIT_YES, null);
+ CompilationUnit ast= SharedASTProviderCore.getAST(classFile, SharedASTProviderCore.WAIT_YES, null);
AccessorClassReference accessor= NLSHintHelper.getAccessorClassReference(ast, region);
assertNotNull(accessor);
Properties properties= NLSHintHelper.getProperties(fJProject, accessor);
@@ -420,7 +420,7 @@
ICompilationUnit cu= pack.createCompilationUnit(className + ".java", source, false, null);
// Get type binding
- CompilationUnit ast= SharedASTProvider.getAST(cu, SharedASTProvider.WAIT_YES, null);
+ CompilationUnit ast= SharedASTProviderCore.getAST(cu, SharedASTProviderCore.WAIT_YES, null);
ASTNode node= NodeFinder.perform(ast, cu.getType(className).getSourceRange());
ITypeBinding typeBinding= ((TypeDeclaration)node).resolveBinding();
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingPresenter.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingPresenter.java
index e2f1fab..eb3f34d 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingPresenter.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingPresenter.java
@@ -536,7 +536,7 @@
* @return The semantic reconciler position's category.
*/
@Override
- protected String getPositionCategory() {
+ public String getPositionCategory() {
return toString();
}
}
