Merge e8f314f into e8f25ea

uqbar-project · May 26, 2019 · 9717736 · 9717736
2 parents e8f25ea + e8f314f
commit 9717736
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 209 deletions.
diff --git a/org.uqbar.project.wollok.launch/wdk/bin/wast.sh b/org.uqbar.project.wollok.launch/wdk/bin/wast.sh
diff --git a/org.uqbar.project.wollok.launch/wdk/bin/wchecker.sh b/org.uqbar.project.wollok.launch/wdk/bin/wchecker.sh
diff --git a/org.uqbar.project.wollok.launch/wdk/bin/winterpreter.sh b/org.uqbar.project.wollok.launch/wdk/bin/winterpreter.sh
diff --git a/org.uqbar.project.wollok.launch/wdk/bin/wrepl.sh b/org.uqbar.project.wollok.launch/wdk/bin/wrepl.sh
diff --git a/org.uqbar.project.wollok.launch/wdk/bin/wserver-stop.sh b/org.uqbar.project.wollok.launch/wdk/bin/wserver-stop.sh
diff --git a/org.uqbar.project.wollok.launch/wdk/bin/wserver.sh b/org.uqbar.project.wollok.launch/wdk/bin/wserver.sh
diff --git a/...t.wollok.ui/src/org/uqbar/project/wollok/ui/contentassist/WollokDslProposalProvider.xtend b/...t.wollok.ui/src/org/uqbar/project/wollok/ui/contentassist/WollokDslProposalProvider.xtend
@@ -60,14 +60,12 @@ class WollokDslProposalProvider extends AbstractWollokDslProposalProvider {
 	}
 
 	def synchronized getAllMethods(EObject obj) {
-		if (!obj.isTypeSystemEnabled)
-			return (obj as WMethodContainer).allUntypedMethods
-		else {
-		val tsLabelExtension = obtainLabelExtension
-			if (tsLabelExtension !== null)
-				tsLabelExtension.allMethods(obj)
-			else
-				newArrayList
+		val untypedMethods = obj.allUntypedMethods
+		if (!obj.isTypeSystemEnabled) {
+			untypedMethods
+		} else {
+			val typedMethods = obtainLabelExtension?.allMethods(obj)
+			if (typedMethods !== null && !typedMethods.isEmpty) typedMethods else untypedMethods
 		}
 	}
 

diff --git a/org.uqbar.project.wollok/src/org/uqbar/project/wollok/model/WMethodContainerExtensions.xtend b/org.uqbar.project.wollok/src/org/uqbar/project/wollok/model/WMethodContainerExtensions.xtend
@@ -299,13 +299,14 @@ class WMethodContainerExtensions extends WollokModelExtensions {
 		methods.filter [ m | m.name.equals(methodName) && !m.overrides ].toList
 	}
 
+	def static dispatch Iterable<WMethodDeclaration> allUntypedMethods(EObject o) { newArrayList }
 	def static dispatch Iterable<WMethodDeclaration> allUntypedMethods(WMixin it) { methods }
 	def static dispatch Iterable<WMethodDeclaration> allUntypedMethods(WNamedObject it) { inheritedMethods }
 	def static dispatch Iterable<WMethodDeclaration> allUntypedMethods(WObjectLiteral it) { inheritedMethods }
 	def static dispatch Iterable<WMethodDeclaration> allUntypedMethods(MixedMethodContainer it) { inheritedMethods }
 	def static dispatch Iterable<WMethodDeclaration> allUntypedMethods(WClass it) { inheritedMethods }
 	def static dispatch Iterable<WMethodDeclaration> allUntypedMethods(WSuite it) { methods }
-
+	
 	def static allVariables(WMethodContainer it) {
 		allVariableDeclarations.map [ variable ]
 	}