ashatora/editor
1
0
Fork 0
mirror of https://github.com/maputnik/editor.git synced 2026-02-09 06:00:09 +00:00
Code Issues Projects Releases Wiki Activity

abstract out tryToParse

Browse Source
This commit is contained in:
Birk Skyum
2025-01-21 22:47:02 +01:00
parent 822fc2bdc2
commit 80d34c3449
1 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/libs/codemirror-mgl.ts
View File

@@ -14,7 +14,9 @@ CodeMirror.defineMode("mgl", (config, parserConfig) => {
);
});
CodeMirror.registerHelper("lint", "json", (text: string) => {
function tryToParse(text: string) {
const found: MarkerRangeWithMessage[] = [];
try {
parse(text);
@@ -38,37 +40,20 @@ CodeMirror.registerHelper("lint", "json", (text: string) => {
});
}
}
return found;
}
CodeMirror.registerHelper("lint", "json", (text: string) => {
return tryToParse(text);
});
CodeMirror.registerHelper("lint", "mgl", (text: string, opts: any, doc: any) => {
const found: MarkerRangeWithMessage[] = [];
const found: MarkerRangeWithMessage[] = tryToParse(text);
const {context} = opts;
try {
parse(text);
}
catch (err: any) {
const errorMatch = err.toString().match(/line (\d+), column (\d+)/);
if (errorMatch) {
const loc = {
first_line: parseInt(errorMatch[1], 10),
first_column: parseInt(errorMatch[2], 10),
last_line: parseInt(errorMatch[1], 10),
last_column: parseInt(errorMatch[2], 10)
};
// const loc = hash.loc;
found.push({
from: CodeMirror.Pos(loc.first_line - 1, loc.first_column),
to: CodeMirror.Pos(loc.last_line - 1, loc.last_column),
message: err
});
}
}
if (found.length > 0) {
// JSON invalid so don't go any further
return found;