From 0ec9e247741a6dfe41c8abe45d4490bb9a2d9997 Mon Sep 17 00:00:00 2001
From: Romain Bioteau <romain.bioteau@gmail.com>
Date: Wed, 13 Jan 2016 18:08:34 +0100
Subject: [PATCH] Fix groovy completion

---
 .../ui/contentassist/VariablesTypeCompletionProposal.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bundles/plugins/org.bonitasoft.studio.groovy.ui/src/org/bonitasoft/studio/groovy/ui/contentassist/VariablesTypeCompletionProposal.java b/bundles/plugins/org.bonitasoft.studio.groovy.ui/src/org/bonitasoft/studio/groovy/ui/contentassist/VariablesTypeCompletionProposal.java
index f3407fd2c1..1419a6c549 100644
--- a/bundles/plugins/org.bonitasoft.studio.groovy.ui/src/org/bonitasoft/studio/groovy/ui/contentassist/VariablesTypeCompletionProposal.java
+++ b/bundles/plugins/org.bonitasoft.studio.groovy.ui/src/org/bonitasoft/studio/groovy/ui/contentassist/VariablesTypeCompletionProposal.java
@@ -69,6 +69,7 @@ public class VariablesTypeCompletionProposal implements IJavaCompletionProposalC
     @Override
     public List<ICompletionProposal> computeCompletionProposals(final ContentAssistInvocationContext context, final IProgressMonitor monitor) {
         final List<ICompletionProposal> list = new ArrayList<ICompletionProposal>();
+        boolean extendContext = false;
         try {
             if (context instanceof JavaContentAssistInvocationContext) {
                 final ITextViewer viewer = context.getViewer();
@@ -80,8 +81,7 @@ public class VariablesTypeCompletionProposal implements IJavaCompletionProposalC
                 if (coreContext != null && !coreContext.isExtended()) {
                     // must use reflection to set the fields
                     ReflectionUtils.setPrivateField(InternalCompletionContext.class, "isExtended", coreContext, true);
-                    //                ReflectionUtils.setPrivateField(InternalCompletionContext.class, "extendedContext", coreContext,
-                    //                        new GroovyExtendedCompletionContext(getContext(), requestor.currentScope));
+                    extendContext = true;
                 }
                 final ICompilationUnit unit = ((JavaContentAssistInvocationContext) context).getCompilationUnit();
                 if (unit instanceof GroovyCompilationUnit) {
@@ -167,7 +167,7 @@ public class VariablesTypeCompletionProposal implements IJavaCompletionProposalC
             }
         } finally {
             final CompletionContext coreContext = ((JavaContentAssistInvocationContext) context).getCoreContext();
-            if (coreContext != null && coreContext.isExtended()) {
+            if (extendContext && coreContext != null && coreContext.isExtended()) {
                 // must use reflection to set the fields
                 ReflectionUtils.setPrivateField(InternalCompletionContext.class, "isExtended", coreContext, false);
             }
-- 
GitLab