@codingame/monaco-editor-wrapper 3.3.0 → 3.4.1

package/dist/features/jsonContribution.d.ts

@@ -1 +1,6 @@
 import 'monaco-editor/esm/vs/language/json/monaco.contribution';
+import * as monaco from 'monaco-editor';
+import { Disposable } from 'vscode';
+declare type Unpacked<T> = T extends (infer U)[] ? U : T;
+export declare function addJsonSchema(schema: Unpacked<NonNullable<monaco.languages.json.DiagnosticsOptions['schemas']>>): Disposable;
+export {};

package/dist/features/jsonContribution.js

@@ -1,16 +1,23 @@
 import 'monaco-editor/esm/vs/language/json/monaco.contribution';
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
 import { onDidChangeJsonSchema, getJsonSchemas } from 'vscode/monaco';
+import { Disposable } from 'vscode';
 import { r as registerWorkerLoader } from '../worker.js';
 
+const customSchemas = [];
+
 function updateDiagnosticsOptions() {
   monaco.languages.json.jsonDefaults.setDiagnosticsOptions({
     comments: 'ignore',
     validate: true,
-    schemas: getJsonSchemas({
+    enableSchemaRequest: true,
+    schemas: [...getJsonSchemas({
       keybindings: ['file:///keybindings.json'],
       'settings/user': ['file:///settings.json']
-    })
+    }), {
+      uri: 'https://json-schema.org/draft/2019-09/schema',
+      fileMatch: ['*.schema.json']
+    }, ...customSchemas]
   });
 }
 
@@ -22,3 +29,17 @@ const workerLoader = async () => (await import(
 '../json.worker.js').then(module => module)).default;
 
 registerWorkerLoader('json', workerLoader);
+function addJsonSchema(schema) {
+  customSchemas.push(schema);
+  updateDiagnosticsOptions();
+  return new Disposable(() => {
+    const index = customSchemas.indexOf(schema);
+
+    if (index >= 0) {
+      customSchemas.splice(index, 1);
+      updateDiagnosticsOptions();
+    }
+  });
+}
+
+export { addJsonSchema };

package/dist/main.js

@@ -4443,17 +4443,19 @@ async function collapseCodeSections(editor, startToken, endToken) {
       ranges.push(monaco.Range.fromPositions(match.range.getStartPosition(), currentPosition));
     }
 
-    const selections = editor.getSelections();
-    editor.setSelections(ranges.map(r => ({
-      selectionStartLineNumber: r.startLineNumber,
-      selectionStartColumn: r.startColumn,
-      positionLineNumber: r.endLineNumber,
-      positionColumn: r.endColumn
-    })));
-    await editor.getAction('editor.createFoldingRangeFromSelection').run();
-
-    if (selections != null) {
-      editor.setSelections(selections);
+    if (ranges.length > 0) {
+      const selections = editor.getSelections();
+      editor.setSelections(ranges.map(r => ({
+        selectionStartLineNumber: r.startLineNumber,
+        selectionStartColumn: r.startColumn,
+        positionLineNumber: r.endLineNumber,
+        positionColumn: r.endColumn
+      })));
+      await editor.getAction('editor.createFoldingRangeFromSelection').run();
+
+      if (selections != null) {
+        editor.setSelections(selections);
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-editor-wrapper",
-  "version": "3.3.0",
+  "version": "3.4.1",
   "private": false,
   "description": "Enhanced Monaco editor with TextMate grammars and more",
   "scripts": {