Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
bonita
bonita-studio
Commits
720ada54
Commit
720ada54
authored
Jan 13, 2016
by
Romain Bioteau
Browse files
Fix groovy completion
parent
d3de57b6
Changes
2
Hide whitespace changes
Inline
Side-by-side
bundles/plugins/org.bonitasoft.studio.groovy.ui/src/org/bonitasoft/studio/groovy/ui/contentassist/VariablesCompletionProposalProvider.java
View file @
720ada54
...
...
@@ -55,13 +55,13 @@ public class VariablesCompletionProposalProvider implements IJavaCompletionPropo
public
List
<
ICompletionProposal
>
computeCompletionProposals
(
final
ContentAssistInvocationContext
context
,
final
IProgressMonitor
monitor
)
{
final
List
<
ICompletionProposal
>
list
=
new
ArrayList
<
ICompletionProposal
>();
if
(
context
instanceof
JavaContentAssistInvocationContext
)
{
final
ITextViewer
viewer
=
context
.
getViewer
();
final
List
<
ScriptVariable
>
variables
=
getScriptVariables
(
viewer
);
if
(
variables
.
isEmpty
())
{
return
list
;
}
final
ICompilationUnit
unit
=
((
JavaContentAssistInvocationContext
)
context
).
getCompilationUnit
();
if
(
unit
instanceof
GroovyCompilationUnit
)
{
final
ITextViewer
viewer
=
context
.
getViewer
();
final
List
<
ScriptVariable
>
variables
=
getScriptVariables
(
viewer
);
if
(
variables
.
isEmpty
())
{
return
list
;
}
if
(((
GroovyCompilationUnit
)
unit
).
getModuleNode
()
==
null
)
{
return
Collections
.
emptyList
();
}
...
...
bundles/plugins/org.bonitasoft.studio.groovy.ui/src/org/bonitasoft/studio/groovy/ui/contentassist/VariablesTypeCompletionProposal.java
View file @
720ada54
...
...
@@ -35,7 +35,6 @@ import org.codehaus.groovy.eclipse.codeassist.requestor.ContentAssistContext;
import
org.codehaus.groovy.eclipse.codeassist.requestor.GroovyCompletionProposalComputer
;
import
org.codehaus.jdt.groovy.model.GroovyCompilationUnit
;
import
org.eclipse.core.runtime.IProgressMonitor
;
import
org.eclipse.jdt.core.CompletionContext
;
import
org.eclipse.jdt.core.CompletionProposal
;
import
org.eclipse.jdt.core.ICompilationUnit
;
import
org.eclipse.jdt.core.IJavaProject
;
...
...
@@ -43,8 +42,6 @@ import org.eclipse.jdt.core.IMethod;
import
org.eclipse.jdt.core.IType
;
import
org.eclipse.jdt.core.JavaModelException
;
import
org.eclipse.jdt.core.Signature
;
import
org.eclipse.jdt.groovy.core.util.ReflectionUtils
;
import
org.eclipse.jdt.internal.codeassist.InternalCompletionContext
;
import
org.eclipse.jdt.ui.text.java.ContentAssistInvocationContext
;
import
org.eclipse.jdt.ui.text.java.IJavaCompletionProposalComputer
;
import
org.eclipse.jdt.ui.text.java.JavaContentAssistInvocationContext
;
...
...
@@ -70,18 +67,20 @@ public class VariablesTypeCompletionProposal implements IJavaCompletionProposalC
public
List
<
ICompletionProposal
>
computeCompletionProposals
(
final
ContentAssistInvocationContext
context
,
final
IProgressMonitor
monitor
)
{
final
List
<
ICompletionProposal
>
list
=
new
ArrayList
<
ICompletionProposal
>();
if
(
context
instanceof
JavaContentAssistInvocationContext
)
{
final
CompletionContext
coreContext
=
((
JavaContentAssistInvocationContext
)
context
).
getCoreContext
();
if
(
coreContext
!=
null
&&
!
coreContext
.
isExtended
())
{
// must use reflection to set the fields
ReflectionUtils
.
setPrivateField
(
InternalCompletionContext
.
class
,
"isExtended"
,
coreContext
,
true
)
;
final
ITextViewer
viewer
=
context
.
getViewer
();
final
List
<
ScriptVariable
>
scriptVariables
=
getScriptVariables
(
viewer
);
if
(
scriptVariables
.
isEmpty
())
{
return
list
;
}
// final CompletionContext coreContext = ((JavaContentAssistInvocationContext) context).getCoreContext();
// 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));
// }
final
ICompilationUnit
unit
=
((
JavaContentAssistInvocationContext
)
context
).
getCompilationUnit
();
if
(
unit
instanceof
GroovyCompilationUnit
)
{
final
ITextViewer
viewer
=
context
.
getViewer
();
final
List
<
ScriptVariable
>
scriptVariables
=
getScriptVariables
(
viewer
);
if
(
scriptVariables
.
isEmpty
())
{
return
list
;
}
if
(((
GroovyCompilationUnit
)
unit
).
getModuleNode
()
==
null
)
{
return
Collections
.
emptyList
();
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment