Better TS error report

uqbar-project · Mar 17, 2018 · fdbbcf9 · fdbbcf9
1 parent a64770a
commit fdbbcf9
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/...lok.tests/src/org/uqbar/project/wollok/tests/typesystem/MethodTypeInferenceTestCase.xtend b/...lok.tests/src/org/uqbar/project/wollok/tests/typesystem/MethodTypeInferenceTestCase.xtend
@@ -223,7 +223,7 @@ class MethodTypeInferenceTestCase extends AbstractWollokTypeSystemTestCase {
 			}
 		'''.parseAndInfer.asserting [
 			assertTypeOf(classTypeFor(NUMBER), "number")
-			findByText("number", WVariableReference).assertIssuesInElement("type <<Number>> does not understand message <<isBig>>")
+			findByText("number.isBig()", WMemberFeatureCall).assertIssuesInElement("type <<Number>> does not understand message <<isBig()>>")
 		]
 	}
 

diff --git a/...oject.wollok.typeSystem/src/org/uqbar/project/wollok/typesystem/TypeSystemException.xtend b/...oject.wollok.typeSystem/src/org/uqbar/project/wollok/typesystem/TypeSystemException.xtend
@@ -11,7 +11,7 @@ class TypeSystemException extends RuntimeException {
 	 * (Currently optional) type variable.
 	 * This is highly coupled with ConstraintBasedTypeSystem, but given that we maybe deleting the others
 	 * I thought it is not worth to do something more sophisticated to avoid the coupling.
-	 * Anyway, other type systems should work correctly without a type variable asigned in their exceptions.
+	 * Anyway, other type systems should work correctly without a type variable assigned in their exceptions.
 	 */
 	@Accessors
 	TypeVariable variable

diff --git a/...peSystem/src/org/uqbar/project/wollok/typesystem/constraints/types/OffenderSelector.xtend b/...peSystem/src/org/uqbar/project/wollok/typesystem/constraints/types/OffenderSelector.xtend
@@ -25,7 +25,7 @@ class OffenderSelector {
 	def static handleOffense(TypeVariable subtype, TypeVariable supertype, TypeSystemException offense) {
 		val offender = selectOffenderVariable(subtype, supertype)
 		offender.addError(offense)
-		offense.variable = offender
+		if (offense.variable === null) offense.variable = offender
 	}
 
 	def static selectOffenderVariable(TypeVariable subtype, TypeVariable supertype) {

diff --git a/...ypeSystem/src/org/uqbar/project/wollok/typesystem/constraints/variables/MessageSend.xtend b/...ypeSystem/src/org/uqbar/project/wollok/typesystem/constraints/variables/MessageSend.xtend
@@ -32,6 +32,10 @@ class MessageSend {
 	def addOpenType(WollokType type) {
 		openTypes.add(type)
 	}
+
+	def text() { //TODO: Consultar de dónde puedo sacar esto
+		'''«selector»(«arguments.map[it.owner].join(', ')»)'''
+	}
 
 	override toString() { returnType.owner.debugInfo }
 }
diff --git a/...peSystem/src/org/uqbar/project/wollok/typesystem/constraints/variables/TypeVariable.xtend b/...peSystem/src/org/uqbar/project/wollok/typesystem/constraints/variables/TypeVariable.xtend
@@ -102,7 +102,7 @@ class TypeVariable implements ITypeVariable {
 		errors.forEach [
 			log.debug('''Reporting error in «owner.debugInfo»: «message»''')
 			try {
-				validator.report(message, owner)
+				validator.report(message, variable.owner)
 			}
 			catch (IllegalArgumentException exception) {
 				// We probably reported a type error to a core object, which is not possible

diff --git a/...em/src/org/uqbar/project/wollok/typesystem/exceptions/MessageNotUnderstoodException.xtend b/...em/src/org/uqbar/project/wollok/typesystem/exceptions/MessageNotUnderstoodException.xtend
@@ -15,9 +15,10 @@ class MessageNotUnderstoodException extends TypeSystemException {
 	new(WollokType type, MessageSend message) {
 		this.type = type
 		this.messageSend = message
+		this.variable = message.returnType
 	}
 
 	override getMessage() {
-		'''type <<«type»>> does not understand message <<«messageSend.selector»>>'''
+		'''type <<«type»>> does not understand message <<«messageSend.text»>>'''
 	}	
 }