@codingame/monaco-editor-wrapper 3.2.1 → 3.4.0

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

@@ -4393,5 +4393,69 @@ function hideCodeWithoutDecoration(editor, decorations) {
     editor.setHiddenAreas(otherHiddenAreas);
   };
 }
+/**
+ * Collapse everything between startToken and endToken
+ */
+
+async function collapseCodeSections(editor, startToken, endToken) {
+  let isRegex = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  const editorModel = editor.getModel();
+  const ranges = [];
+
+  if (editorModel != null) {
+    let currentPosition = editorModel.getFullModelRange().getStartPosition();
+    let match;
+
+    while ((match = editorModel.findNextMatch(startToken,
+    /* searchStart */
+    currentPosition,
+    /* isRegex */
+    isRegex,
+    /* matchCase */
+    true,
+    /* wordSeparators */
+    null,
+    /* captureMatches */
+    false)) != null) {
+      var _matchEnd$range$getEn;
+
+      if (match.range.getStartPosition().isBefore(currentPosition)) {
+        break;
+      }
+
+      const matchEnd = editorModel.findNextMatch(endToken,
+      /* searchStart */
+      match.range.getEndPosition(),
+      /* isRegex */
+      isRegex,
+      /* matchCase */
+      true,
+      /* wordSeparators */
+      null,
+      /* captureMatches */
+      false);
+
+      if (matchEnd != null && matchEnd.range.getStartPosition().isBefore(match.range.getStartPosition())) {
+        break;
+      }
+
+      currentPosition = (_matchEnd$range$getEn = matchEnd === null || matchEnd === void 0 ? void 0 : matchEnd.range.getEndPosition()) !== null && _matchEnd$range$getEn !== void 0 ? _matchEnd$range$getEn : editorModel.getFullModelRange().getEndPosition();
+      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);
+    }
+  }
+}
 
-export { createEditor, defineVSCodeTheme, getMonacoLanguage, hideCodeWithoutDecoration, loadLanguage, lockCodeWithoutDecoration, registerEditorOpenHandler, registerTextModelContentProvider, updateEditorKeybindingsMode, updateKeybindings };
+export { collapseCodeSections, createEditor, defineVSCodeTheme, getMonacoLanguage, hideCodeWithoutDecoration, loadLanguage, lockCodeWithoutDecoration, registerEditorOpenHandler, registerTextModelContentProvider, updateEditorKeybindingsMode, updateKeybindings };

package/dist/tools.d.ts

@@ -1,3 +1,7 @@
 import * as monaco from 'monaco-editor';
 export declare function lockCodeWithoutDecoration(editor: monaco.editor.IStandaloneCodeEditor, decorations: string[], allowChangeFromSources: string[], errorMessage?: string): () => void;
 export declare function hideCodeWithoutDecoration(editor: monaco.editor.IStandaloneCodeEditor, decorations: string[]): () => void;
+/**
+ * Collapse everything between startToken and endToken
+ */
+export declare function collapseCodeSections(editor: monaco.editor.IStandaloneCodeEditor, startToken: string, endToken: string, isRegex?: boolean): Promise<void>;

package/package.json

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