Merge branch 'dev' into fix-#1083

org.uqbar.project.wollok.launch/src/org/uqbar/project/wollok/interpreter/WollokREPLInterpreter.xtend

@@ -25,4 +25,5 @@ class WollokREPLInterpreter extends WollokInterpreter {
 		new XStackFrame(root, nativeLobby, WollokSourcecodeLocator.INSTANCE)
 	}
 
+	override isRootFile() { true }
 }

org.uqbar.project.wollok.launch/src/org/uqbar/project/wollok/launch/WollokLauncherInterpreterEvaluator.xtend

@@ -34,18 +34,18 @@ class WollokLauncherInterpreterEvaluator extends WollokInterpreterEvaluator {
 		if (main !== null)
 			main.eval
 		else {
-			val isASuite = tests.empty && suite !== null
+			val _isASuite = isASuite
 			var testsToRun = tests
 			var String suiteName = null
-			if (isASuite) {
+			if (_isASuite) {
 				suiteName = suite.name
 				testsToRun = suite.tests
 			}
 			wollokTestsReporter.testsToRun(suiteName, it, testsToRun)
 			try {
 				testsToRun.fold(null) [ a, _test |
 					resetGlobalState
-					if (isASuite) {
+					if (_isASuite) {
 						_test.evalInSuite(suite)
 					} else {
 						_test.eval

org.uqbar.project.wollok.launch/src/org/uqbar/project/wollok/launch/repl/WollokRepl.xtend

@@ -100,7 +100,7 @@ class WollokRepl {
 			printReturnValue(returnValue)
 		} catch (Exception e) {
 			resetIndent
-			handleException(e)
+			e.handleException
 		}
 	}
 
@@ -134,7 +134,7 @@ class WollokRepl {
 
 		resourceSet.resources.add(resource)
 
-		resource.load(in, #{});
+		resource.load(in, #{})
 		launcher.validate(injector, resource, [], [throw new ReplParserException(it)])
 		resource.contents.get(0) as WFile
 	}
@@ -144,7 +144,7 @@ class WollokRepl {
 		for (var i = 0; i < Integer.MAX_VALUE; i++) {
 			var syntheticUri = parsedMainFile.eResource.URI.trimFileExtension.trimSegments(1).appendSegment(name + i).
 				appendFileExtension(WollokConstants.PROGRAM_EXTENSION)
-			if (resourceSet.getResource(syntheticUri, false) == null) {
+			if (resourceSet.getResource(syntheticUri, false) === null) {
 				return syntheticUri
 			}
 		}
@@ -164,16 +164,6 @@ class WollokRepl {
 		whiteSpaces = ""
 	}
 
-	def dispatch void handleException(ReplParserException e) {
-		e.issues.forEach [
-			printlnIdent(errorStyle('''«severity.name»: «message» («LINE»: «lineNumber - numberOfLinesBefore»)'''))
-		]
-	}
-
-	def dispatch void handleException(Throwable e) {
-		println(e.stackTraceAsString.errorStyle)
-	}
-
 	def stackTraceAsString(Throwable e) {
 		val s = new ByteArrayOutputStream
 		e.printStackTrace(new PrintStream(s))
@@ -184,46 +174,38 @@ class WollokRepl {
 		2 + parsedMainFile.imports.size
 	}
 
+	def toLinkForConsole(StackTraceElementDTO st) {
+		st.contextForStackTrace.errorStyle + st.linkForStackTrace.linkStyle
+	}
+
+	def dispatch void handleException(ReplParserException e) {
+		e.issues.forEach [
+			printlnIdent(errorStyle('''«severity.name»: «message» («LINE»: «lineNumber - numberOfLinesBefore»)'''))
+		]
+	}
+
+	def dispatch void handleException(Throwable e) {
+		println(e.stackTraceAsString.errorStyle)
+	}
+
 	def dispatch void handleException(WollokProgramExceptionWrapper e) {
 		// Wollok-level user exception
-		//printlnIdent(filterREPLLines(e.wollokStackTrace).errorStyle)
 		println((e.exceptionClassName + ": " + e.wollokMessage).errorStyle)
 		val errorLine = e.wollokException
 			.convertStackTrace
-			.filter [ !it.shouldBeFiltered ]
 			.toList
-			.reverse
 			.map [ stackDTO | stackDTO.toLinkForConsole ]
 			.join(System.lineSeparator)
 
 		printlnIdent(errorLine.errorStyle)
 	}
 
-	def toLinkForConsole(StackTraceElementDTO st) {
-		val result = new StringBuffer => [
-			append("   ")
-			append("at")
-			append(" ")
-			if (st.contextDescription !== null) {
-				append(st.contextDescription)
-				append(" ")
-			}
-		]
-
-		var link = new StringBuffer
-		if (st.hasFileName) {
-			link.append("(" + st.fileName + ":" + st.lineNumber + ")")
-		}
-
-		result.toString.errorStyle + link.toString.linkStyle
-	}
-
 	def dispatch void handleException(WollokInterpreterException e) {
 		if (e.lineNumber > numberOfLinesBefore) {
 			printlnIdent('''«WVM_ERROR» («e.lineNumber - numberOfLinesBefore»): «e.nodeText»:'''.errorStyle)
 		}
 
-		if (e.cause != null) {
+		if (e.cause !== null) {
 			indent
 			handleException(e.cause)
 		}

org.uqbar.project.wollok.launch/src/org/uqbar/project/wollok/launch/tests/WollokExceptionUtils.xtend

@@ -13,6 +13,8 @@ import static org.uqbar.project.wollok.sdk.WollokDSK.*
 
 import static extension org.uqbar.project.wollok.interpreter.nativeobj.WollokJavaConversions.*
 
+import static extension org.uqbar.project.wollok.errorHandling.WollokExceptionExtensions.*
+
 class WollokExceptionUtils {
 
 
@@ -31,30 +33,14 @@ class WollokExceptionUtils {
 		wollokException.internalStackTraceToDTO
 	}
 
-	private static def internalStackTraceToDTO(WollokObject fullStackTrace) {
-		val stackTrace = fullStackTrace.call("getFullStackTrace").wollokToJava(List) as List<WollokObject>
-		stackTrace.map [ wo |
-			val contextDescription = wo.call("contextDescription").wollokToJava(String) as String
-			val location = wo.call("location").wollokToJava(String) as String
-			val data = location.split(",")
-			val fileName = data.get(0)
-			var Integer lineNumber = 0
-			try {
-				lineNumber = new Integer(data.get(1))
-			} catch (NumberFormatException e) {
-			}
-			new StackTraceElementDTO(contextDescription, fileName, lineNumber)
-		]
-	}
-
 	/**
 	 * Converts an exception to a String
 	 */
 	def static dispatch String convertToString(WollokProgramExceptionWrapper exception) {
 		val wollokException = exception.wollokException
 		val className = wollokException.call("className").wollokToJava(String) as String
 		val message = exception.wollokMessage
-		val concatMessage = if (message != null) ": " + message else "" 
+		val concatMessage = if (message !== null) ": " + message else "" 
 		return className + concatMessage
 	}
 
@@ -72,20 +58,20 @@ class WollokExceptionUtils {
 	 * Prepares an exception for a RMI call
 	 */
 	def static dispatch void prepareExceptionForTrip(Throwable e) {
-		if (e.cause != null)
+		if (e.cause !== null)
 			e.cause.prepareExceptionForTrip
 	}
 
 	def static dispatch void prepareExceptionForTrip(WollokInterpreterException e) {
 		e.sourceElement = null
 
-		if (e.cause != null)
+		if (e.cause !== null)
 			e.cause.prepareExceptionForTrip
 	}
 
 	def static dispatch void prepareExceptionForTrip(WollokProgramExceptionWrapper e) {
 		e.URI = null
-		if (e.cause != null)
+		if (e.cause !== null)
 			e.cause.prepareExceptionForTrip
 	}
 

org.uqbar.project.wollok.ui.launch/src/org/uqbar/project/wollok/ui/console/WollokReplConsolePage.xtend

@@ -162,4 +162,6 @@ class WollokReplConsoleViewer extends TextConsoleViewer {
 		styledText.setLeftMargin(Math.max(styledText.getLeftMargin(), 2))
 		return styledText
 	}
+
+
 }