Fix SyntaxError visualize order: message first location later

youknowone · youknowone · commit c02881878295 · 2020-05-16T14:20:09.000+09:00
diff --git a/compiler/src/error.rs b/compiler/src/error.rs
@@ -125,7 +125,7 @@ impl fmt::Display for CompileError {
             if self.location.column() > 0 {
                 if let Some(line) = statement.lines().nth(self.location.row() - 1) {
                     // visualize the error, when location and statement are provided
-                    return write!(f, "\n{}\n{}", line, self.location.visualize(&error_desc));
+                    return write!(f, "{}", self.location.visualize(line, &error_desc));
                 }
             }
         }
diff --git a/parser/src/location.rs b/parser/src/location.rs
@@ -16,13 +16,9 @@ impl fmt::Display for Location {
 }
 
 impl Location {
-    pub fn visualize(&self, desc: &str) -> String {
-        format!(
-            "{}↑\n{}{}",
-            " ".repeat(self.column - 1),
-            " ".repeat(self.column - 1),
-            desc
-        )
+    pub fn visualize(&self, line: &str, desc: &str) -> String {
+        // desc.to_owned()
+        format!("{}\n{}\n{}↑", desc, line, " ".repeat(self.column - 1))
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ impl fmt::Display for CompileError {`
`125`	`125`	`if self.location.column() > 0 {`
`126`	`126`	`if let Some(line) = statement.lines().nth(self.location.row() - 1) {`
`127`	`127`	`// visualize the error, when location and statement are provided`
`128`		`- return write!(f, "\n{}\n{}", line, self.location.visualize(&error_desc));`
	`128`	`+ return write!(f, "{}", self.location.visualize(line, &error_desc));`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,13 +16,9 @@ impl fmt::Display for Location {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`impl Location {`
`19`		`- pub fn visualize(&self, desc: &str) -> String {`
`20`		`- format!(`
`21`		`- "{}↑\n{}{}",`
`22`		`- " ".repeat(self.column - 1),`
`23`		`- " ".repeat(self.column - 1),`
`24`		`- desc`
`25`		`- )`
	`19`	`+ pub fn visualize(&self, line: &str, desc: &str) -> String {`
	`20`	`+ // desc.to_owned()`
	`21`	`+ format!("{}\n{}\n{}↑", desc, line, " ".repeat(self.column - 1))`
`26`	`22`	`}`
`27`	`23`	`}`
`28`	`24`