Use 1-based row/column in error messages
This commit is contained in:
2
TODO.md
2
TODO.md
@@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
## TODO
|
## TODO
|
||||||
|
|
||||||
- [ ] Increment row/col in printing, so vscode can click on compiler output
|
- [x] Increment row/col in printing, so vscode can click on compiler output
|
||||||
- [ ] Raw is duplicated between Lib.Syntax and Lib.Compile, but not detected
|
- [ ] Raw is duplicated between Lib.Syntax and Lib.Compile, but not detected
|
||||||
- Maybe add qualified names
|
- Maybe add qualified names
|
||||||
- [ ] vscode - run newt when switching editors
|
- [ ] vscode - run newt when switching editors
|
||||||
|
|||||||
1466
bootstrap/newt.js
1466
bootstrap/newt.js
File diff suppressed because one or more lines are too long
@@ -114,8 +114,8 @@ export function activate(context: vscode.ExtensionContext) {
|
|||||||
);
|
);
|
||||||
if (match) {
|
if (match) {
|
||||||
let [_full, kind, file, line, column, message] = match;
|
let [_full, kind, file, line, column, message] = match;
|
||||||
let lnum = Number(line);
|
let lnum = Number(line) - 1;
|
||||||
let cnum = Number(column);
|
let cnum = Number(column) - 1;
|
||||||
if (file !== fileName) lnum = cnum = 0;
|
if (file !== fileName) lnum = cnum = 0;
|
||||||
|
|
||||||
let start = new vscode.Position(lnum, cnum);
|
let start = new vscode.Position(lnum, cnum);
|
||||||
|
|||||||
7
playground/package-lock.json
generated
7
playground/package-lock.json
generated
@@ -10,7 +10,6 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@preact/signals": "^1.3.0",
|
"@preact/signals": "^1.3.0",
|
||||||
"codemirror": "^6.0.1",
|
"codemirror": "^6.0.1",
|
||||||
"monaco-editor": "^0.52.0",
|
|
||||||
"preact": "^10.24.3"
|
"preact": "^10.24.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
@@ -990,12 +989,6 @@
|
|||||||
"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
|
"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/monaco-editor": {
|
|
||||||
"version": "0.52.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.52.2.tgz",
|
|
||||||
"integrity": "sha512-GEQWEZmfkOGLdd3XK8ryrfWz3AIP8YymVXiPHEdewrUq7mh0qrKrfHLNCXcbB6sTnMLnOZ3ztSiKcciFUkIJwQ==",
|
|
||||||
"license": "MIT"
|
|
||||||
},
|
|
||||||
"node_modules/nanoid": {
|
"node_modules/nanoid": {
|
||||||
"version": "3.3.11",
|
"version": "3.3.11",
|
||||||
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
|
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
|
||||||
|
|||||||
@@ -444,8 +444,8 @@ const processOutput = (
|
|||||||
);
|
);
|
||||||
if (match) {
|
if (match) {
|
||||||
let [_full, kind, file, line, col, message] = match;
|
let [_full, kind, file, line, col, message] = match;
|
||||||
let lineNumber = +line + 1;
|
let lineNumber = +line;
|
||||||
let column = +col + 1;
|
let column = +col;
|
||||||
// FIXME - pass the real path in
|
// FIXME - pass the real path in
|
||||||
if (fn && fn !== file) {
|
if (fn && fn !== file) {
|
||||||
lineNumber = column = 0;
|
lineNumber = column = 0;
|
||||||
|
|||||||
@@ -119,7 +119,7 @@ data Error
|
|||||||
| Postpone FC QName String
|
| Postpone FC QName String
|
||||||
|
|
||||||
instance Show FC where
|
instance Show FC where
|
||||||
show fc = "\{fc.file}:\{show fc.start}"
|
show (MkFC file (l,c)) = "\{file}:(\{show $ l + 1}, \{show $ c + 1})"
|
||||||
|
|
||||||
|
|
||||||
showError : String -> Error -> String
|
showError : String -> Error -> String
|
||||||
|
|||||||
Reference in New Issue
Block a user