@lvce-editor/editor-worker 7.4.0 → 7.6.0

package/dist/editorWorkerMain.js

@@ -1033,7 +1033,7 @@ const WebWorkerRpcClient = {
 };
 
 const rpcs = Object.create(null);
-const set$c = (id, rpc) => {
+const set$d = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$6 = id => {
@@ -1057,11 +1057,11 @@ const create$9 = rpcId => {
       return rpc.invokeAndTransfer(method, ...params);
     },
     set(rpc) {
-      set$c(rpcId, rpc);
+      set$d(rpcId, rpc);
     }
   };
 };
-const DebugWorker = 55;
+const DebugWorker$1 = 55;
 const EditorWorker$1 = 99;
 const ExtensionHostWorker = 44;
 const MainProcess$1 = -5;
@@ -1084,7 +1084,7 @@ const RpcId = {
   __proto__: null,
   ColorPickerWorker,
   CompletionWorker,
-  DebugWorker,
+  DebugWorker: DebugWorker$1,
   EditorWorker: EditorWorker$1,
   EmbedsProcess: EmbedsProcess$1,
   EmbedsWorker,
@@ -1189,15 +1189,15 @@ const launchColorPickerWorker = async () => {
   return launchWorker(name, url);
 };
 
-let workerPromise$4;
-const getOrCreate$5 = () => {
-  if (!workerPromise$4) {
-    workerPromise$4 = launchColorPickerWorker();
+let workerPromise$3;
+const getOrCreate$4 = () => {
+  if (!workerPromise$3) {
+    workerPromise$3 = launchColorPickerWorker();
   }
-  return workerPromise$4;
+  return workerPromise$3;
 };
 const invoke$6 = async (method, ...params) => {
-  const worker = await getOrCreate$5();
+  const worker = await getOrCreate$4();
   return await worker.invoke(method, ...params);
 };
 
@@ -1287,6 +1287,9 @@ const get$4 = id => {
   number(id);
   return editors[id];
 };
+const getKeys = () => {
+  return Object.keys(editors);
+};
 const set$6 = (id, oldEditor, newEditor) => {
   object(oldEditor);
   object(newEditor);
@@ -1617,7 +1620,7 @@ const createMeasureContext = () => {
 const state$8 = {
   ctx: undefined
 };
-const getOrCreate$4 = createCtx => {
+const getOrCreate$3 = createCtx => {
   if (state$8.ctx) {
     return state$8.ctx;
   }
@@ -1626,7 +1629,7 @@ const getOrCreate$4 = createCtx => {
 };
 
 const getContext = () => {
-  const ctx = getOrCreate$4(createMeasureContext);
+  const ctx = getOrCreate$3(createMeasureContext);
   return ctx;
 };
 
@@ -2324,7 +2327,9 @@ const createEditor = async ({
   fontFamily,
   isMonospaceFont,
   uri,
-  diagnosticsEnabled
+  diagnosticsEnabled,
+  lineToReveal,
+  columnToReveal
 }) => {
   number(id);
   string(content);
@@ -2390,7 +2395,14 @@ const createEditor = async ({
   // TODO avoid creating intermediate editors here
   const newEditor1 = setBounds(editor, x, y, width, height, 9);
   const newEditor2 = setText(newEditor1, content);
-  const newEditor3 = setDeltaY$2(newEditor2, 0);
+  let newEditor3;
+  if (lineToReveal && columnToReveal) {
+    const delta = lineToReveal * rowHeight;
+    // TODO scroll to this line
+    newEditor3 = setDeltaY$2(newEditor2, delta);
+  } else {
+    newEditor3 = setDeltaY$2(newEditor2, 0);
+  }
   const newEditor4 = {
     ...newEditor3,
     focused: true
@@ -2863,15 +2875,15 @@ const launchRenameWorker = async () => {
   return launchWorker(name, url);
 };
 
-let workerPromise$3;
-const getOrCreate$3 = () => {
-  if (!workerPromise$3) {
-    workerPromise$3 = launchRenameWorker();
+let workerPromise$2;
+const getOrCreate$2 = () => {
+  if (!workerPromise$2) {
+    workerPromise$2 = launchRenameWorker();
   }
-  return workerPromise$3;
+  return workerPromise$2;
 };
 const invoke$4 = async (method, ...params) => {
-  const worker = await getOrCreate$3();
+  const worker = await getOrCreate$2();
   return await worker.invoke(method, ...params);
 };
 
@@ -5173,15 +5185,15 @@ const launchCompletionWorker = async () => {
   return launchWorker(name, url);
 };
 
-let workerPromise$2;
-const getOrCreate$2 = () => {
-  if (!workerPromise$2) {
-    workerPromise$2 = launchCompletionWorker();
+let workerPromise$1;
+const getOrCreate$1 = () => {
+  if (!workerPromise$1) {
+    workerPromise$1 = launchCompletionWorker();
   }
-  return workerPromise$2;
+  return workerPromise$1;
 };
 const invoke$3 = async (method, ...params) => {
-  const worker = await getOrCreate$2();
+  const worker = await getOrCreate$1();
   return await worker.invoke(method, ...params);
 };
 
@@ -5243,15 +5255,15 @@ const launchFindWidgetWorker = async () => {
   return launchWorker(name, url);
 };
 
-let workerPromise$1;
-const getOrCreate$1 = () => {
-  if (!workerPromise$1) {
-    workerPromise$1 = launchFindWidgetWorker();
+let workerPromise;
+const getOrCreate = () => {
+  if (!workerPromise) {
+    workerPromise = launchFindWidgetWorker();
   }
-  return workerPromise$1;
+  return workerPromise;
 };
 const invoke$2 = async (method, ...params) => {
-  const worker = await getOrCreate$1();
+  const worker = await getOrCreate();
   return await worker.invoke(method, ...params);
 };
 
@@ -8602,6 +8614,16 @@ const handleBeforeInput = (editor, inputType, data) => {
   }
 };
 
+const handleMessagePort = async (port, rpcId) => {
+  const rpc = await PlainMessagePortRpcParent.create({
+    messagePort: port,
+    commandMap: {}
+  });
+  if (rpcId) {
+    set$d(rpcId, rpc);
+  }
+};
+
 const applyTabCompletion = (editor, result) => {
   return editorSnippet(editor, result);
 };
@@ -8642,26 +8664,38 @@ const initializeExtensionHost = async () => {
   set$5(extensionHostRpc);
 };
 
-const sendMessagePortToSyntaxHighlightingWorker = async port => {
-  await invokeAndTransfer(
-  // @ts-ignore
-  'SendMessagePortToSyntaxHighlightingWorker.sendMessagePortToSyntaxHighlightingWorker', port, 'HandleMessagePort.handleMessagePort');
-};
-
-const createSyntaxHighlightingWorkerRpc = async () => {
+const sendMessagePortToSyntaxHighlightingWorker = async () => {
   try {
     const {
       port1,
       port2
     } = getPortTuple();
-    await sendMessagePortToSyntaxHighlightingWorker(port2);
+    await invokeAndTransfer(
+    // @ts-ignore
+    'SendMessagePortToSyntaxHighlightingWorker.sendMessagePortToSyntaxHighlightingWorker', port1, 'HandleMessagePort.handleMessagePort2');
+    return port2;
+  } catch {
+    const {
+      port1,
+      port2
+    } = getPortTuple();
+    await invokeAndTransfer(
+    // @ts-ignore
+    'SendMessagePortToSyntaxHighlightingWorker.sendMessagePortToSyntaxHighlightingWorker', port1, 'HandleMessagePort.handleMessagePort');
+    return port2;
+  }
+};
+
+const createSyntaxHighlightingWorkerRpc = async () => {
+  try {
+    const port = await sendMessagePortToSyntaxHighlightingWorker();
     const rpc = await PlainMessagePortRpcParent.create({
       commandMap: {},
-      messagePort: port1
+      messagePort: port
     });
     return rpc;
   } catch (error) {
-    throw new VError(error, `Failed to create synax highlighting worker rpc`);
+    throw new VError(error, `Failed to create syntax highlighting worker rpc`);
   }
 };
 
@@ -8743,21 +8777,8 @@ const moveLineUp = editor => {
   return editor;
 };
 
-const launchDebugWorker = async () => {
-  const name = 'Debug Worker';
-  const url = 'debugWorkerMain.js';
-  return launchWorker(name, url);
-};
-
-let workerPromise;
-const getOrCreate = async () => {
-  if (!workerPromise) {
-    workerPromise = launchDebugWorker();
-  }
-  return workerPromise;
-};
 const invoke = async (method, ...params) => {
-  const worker = await getOrCreate();
+  const worker = get$6(RpcId.DebugWorker);
   return worker.invoke(method, ...params);
 };
 
@@ -9371,7 +9392,10 @@ const getIncrementalEdits = async (oldState, newState) => {
       } = newState;
       const oldLine = oldState.lines[rowIndex];
       const newLine = lines[rowIndex];
-      const incrementalEdits = await invoke$1('TokenizeIncremental.tokenizeIncremental', newState.uid,
+      // @ts-ignore
+      const incrementalEdits = await invoke$1(
+      // @ts-ignore
+      'TokenizeIncremental.tokenizeIncremental', newState.uid,
       // @ts-ignore
       newState.languageId, oldLine, newLine, rowIndex, newState.minLineY);
       if (incrementalEdits && incrementalEdits.length === 1) {
@@ -9643,6 +9667,31 @@ const setDebugEnabled = (state, enabled) => {
   return state;
 };
 
+const getDebugHighlight = async debugId => {
+  const newInfo = await invoke('RunAndDebug.getHighlight', debugId);
+  return newInfo;
+};
+
+const getKey = () => {
+  const keys = getKeys();
+  return parseInt(keys[0]);
+};
+const updateDebugInfo = async debugId => {
+  const newInfo = await getDebugHighlight(debugId);
+  const key = getKey();
+  const {
+    oldState,
+    newState
+  } = get$4(key);
+  const newEditor = {
+    ...newState,
+    highlightedLine: newInfo.rowIndex
+  };
+  set$6(key, oldState, newEditor);
+  // @ts-ignore
+  await invoke$7('Editor.rerender', key);
+};
+
 const editorDiagnosticEffect = {
   isActive(oldEditor, newEditor) {
     // TODO avoid slow comparison
@@ -9654,13 +9703,12 @@ const editorDiagnosticEffect = {
   }
 };
 
-const keep = [
+const keep = ['ActivateByEvent.activateByEvent', 'Editor.applyEdit2', 'Editor.applyEdits2', 'Editor.closeFind2', 'Editor.closeWidget2', 'Editor.create', 'Editor.getKeyBindings', 'Editor.getLines2', 'Editor.getPositionAtCursor', 'Editor.getQuickPickMenuEntries', 'Editor.getSelections', 'Editor.getSelections2', 'Editor.getText', 'Editor.getWordAt', 'Editor.getWordAt2', 'Editor.getWordAtOffset2', 'Editor.getWordBefore', 'Editor.getWordBefore2', 'Editor.offsetAt', 'Editor.render', 'Editor.setSelections2', 'Editor.updateDebugInfo', 'Font.ensure', 'HandleMessagePort.handleMessagePort', 'Hover.getHoverInfo', 'Hover.handleSashPointerDown', 'Hover.handleSashPointerMove', 'Hover.handleSashPointerUp', 'Hover.loadContent', 'Hover.render', 'Initialize.initialize', 'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker'
 // 'ColorPicker.handleSliderPointerDown',
 // 'ColorPicker.handleSliderPointerMove',
 // 'ColorPicker.loadContent',
-'Editor.create', 'Editor.getWordAt', 'Editor.getWordBefore', 'Editor.offsetAt', 'Editor.render', 'Editor.getKeyBindings', 'Editor.getPositionAtCursor', 'Editor.getWordAt2', 'Editor.getWordAtOffset2', 'Editor.getWordBefore2', 'Editor.getLines2', 'Editor.applyEdit2', 'Editor.applyEdits2', 'Editor.closeFind2', 'Editor.closeWidget2', 'Editor.getSelections2', 'Editor.getQuickPickMenuEntries',
 // 'ColorPicker.render',
-'Editor.getText', 'Editor.getSelections', 'Editor.setSelections2', 'Font.ensure', 'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', 'Hover.getHoverInfo', 'Hover.handleSashPointerDown', 'Hover.handleSashPointerMove', 'Hover.handleSashPointerUp', 'Hover.loadContent', 'Hover.render', 'Initialize.initialize', 'ActivateByEvent.activateByEvent'];
+];
 
 const wrapWidgetCommand = (widgetId, fn) => {
   const isWidget = widget => {
@@ -9893,6 +9941,7 @@ const commandMap = {
   'Editor.typeWithAutoClosing': typeWithAutoClosing,
   'Editor.undo': undo,
   'Editor.unIndent': editorUnindent,
+  'Editor.updateDebugInfo': updateDebugInfo,
   'Editor.updateDiagnostics': updateDiagnostics,
   'EditorCompletion.close': close$1,
   'EditorCompletion.closeDetails': closeDetails,
@@ -9930,6 +9979,7 @@ const commandMap = {
   'FindWidget.loadContent': loadContent$1,
   'FindWidget.toggleReplace': toggleReplace,
   'Font.ensure': ensure,
+  'HandleMessagePort.handleMessagePort': handleMessagePort,
   'Hover.getHoverInfo': getEditorHoverInfo,
   'Hover.handleSashPointerDown': handleSashPointerDown,
   'Hover.handleSashPointerMove': handleSashPointerMove,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "7.4.0",
+  "version": "7.6.0",
   "description": "",
   "license": "MIT",
   "author": "Lvce Editor",