@lvce-editor/editor-worker 19.46.0 → 19.47.0

package/dist/editorWorkerMain.js

@@ -1151,7 +1151,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$g = (id, rpc) => {
+const set$h = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$9 = id => {
@@ -1184,7 +1184,7 @@ const create$a = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$g(rpcId, mockRpc);
+      set$h(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove$8(rpcId);
@@ -1193,7 +1193,7 @@ const create$a = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$g(rpcId, rpc);
+      set$h(rpcId, rpc);
     }
   };
 };
@@ -1439,6 +1439,7 @@ const Electron = 2;
 const CompletionWorker = 301;
 const DebugWorker = 55;
 const DialogWorker = 7014;
+const DragAndDropWorker = 3404;
 const EditorWorker = 99;
 const ErrorWorker = 3308;
 const ExtensionManagementWorker = 9006;
@@ -1454,10 +1455,15 @@ const SetPatches = 'Viewlet.setPatches';
 
 const FocusEditorText$1 = 12;
 
+const {
+  invoke: invoke$g,
+  set: set$g
+} = create$a(DialogWorker);
+
 const {
   invoke: invoke$f,
   set: set$f
-} = create$a(DialogWorker);
+} = create$a(DragAndDropWorker);
 
 const {
   invoke: invoke$e,
@@ -1485,7 +1491,7 @@ const createLazyRpc = rpcId => {
       throw new Error('Lazy RPC launch was superseded');
     }
     activeRpc = rpc;
-    set$g(rpcId, rpc);
+    set$h(rpcId, rpc);
     return rpc;
   };
   const ensureRpc = async () => {
@@ -1570,6 +1576,10 @@ const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(y);
   await invoke$a('ContextMenu.show2', uid, menuId, x, y, args);
 };
+const sendMessagePortToDragAndDropWorker = async port => {
+  const command = 'DragAndDrop.handleMessagePort';
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToDragAndDropWorker', port, command);
+};
 const sendMessagePortToOpenerWorker = async (port, rpcId) => {
   const command = 'HandleMessagePort.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToOpenerWorker', port, command, rpcId);
@@ -1940,6 +1950,7 @@ const EditorPasteText = 'editorPasteText';
 const EditorSnippet = 'editorSnippet';
 const EditorType = 'editorType';
 const EditorTypeWithAutoClosing = 'editorTypeWithAutoClosing';
+const EditorTextDrag = 'editorTextDrag';
 const Format = 'format';
 const IndentLess = 'indentLess';
 const IndentMore = 'indentMore';
@@ -5009,6 +5020,7 @@ const createEditor2 = (id, uri, x, y, width, height, platform, assetDir) => {
     diagnosticsEnabled: false,
     differences: [],
     documentSymbols: [],
+    dragAndDropEnabled: true,
     embeds: [],
     endOfLine: 'lf',
     endOfLineDecorations: [],
@@ -5077,6 +5089,11 @@ const createEditor2 = (id, uri, x, y, width, height, platform, assetDir) => {
     selectionInfos: [],
     selections: new Uint32Array(),
     tabSize: 0,
+    textDragDropPosition: {
+      columnIndex: 0,
+      rowIndex: 0
+    },
+    textDragId: 0,
     textInfos: [],
     tokenizerId: 0,
     uid: id,
@@ -5107,6 +5124,7 @@ const emptyEditor = {
   diagnostics: [],
   differences: [],
   documentSymbols: [],
+  dragAndDropEnabled: true,
   embeds: [],
   endOfLine: 'lf',
   endOfLineDecorations: [],
@@ -5143,6 +5161,11 @@ const emptyEditor = {
   },
   selectionInfos: [],
   selections: new Uint32Array(),
+  textDragDropPosition: {
+    columnIndex: 0,
+    rowIndex: 0
+  },
+  textDragId: 0,
   textInfos: [],
   tokenizerId: 0,
   undoStack: [],
@@ -5297,6 +5320,7 @@ const createEditor = async ({
     diagnostics: [],
     diagnosticsEnabled,
     differences: [],
+    dragAndDropEnabled: true,
     endOfLine: getEndOfLine(content),
     endOfLineDecorations: [],
     finalDeltaY: 0,
@@ -5354,6 +5378,11 @@ const createEditor = async ({
     selectionInfos: [],
     selections: new Uint32Array(),
     tabSize,
+    textDragDropPosition: {
+      columnIndex: 0,
+      rowIndex: 0
+    },
+    textDragId: 0,
     textInfos: [],
     tokenizerId: 0,
     uid: id,
@@ -6216,7 +6245,7 @@ const isPermissionDeniedError = error => {
 };
 const showSaveErrorDialog = async error => {
   if (isPermissionDeniedError(error)) {
-    await invoke$f('ElectronDialog.showMessageBox', {
+    await invoke$g('ElectronDialog.showMessageBox', {
       buttons: ['OK'],
       defaultId: 0,
       message: "You don't have permission to save changes to this file.",
@@ -6225,7 +6254,7 @@ const showSaveErrorDialog = async error => {
     });
     return;
   }
-  await invoke$f('ElectronDialog.showMessageBox', {
+  await invoke$g('ElectronDialog.showMessageBox', {
     buttons: ['OK'],
     defaultId: 0,
     detail: error.message,
@@ -8682,13 +8711,50 @@ const handleSecondaryMouseDown = async (state, x, y) => {
   }
   return handleClickAtPosition(state, 0, position.rowIndex, position.columnIndex);
 };
-const handleMouseDown = async (state, button, altKey, ctrlKey, x, y, detail) => {
+const startTextDrag = async (state, x, y) => {
+  const position = await at(state, x, y);
+  const selectionIndex = state.primarySelectionIndex || 0;
+  const [startRowIndex, startColumnIndex, endRowIndex, endColumnIndex] = getSelectionPairs(state.selections, selectionIndex);
+  const startOffset = offsetAt(state, startRowIndex, startColumnIndex);
+  const endOffset = offsetAt(state, endRowIndex, endColumnIndex);
+  const pointerOffset = offsetAt(state, position.rowIndex, position.columnIndex);
+  if (startOffset === endOffset || pointerOffset < startOffset || pointerOffset >= endOffset) {
+    return undefined;
+  }
+  try {
+    if (state.textDragId) {
+      await invoke$f('DragAndDrop.discardTextDrag', state.textDragId);
+    }
+    const text = getText$1(state).slice(startOffset, endOffset);
+    const textDragId = await invoke$f('DragAndDrop.createTextDrag', {
+      endOffset,
+      sourceUri: state.uri,
+      startOffset,
+      text
+    });
+    return {
+      ...state,
+      isSelecting: false,
+      textDragDropPosition: position,
+      textDragId
+    };
+  } catch {
+    return undefined;
+  }
+};
+const handleMouseDown = async (state, button, altKey, ctrlKey, x, y, detail, shiftKey = false) => {
   if (button === SecondaryButton) {
     return handleSecondaryMouseDown(state, x, y);
   }
   if (button !== PrimaryButton) {
     return state;
   }
+  if (shiftKey && state.dragAndDropEnabled && detail === Single) {
+    const dragState = await startTextDrag(state, x, y);
+    if (dragState) {
+      return dragState;
+    }
+  }
   const modifier = getModifier(altKey, ctrlKey);
   let newState;
   switch (detail) {
@@ -9220,7 +9286,14 @@ const editorHandleNativeSelectionChange = (editor, range) => {
 };
 
 // @ts-ignore
-const handlePointerCaptureLost = editor => {
+const handlePointerCaptureLost = async editor => {
+  if (editor.textDragId) {
+    try {
+      await invoke$f('DragAndDrop.discardTextDrag', editor.textDragId);
+    } catch {
+      // The pointer state still needs to be reset if the worker is unavailable.
+    }
+  }
   return {
     ...editor,
     hasListener: false,
@@ -9228,7 +9301,12 @@ const handlePointerCaptureLost = editor => {
     selectionAutoMovePosition: {
       columnIndex: 0,
       rowIndex: 0
-    }
+    },
+    textDragDropPosition: {
+      columnIndex: 0,
+      rowIndex: 0
+    },
+    textDragId: 0
   };
 };
 
@@ -9425,6 +9503,13 @@ const moveSelectionPx = async (editor, x, y) => {
 };
 
 const handlePointerMove = async (editor, x, y, altKey) => {
+  if (editor.textDragId) {
+    const textDragDropPosition = await at(editor, x, y);
+    return {
+      ...editor,
+      textDragDropPosition
+    };
+  }
   if (!editor.isSelecting) {
     return editor;
   }
@@ -9434,16 +9519,84 @@ const handlePointerMove = async (editor, x, y, altKey) => {
   return moveSelectionPx(editor, x, y);
 };
 
-const handlePointerUp = editor => {
+const getSelection = (lines, startOffset, endOffset) => {
+  const start = positionAt({
+    lines
+  }, startOffset);
+  const end = positionAt({
+    lines
+  }, endOffset);
+  return new Uint32Array([start.rowIndex, start.columnIndex, end.rowIndex, end.columnIndex]);
+};
+const getTextDragEdit = (editor, data, target, origin) => {
+  const documentText = getText$1(editor);
+  const targetOffset = offsetAt(editor, target.rowIndex, target.columnIndex);
+  const {
+    endOffset,
+    startOffset,
+    text
+  } = data;
+  if (startOffset < 0 || startOffset >= endOffset || endOffset > documentText.length || documentText.slice(startOffset, endOffset) !== text || targetOffset >= startOffset && targetOffset <= endOffset) {
+    return undefined;
+  }
+  const regionStartOffset = Math.min(startOffset, targetOffset);
+  const regionEndOffset = Math.max(endOffset, targetOffset);
+  const replacement = targetOffset < startOffset ? text + documentText.slice(targetOffset, startOffset) : documentText.slice(endOffset, targetOffset) + text;
+  const newSelectionStartOffset = targetOffset < startOffset ? targetOffset : targetOffset - text.length;
+  const newText = documentText.slice(0, regionStartOffset) + replacement + documentText.slice(regionEndOffset);
+  const newLines = splitLines(newText);
+  const start = positionAt(editor, regionStartOffset);
+  const end = positionAt(editor, regionEndOffset);
   return {
+    change: {
+      deleted: splitLines(documentText.slice(regionStartOffset, regionEndOffset)),
+      end,
+      inserted: splitLines(replacement),
+      origin,
+      start
+    },
+    selections: getSelection(newLines, newSelectionStartOffset, newSelectionStartOffset + text.length)
+  };
+};
+
+const moveTextDrag = async (editor, data, target) => {
+  if (data.sourceUri !== editor.uri) {
+    return editor;
+  }
+  const result = getTextDragEdit(editor, data, target, EditorTextDrag);
+  if (!result) {
+    return editor;
+  }
+  return scheduleDocumentAndCursorsSelections(editor, [result.change], result.selections);
+};
+
+const handlePointerUp = async editor => {
+  const resetEditor = {
     ...editor,
     hasListener: false,
     isSelecting: false,
     selectionAutoMovePosition: {
       columnIndex: 0,
       rowIndex: 0
-    }
+    },
+    textDragDropPosition: {
+      columnIndex: 0,
+      rowIndex: 0
+    },
+    textDragId: 0
   };
+  if (!editor.textDragId) {
+    return resetEditor;
+  }
+  try {
+    const data = await invoke$f('DragAndDrop.takeTextDrag', editor.textDragId);
+    if (!data) {
+      return resetEditor;
+    }
+    return moveTextDrag(resetEditor, data, editor.textDragDropPosition);
+  } catch {
+    return resetEditor;
+  }
 };
 
 // @ts-ignore
@@ -10145,7 +10298,7 @@ const launch = async () => {
     return;
   }
   const rpc = await launchFindWidgetWorker();
-  set$g(rpcId, rpc);
+  set$h(rpcId, rpc);
 };
 const invoke$3 = async (method, ...params) => {
   const rpc = get$9(rpcId);
@@ -13505,7 +13658,7 @@ const handleMessagePort = async (port, rpcId) => {
     messagePort: port
   });
   if (rpcId) {
-    set$g(rpcId, rpc);
+    set$h(rpcId, rpc);
   }
 };
 
@@ -13539,6 +13692,10 @@ const kFontWeight = 'editor.fontWeight';
 const kHover = 'editor.hover';
 const kMinimapEnabled = 'editor.minimap.enabled';
 const kBreadcrumbsEnabled = 'breadcrumbs.enabled';
+const kDragAndDropEnabled = 'editor.dragAndDrop';
+const getDragAndDropEnabled = async () => {
+  return (await get$3(kDragAndDropEnabled)) ?? true;
+};
 const isAutoClosingBracketsEnabled = async () => {
   return Boolean(await get$3(kAutoClosingBrackets));
 };
@@ -13595,11 +13752,12 @@ const getBreadcrumbsEnabled = async () => {
 };
 
 const getEditorPreferences = async () => {
-  const [diagnosticsEnabled$1, fontFamily, fontSize, fontWeight, hoverEnabled, isAutoClosingBracketsEnabled$1, isAutoClosingQuotesEnabled$1, isAutoClosingTagsEnabled$1, isQuickSuggestionsEnabled$1, lineNumbers, rowHeight, tabSize, letterSpacing, completionTriggerCharacters, minimapEnabled, breadcrumbsEnabled, insertSpaces] = await Promise.all([diagnosticsEnabled(), getFontFamily(), getFontSize(), getFontWeight(), getHoverEnabled(), isAutoClosingBracketsEnabled(), isAutoClosingQuotesEnabled(), isAutoClosingTagsEnabled(), isQuickSuggestionsEnabled(), getLineNumbers(), getRowHeight(), getTabSize(), getLetterSpacing(), getCompletionTriggerCharacters(), getMinimapEnabled(), getBreadcrumbsEnabled(), getInsertSpaces()]);
+  const [diagnosticsEnabled$1, fontFamily, fontSize, fontWeight, hoverEnabled, isAutoClosingBracketsEnabled$1, isAutoClosingQuotesEnabled$1, isAutoClosingTagsEnabled$1, isQuickSuggestionsEnabled$1, lineNumbers, rowHeight, tabSize, letterSpacing, completionTriggerCharacters, minimapEnabled, breadcrumbsEnabled, insertSpaces, dragAndDropEnabled] = await Promise.all([diagnosticsEnabled(), getFontFamily(), getFontSize(), getFontWeight(), getHoverEnabled(), isAutoClosingBracketsEnabled(), isAutoClosingQuotesEnabled(), isAutoClosingTagsEnabled(), isQuickSuggestionsEnabled(), getLineNumbers(), getRowHeight(), getTabSize(), getLetterSpacing(), getCompletionTriggerCharacters(), getMinimapEnabled(), getBreadcrumbsEnabled(), getInsertSpaces(), getDragAndDropEnabled()]);
   return {
     breadcrumbsEnabled,
     completionTriggerCharacters,
     diagnosticsEnabled: diagnosticsEnabled$1,
+    dragAndDropEnabled,
     fontFamily,
     fontSize,
     fontWeight,
@@ -13939,6 +14097,7 @@ const loadContent = async (state, savedState) => {
     breadcrumbsEnabled,
     completionTriggerCharacters,
     diagnosticsEnabled,
+    dragAndDropEnabled,
     fontFamily,
     fontSize,
     fontWeight,
@@ -13970,6 +14129,7 @@ const loadContent = async (state, savedState) => {
     charWidth,
     completionTriggerCharacters,
     diagnosticsEnabled,
+    dragAndDropEnabled,
     fontFamily,
     fontSize,
     fontWeight,
@@ -15421,7 +15581,7 @@ const renderEventListeners = () => {
     preventDefault: true
   }, {
     name: HandleMouseDown,
-    params: ['handleMouseDown', 'event.button', 'event.altKey', 'event.ctrlKey', ClientX, ClientY, 'event.detail']
+    params: ['handleMouseDown', 'event.button', 'event.altKey', 'event.ctrlKey', ClientX, ClientY, 'event.detail', 'event.shiftKey']
   }, {
     name: HandlePointerDown,
     params: ['handlePointerDown', 'event.button', 'event.altKey', 'event.ctrlKey', ClientX, ClientY, 'event.detail', 'event.currentTarget.parentElement.parentElement.offsetLeft'],
@@ -16089,6 +16249,14 @@ for (const [key, value] of Object.entries(commandMap)) {
   }
 }
 
+const initializeDragAndDropWorker = async () => {
+  const rpc = await create$d({
+    commandMap: {},
+    send: sendMessagePortToDragAndDropWorker
+  });
+  set$f(rpc);
+};
+
 const initializeErrorWorker = async () => {
   const rpc = await create$d({
     commandMap: {},
@@ -16150,12 +16318,12 @@ const initializeTextMeasurementWorker = async () => {
 
 const listen = async () => {
   registerCommands(commandMap);
-  await Promise.all([initializeRendererWorker(), initializeErrorWorker(), initializeExtensionManagementWorker(), initializeTextMeasurementWorker(), initializeOpenerWorker()]);
+  await Promise.all([initializeRendererWorker(), initializeDragAndDropWorker(), initializeErrorWorker(), initializeExtensionManagementWorker(), initializeTextMeasurementWorker(), initializeOpenerWorker()]);
   const dialogRpc = await create$d({
     commandMap: {},
     send: sendMessagePortToDialogWorker
   });
-  set$f(dialogRpc);
+  set$g(dialogRpc);
 };
 
 const CodeGeneratorInput = 'CodeGeneratorInput';

package/package.json

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