CompletionContext should check the editor if we are in a workspace or…

… not. fixes pharo-project#4686 (the setter of CompletionContext will be cleaned up more when we remove the old completion)
astares · Sep 23, 2019 · a8713fd · a8713fd
1 parent d6ae900
commit a8713fd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/NECompletion/CompletionContext.class.st b/src/NECompletion/CompletionContext.class.st
@@ -11,7 +11,8 @@ Class {
 		'completionToken',
 		'model',
 		'ast',
-		'node'
+		'node',
+		'isWorkspace'
 	],
 	#category : #'NECompletion-New'
 }
@@ -57,9 +58,9 @@ CompletionContext >> narrowWith: aString [
 { #category : #parsing }
 CompletionContext >> parseSource [
 
-	ast := theClass
-		ifNil: [ ( RBParser parseFaultyExpression: source ) doSemanticAnalysis ]
-		ifNotNil: [ ( RBParser parseFaultyMethod: source ) doSemanticAnalysisIn: theClass ].
+	ast := isWorkspace
+		ifTrue: [ ( RBParser parseFaultyExpression: source ) doSemanticAnalysis ]
+		ifFalse: [ ( RBParser parseFaultyMethod: source ) doSemanticAnalysisIn: theClass ].
 	TypingVisitor new visitNode: ast
 ]
 
@@ -72,6 +73,7 @@ CompletionContext >> receiverClass [
 
 { #category : #'initialize-release' }
 CompletionContext >> setController: aECController class: aClass source: aString position: anInteger [ 
+	isWorkspace := aECController editor textArea editingMode isScripting.
 	theClass := aClass. 
 	source := aString.
 	position := anInteger

diff --git a/src/OpalCompiler-Core/RBProgramNode.extension.st b/src/OpalCompiler-Core/RBProgramNode.extension.st
@@ -37,6 +37,12 @@ RBProgramNode >> doSemanticAnalysis [
 
 ]
 
+{ #category : #'*opalcompiler-core' }
+RBProgramNode >> doSemanticAnalysisIn: aClass [
+	self methodNode ifNil: [ ^self ].
+	^ self methodNode doSemanticAnalysisIn: aClass
+]
+
 { #category : #'*opalcompiler-core' }
 RBProgramNode >> enclosingMethodOrBlockNode [
 	^ self methodOrBlockNode