ashatora/editor
1
0
Fork 0
mirror of https://github.com/maputnik/editor.git synced 2026-08-24 14:07:33 +00:00
Code Issues Projects Releases Wiki Activity

cleanup old jsonlint hacks

Browse Source
This commit is contained in:
Birk Skyum
2025-01-21 18:39:34 +01:00
parent 6cc6e9775a
commit 91dc221755
1 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/codemirror-mgl.ts
+3 -24
View File
@@ -1,4 +1,4 @@
import jsonlint from '@prantlf/jsonlint'; import {parse} from '@prantlf/jsonlint';
import CodeMirror, { MarkerRange } from 'codemirror'; import CodeMirror, { MarkerRange } from 'codemirror';
import jsonToAst from 'json-to-ast'; import jsonToAst from 'json-to-ast';
import {expression, validateStyleMin} from '@maplibre/maplibre-gl-style-spec'; import {expression, validateStyleMin} from '@maplibre/maplibre-gl-style-spec';
@@ -17,20 +17,8 @@ CodeMirror.defineMode("mgl", (config, parserConfig) => {
CodeMirror.registerHelper("lint", "json", (text: string) => { CodeMirror.registerHelper("lint", "json", (text: string) => {
const found: MarkerRangeWithMessage[] = []; const found: MarkerRangeWithMessage[] = [];
// NOTE: This was modified from the original to remove the global, also the
// old jsonlint API was 'jsonlint.parseError' its now
// 'jsonlint.parser.parseError'
(jsonlint as any).parser.parseError = (str: string, hash: any) => {
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: str
});
};
try { try {
jsonlint.parse(text); parse(text);
} }
catch(_e) { catch(_e) {
// Do nothing we catch the error above // Do nothing we catch the error above
@@ -40,19 +28,10 @@ CodeMirror.registerHelper("lint", "json", (text: string) => {
CodeMirror.registerHelper("lint", "mgl", (text: string, opts: any, doc: any) => { CodeMirror.registerHelper("lint", "mgl", (text: string, opts: any, doc: any) => {
const found: MarkerRangeWithMessage[] = []; const found: MarkerRangeWithMessage[] = [];
const {parser} = jsonlint as any;
const {context} = opts; const {context} = opts;
parser.parseError = (str: string, hash: any) => {
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: str
});
};
try { try {
parser.parse(text); parse(text);
} }
catch (_e) { catch (_e) {
// ignore errors // ignore errors