Fix for issue #123: whitelist Groovy completion proposal categories

groovy · May 11, 2017 · d994058 · d994058
1 parent 3b7fe7b
commit d994058
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/...odehaus.groovy.eclipse.ui/src/org/codehaus/groovy/eclipse/editor/GroovyConfiguration.java b/...odehaus.groovy.eclipse.ui/src/org/codehaus/groovy/eclipse/editor/GroovyConfiguration.java
@@ -122,24 +122,24 @@ public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
     public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
         ContentAssistant assistant = (ContentAssistant) super.getContentAssistant(sourceViewer);
 
-        ContentAssistProcessor stringProcessor = new JavaCompletionProcessor(getEditor(), assistant, GroovyPartitionScanner.GROOVY_MULTILINE_STRINGS);
-        assistant.setContentAssistProcessor(stringProcessor, GroovyPartitionScanner.GROOVY_MULTILINE_STRINGS);
-        // remove Java content assist processor category
-        // do a list copy so as not to disturb globally shared list
+        String contentType = GroovyPartitionScanner.GROOVY_MULTILINE_STRINGS;
+        assistant.setContentAssistProcessor(new JavaCompletionProcessor(getEditor(), assistant, contentType), contentType);
+
+        // retain only Groovy-approved completion proposal categories
         IContentAssistProcessor processor = assistant.getContentAssistProcessor(IDocument.DEFAULT_CONTENT_TYPE);
-        List<CompletionProposalCategory> categories = (List<CompletionProposalCategory>) ReflectionUtils.getPrivateField(ContentAssistProcessor.class, "fCategories", processor);
-        List<CompletionProposalCategory> newCategories = new ArrayList<CompletionProposalCategory>(categories.size() - 1);
+        List<CompletionProposalCategory> categories = (List<CompletionProposalCategory>)
+            ReflectionUtils.getPrivateField(ContentAssistProcessor.class, "fCategories", processor);
+        List<CompletionProposalCategory> newCategories = new ArrayList<CompletionProposalCategory>();
         for (CompletionProposalCategory category : categories) {
-            if (!JAVA_CONTENT_ASSIST.matcher(category.getId()).matches()) {
+            if (GROOVY_CONTENT_ASSIST.matcher(category.getId()).matches()) {
                 newCategories.add(category);
             }
         }
         ReflectionUtils.setPrivateField(ContentAssistProcessor.class, "fCategories", processor, newCategories);
 
         return assistant;
     }
-    private static final Pattern JAVA_CONTENT_ASSIST = Pattern.compile("org.eclipse.jdt.ui.(java(All|(No)?Type)|swt|template)ProposalCategory|" +
-        "org.eclipse.mylyn.java.ui.javaAllProposalCategory|org.eclipse.ajdt.ui.templateCategory|org\\.eclipse\\.recommenders\\..+"); //org.eclipse.pde.api.tools.ui.apitools_proposal_category?
+    private static final Pattern GROOVY_CONTENT_ASSIST = Pattern.compile("org.codehaus.groovy.+|org.eclipse.jdt.ui.(default|text)ProposalCategory");
 
     /*
      * Type parameters have changed between 3.7 and 4.2.  So just remove them