Fixing bad describe parsing error

uqbar-project · Dec 14, 2017 · 3e65db0 · 3e65db0
1 parent 3b8b34c
commit 3e65db0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/...ollok.ui/src/org/uqbar/project/wollok/ui/labeling/WollokDslDescriptionLabelProvider.xtend b/...ollok.ui/src/org/uqbar/project/wollok/ui/labeling/WollokDslDescriptionLabelProvider.xtend
@@ -13,10 +13,6 @@ import static org.uqbar.project.wollok.wollokDsl.WollokDslPackage.Literals.*
  */
 class WollokDslDescriptionLabelProvider extends DefaultDescriptionLabelProvider {
 
-//	override text(IEObjectDescription ele) {
-//		ele.name.toString
-//	}
-//	 
 	override image(IEObjectDescription ele) {
 		switch (ele.EClass) {
 			case WCLASS: 'wollok-icon-class_16.png'

diff --git a/...r.project.wollok.ui/src/org/uqbar/project/wollok/ui/labeling/WollokDslLabelProvider.xtend b/...r.project.wollok.ui/src/org/uqbar/project/wollok/ui/labeling/WollokDslLabelProvider.xtend
@@ -75,9 +75,9 @@ class WollokDslLabelProvider extends DefaultEObjectLabelProvider {
 			labelExtensionResolved = true
 		}
 
-		if (labelExtension != null) {
+		if (labelExtension !== null) {
 			val type = labelExtension.resolvedType(obj)
-			if(type != null) (separator + type) else ""
+			if(type !== null) (separator + type) else ""
 		} else
 			""
 	}

diff --git a/...project.wollok/src/org/uqbar/project/wollok/parser/WollokSyntaxErrorMessageProvider.xtend b/...project.wollok/src/org/uqbar/project/wollok/parser/WollokSyntaxErrorMessageProvider.xtend
@@ -108,7 +108,9 @@ class WollokSyntaxErrorMessageProvider extends SyntaxErrorMessageProvider {
 		}
 
 		// Now automatic rules
-		var specificMessage = syntaxDiagnosis.findFirst[ msg| exception.isApplicable(msg, context)]
+		var specificMessage = syntaxDiagnosis.findFirst[ msg|
+			exception !== null && exception.isApplicable(msg, context)
+		]
 		if (specificMessage === null && context.currentContext !== null) {
 			// Last chance to detect rule
 			specificMessage = changeParserMessage(context.currentContext, exception)
@@ -139,7 +141,7 @@ class WollokSyntaxErrorMessageProvider extends SyntaxErrorMessageProvider {
 	}
 
 	def dispatch isApplicable(EarlyExitException exception, SpecialMessage msg, IParserErrorContext context) {
-		exception.token.text.equalsIgnoreCase(msg.token) && msg.condition.apply(context, exception)
+		exception.token !== null && exception.token.text !== null && exception.token.text.equalsIgnoreCase(msg.token) && msg.condition !== null && msg.condition.apply(context, exception)
 	}
 
 	def dispatch isApplicable(MismatchedTokenException exception, SpecialMessage msg, IParserErrorContext context) {