fixes #2803

pharo-project · Mar 12, 2019 · 68ff01d · 68ff01d
1 parent 8335f03
commit 68ff01d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/src/AST-Core/RBParser.class.st b/src/AST-Core/RBParser.class.st
@@ -438,12 +438,15 @@ RBParser >> parseCascadeMessage [
 
 { #category : #'error handling' }
 RBParser >> parseErrorNode: aMessageString [
-	| sourceString |
-	currentToken isError 
+	| sourceString errorPosition |
+	currentToken isError
 		ifTrue: [ ^ RBParseErrorNode errorMessage: currentToken cause value: currentToken value at: currentToken start ].
-	sourceString := source copyFrom: self errorPosition to: source size.
-	^ RBParseErrorNode
-		errorMessage: aMessageString value: sourceString at: self errorPosition
+	errorPosition := self errorPosition.
+	"the error at the end means in some cases that the start of the error is before"
+	aMessageString = ''')'' expected'
+		ifTrue: [ errorPosition := source findLastOccurrenceOfString: '(' startingAt: 1 ].
+	sourceString := source copyFrom: errorPosition to: source size.
+	^ RBParseErrorNode errorMessage: aMessageString value: sourceString at: self errorPosition
 ]
 
 { #category : #accessing }

diff --git a/src/AST-Tests-Core/RBFormatterTest.class.st b/src/AST-Tests-Core/RBFormatterTest.class.st
@@ -83,6 +83,16 @@ RBFormatterTest >> testParseError [
 
 ]
 
+{ #category : #testing }
+RBFormatterTest >> testParseError2 [
+	| inputSource errorNode |
+	"parse error nodes should have the faulty code"
+	inputSource := '( 1 + 2'.
+   errorNode := RBParser parseFaultyExpression: inputSource.
+	self assert: errorNode source equals: errorNode formattedCode
+
+]
+
 { #category : #testing }
 RBFormatterTest >> testPreserveLiteralArrayFormat [
 	| inputSource literalArrayNode |