@lvce-editor/editor-worker 19.18.1 → 19.20.0

package/dist/editorWorkerMain.js

@@ -8599,47 +8599,17 @@ const setDecorations = (editor, decorations, diagnostics) => {
   };
 };
 
-// TODO add command to set language id
-// without needing to specify tokenizePath
 const setLanguageId = async (editor, languageId, tokenizePath) => {
   const {
     tokenizerId
   } = editor;
-  setTokenizePath(languageId, tokenizePath);
-  // TODO move tokenizer to syntax highlighting worker
-  // TODO only load tokenizer if not already loaded
-  // if already loaded just set tokenizer and rerender text
-  // TODO race condition
   await loadTokenizer(languageId, tokenizePath);
   const tokenizer = getTokenizer(languageId);
   const newTokenizerId = tokenizerId + 1;
   set$4(newTokenizerId, tokenizer);
-  const latest = getEditor$1(editor.uid);
-  if (!latest) {
-    return editor;
-  }
-  const syncIncremental = getEnabled();
-  const {
-    differences,
-    textInfos
-  } = await getVisible$1(editor, syncIncremental);
-  const latest2 = getEditor$1(editor.uid);
-  if (!latest2) {
-    return editor;
-  }
-  const newEditor4 = {
-    ...latest2,
-    differences,
-    focused: true,
-    textInfos
-  };
-
-  // TODO don't update editor if tokenizer was already loaded
-  // TODO update syntax highlighting
-  // TODO get edits
-
   return {
-    ...newEditor4,
+    ...editor,
+    focused: true,
     invalidStartIndex: 0,
     languageId,
     tokenizerId: newTokenizerId
@@ -11245,6 +11215,104 @@ const handleMessagePort = async (port, rpcId) => {
   }
 };
 
+const kLineHeight = 'editor.lineHeight';
+const kFontSize = 'editor.fontSize';
+const kFontFamily = 'editor.fontFamily';
+const kLetterSpacing = 'editor.letterSpacing';
+const kTabSize = 'editor.tabSize';
+const kLineNumbers = 'editor.lineNumbers';
+const kDiagnostics = 'editor.diagnostics';
+const kQuickSuggestions = 'editor.quickSuggestions';
+const kAutoClosingQuotes = 'editor.autoClosingQuotes';
+const kAutoClosingBrackets = 'editor.autoclosingBrackets';
+const kFontWeight = 'editor.fontWeight';
+const isAutoClosingBracketsEnabled = async () => {
+  return Boolean(await get$2(kAutoClosingBrackets));
+};
+const isAutoClosingQuotesEnabled = async () => {
+  return Boolean(await get$2(kAutoClosingQuotes));
+};
+const isQuickSuggestionsEnabled = async () => {
+  return Boolean(await get$2(kQuickSuggestions));
+};
+const isAutoClosingTagsEnabled = async () => {
+  return true;
+};
+const getRowHeight = async () => {
+  return (await get$2(kLineHeight)) || 20;
+};
+const getFontSize = async () => {
+  return (await get$2(kFontSize)) || 15; // TODO find out if it is possible to use all numeric values for settings for efficiency, maybe settings could be an array
+};
+const getFontFamily = async () => {
+  return (await get$2(kFontFamily)) || 'Fira Code';
+};
+const getLetterSpacing = async () => {
+  // if (!false) {
+  //   return 0
+  // }
+  return (await get$2(kLetterSpacing)) ?? 0.5;
+};
+const getTabSize = async () => {
+  return (await get$2(kTabSize)) || 2;
+};
+const getLineNumbers = async () => {
+  return (await get$2(kLineNumbers)) ?? false;
+};
+const getCompletionTriggerCharacters = async () => {
+  return ['.', '/'];
+};
+const diagnosticsEnabled = async () => {
+  return (await get$2(kDiagnostics)) ?? false;
+};
+const getFontWeight = async () => {
+  return (await get$2(kFontWeight)) ?? 400;
+};
+
+const getEditorPreferences = async () => {
+  const [diagnosticsEnabled$1, fontFamily, fontSize, fontWeight, isAutoClosingBracketsEnabled$1, isAutoClosingQuotesEnabled$1, isAutoClosingTagsEnabled$1, isQuickSuggestionsEnabled$1, lineNumbers, rowHeight, tabSize, letterSpacing, completionTriggerCharacters] = await Promise.all([diagnosticsEnabled(), getFontFamily(), getFontSize(), getFontWeight(), isAutoClosingBracketsEnabled(), isAutoClosingQuotesEnabled(), isAutoClosingTagsEnabled(), isQuickSuggestionsEnabled(), getLineNumbers(), getRowHeight(), getTabSize(), getLetterSpacing(), getCompletionTriggerCharacters()]);
+  return {
+    completionTriggerCharacters,
+    diagnosticsEnabled: diagnosticsEnabled$1,
+    fontFamily,
+    fontSize,
+    fontWeight,
+    isAutoClosingBracketsEnabled: isAutoClosingBracketsEnabled$1,
+    isAutoClosingQuotesEnabled: isAutoClosingQuotesEnabled$1,
+    isAutoClosingTagsEnabled: isAutoClosingTagsEnabled$1,
+    isQuickSuggestionsEnabled: isQuickSuggestionsEnabled$1,
+    letterSpacing,
+    lineNumbers,
+    rowHeight,
+    tabSize
+  };
+};
+
+const handleSettingsChanged = async state => {
+  const editorPreferences = await getEditorPreferences();
+  const {
+    diagnosticsEnabled,
+    fontFamily,
+    fontSize,
+    fontWeight,
+    letterSpacing,
+    rowHeight
+  } = editorPreferences;
+  const [charWidth, completionsOnTypeRaw] = await Promise.all([measureCharacterWidth(fontWeight, fontSize, fontFamily, letterSpacing), get$2('editor.completionsOnType')]);
+  const isMonospaceFont = fontFamily === 'Fira Code' || fontFamily === "'Fira Code'";
+  const editorWithUpdatedSettings = {
+    ...state,
+    ...editorPreferences,
+    charWidth,
+    completionsOnType: Boolean(completionsOnTypeRaw),
+    diagnostics: diagnosticsEnabled ? state.diagnostics : [],
+    isMonospaceFont,
+    itemHeight: rowHeight,
+    visualDecorations: diagnosticsEnabled ? state.visualDecorations : []
+  };
+  return resize(editorWithUpdatedSettings, {}, charWidth);
+};
+
 const applyTabCompletion = (editor, result) => {
   return editorSnippet(editor, result);
 };
@@ -11450,79 +11518,6 @@ const intialize = async (syntaxHighlightingEnabled, syncIncremental) => {
   await initializeSyntaxHighlighting(syntaxHighlightingEnabled, syncIncremental);
 };
 
-const kLineHeight = 'editor.lineHeight';
-const kFontSize = 'editor.fontSize';
-const kFontFamily = 'editor.fontFamily';
-const kLetterSpacing = 'editor.letterSpacing';
-const kTabSize = 'editor.tabSize';
-const kLineNumbers = 'editor.lineNumbers';
-const kDiagnostics = 'editor.diagnostics';
-const kQuickSuggestions = 'editor.quickSuggestions';
-const kAutoClosingQuotes = 'editor.autoClosingQuotes';
-const kAutoClosingBrackets = 'editor.autoclosingBrackets';
-const kFontWeight = 'editor.fontWeight';
-const isAutoClosingBracketsEnabled = async () => {
-  return Boolean(await get$2(kAutoClosingBrackets));
-};
-const isAutoClosingQuotesEnabled = async () => {
-  return Boolean(await get$2(kAutoClosingQuotes));
-};
-const isQuickSuggestionsEnabled = async () => {
-  return Boolean(await get$2(kQuickSuggestions));
-};
-const isAutoClosingTagsEnabled = async () => {
-  return true;
-};
-const getRowHeight = async () => {
-  return (await get$2(kLineHeight)) || 20;
-};
-const getFontSize = async () => {
-  return (await get$2(kFontSize)) || 15; // TODO find out if it is possible to use all numeric values for settings for efficiency, maybe settings could be an array
-};
-const getFontFamily = async () => {
-  return (await get$2(kFontFamily)) || 'Fira Code';
-};
-const getLetterSpacing = async () => {
-  // if (!false) {
-  //   return 0
-  // }
-  return (await get$2(kLetterSpacing)) ?? 0.5;
-};
-const getTabSize = async () => {
-  return (await get$2(kTabSize)) || 2;
-};
-const getLineNumbers = async () => {
-  return (await get$2(kLineNumbers)) ?? false;
-};
-const getCompletionTriggerCharacters = async () => {
-  return ['.', '/'];
-};
-const diagnosticsEnabled = async () => {
-  return (await get$2(kDiagnostics)) ?? false;
-};
-const getFontWeight = async () => {
-  return (await get$2(kFontWeight)) ?? 400;
-};
-
-const getEditorPreferences = async () => {
-  const [diagnosticsEnabled$1, fontFamily, fontSize, fontWeight, isAutoClosingBracketsEnabled$1, isAutoClosingQuotesEnabled$1, isAutoClosingTagsEnabled$1, isQuickSuggestionsEnabled$1, lineNumbers, rowHeight, tabSize, letterSpacing, completionTriggerCharacters] = await Promise.all([diagnosticsEnabled(), getFontFamily(), getFontSize(), getFontWeight(), isAutoClosingBracketsEnabled(), isAutoClosingQuotesEnabled(), isAutoClosingTagsEnabled(), isQuickSuggestionsEnabled(), getLineNumbers(), getRowHeight(), getTabSize(), getLetterSpacing(), getCompletionTriggerCharacters()]);
-  return {
-    completionTriggerCharacters,
-    diagnosticsEnabled: diagnosticsEnabled$1,
-    fontFamily,
-    fontSize,
-    fontWeight,
-    isAutoClosingBracketsEnabled: isAutoClosingBracketsEnabled$1,
-    isAutoClosingQuotesEnabled: isAutoClosingQuotesEnabled$1,
-    isAutoClosingTagsEnabled: isAutoClosingTagsEnabled$1,
-    isQuickSuggestionsEnabled: isQuickSuggestionsEnabled$1,
-    letterSpacing,
-    lineNumbers,
-    rowHeight,
-    tabSize
-  };
-};
-
 const getTokenizePath = (languages, languageId) => {
   for (const language of languages) {
     if (language?.id === languageId && language.tokenize) {
@@ -12668,24 +12663,37 @@ const updateDebugInfo = async debugId => {
   await invoke$b('Editor.rerender', key);
 };
 
+const queues = [];
+
 // TODO wrap commands globally, not per editor
 // TODO only store editor state in editor worker, not in renderer worker also
 
-const wrapCommand = fn => async (editorUid, ...args) => {
-  const oldInstance = get$7(editorUid);
-  const state = oldInstance.newState;
-  const newEditor = await fn(state, ...args);
-  if (state === newEditor) {
-    return newEditor;
+const wrapCommand = fn => async (uid, ...args) => {
+  const previous = queues[uid];
+  const {
+    promise: next,
+    resolve
+  } = Promise.withResolvers();
+  queues[uid] = next;
+  if (previous) {
+    await previous;
+  }
+  try {
+    const oldInstance = get$7(uid);
+    const state = oldInstance.newState;
+    const newEditor = await fn(state, ...args);
+    if (state === newEditor) {
+      return newEditor;
+    }
+    const newEditorWithDerivedState = await updateDerivedState(state, newEditor);
+    set$9(uid, state, newEditorWithDerivedState);
+    return newEditorWithDerivedState;
+  } finally {
+    resolve();
+    if (queues[uid] === next) {
+      queues[uid] = undefined;
+    }
   }
-  const newEditorWithDerivedState = await updateDerivedState(state, newEditor);
-
-  // TODO if editor did not change, no need to update furthur
-
-  // TODO combine neweditor with latest editor?
-
-  set$9(editorUid, state, newEditorWithDerivedState);
-  return newEditorWithDerivedState;
 };
 
 const commandMap = {
@@ -12796,6 +12804,7 @@ const commandMap = {
   'Editor.handleScrollBarVerticalMove': wrapCommand(handleScrollBarVerticalPointerMove),
   'Editor.handleScrollBarVerticalPointerDown': wrapCommand(handleScrollBarPointerDown),
   'Editor.handleScrollBarVerticalPointerMove': wrapCommand(handleScrollBarVerticalPointerMove),
+  'Editor.handleSettingsChanged': wrapCommand(handleSettingsChanged),
   'Editor.handleSingleClick': wrapCommand(handleSingleClick),
   'Editor.handleTab': wrapCommand(handleTab),
   'Editor.handleTouchEnd': wrapCommand(handleTouchEnd),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "19.18.1",
+  "version": "19.20.0",
   "repository": {
     "type": "git",
     "url": "git@github.com:lvce-editor/editor-worker.git"