Fix #1954 dynamic diagram describe bug (#1975)

* Better idea: disable unwanted commands, and avoid annoying stack trace behind the scenes * Fix #1954 Dynamic Diagram not showing instances of a class in describes
uqbar-project · Nov 20, 2020 · d564c8a · d564c8a
1 parent f0f0fd8
commit d564c8a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/...src/org/uqbar/project/wollok/interpreter/listeners/WollokRemoteContextStateListener.xtend b/...src/org/uqbar/project/wollok/interpreter/listeners/WollokRemoteContextStateListener.xtend
@@ -11,6 +11,7 @@ import org.uqbar.project.wollok.debugger.server.rmi.XDebugStackFrameVariable
 import org.uqbar.project.wollok.interpreter.WollokInterpreter
 import org.uqbar.project.wollok.interpreter.api.XInterpreterListener
 import static extension org.uqbar.project.wollok.model.WMethodContainerExtensions.*
+import static extension org.uqbar.project.wollok.utils.XTextExtensions.* 
 
 class WollokRemoteContextStateListener implements XInterpreterListener {
 
@@ -49,7 +50,8 @@ class WollokRemoteContextStateListener implements XInterpreterListener {
 	override aboutToEvaluate(EObject element) {}
 
 	override evaluated(EObject element) {
-		if (singleTest === null) {
+		// be careful, can be null or false
+		if (singleTest === null || !singleTest) {
 			singleTest = element.isSingleTest
 		}
 		if (!forRepl && singleTest) {

diff --git a/...roduct.ui/src/org/uqbar/project/wollok/product/ui/startup/WollokPerspectiveListener.xtend b/...roduct.ui/src/org/uqbar/project/wollok/product/ui/startup/WollokPerspectiveListener.xtend
@@ -297,7 +297,7 @@ class WollokPerspectiveListener implements IPerspectiveListener {
 		val bindingService = PlatformUI.workbench.getAdapter(typeof(IBindingService)) as IBindingService
 		bindingService.bindings.forEach [  
 			if (unwantedKeyBindings.includesCase(parameterizedCommand?.command?.id)) {
-				parameterizedCommand.command.undefine
+				parameterizedCommand.command.enabled = false
 			}
 		]
 	}

diff --git a/org.uqbar.project.wollok/src/org/uqbar/project/wollok/model/WollokModelExtensions.xtend b/org.uqbar.project.wollok/src/org/uqbar/project/wollok/model/WollokModelExtensions.xtend
@@ -204,7 +204,7 @@ class WollokModelExtensions {
 		ParameterUsesVisitor.usesOf(parameter, parameter.declarationContext)
 	}
 
-	def static isUsed(WReferenciable ref) { !ref.uses.isEmpty }
+	def static isUsed(WReferenciable ref) { ref !== null && !ref.uses.isEmpty }
 
 	def static indexOfUse(WVariableReference ref) {
 		ref.ref.uses.indexOf(ref.eContainer)