@lvce-editor/static-server 0.61.2 → 0.61.4

package/static/{45a12ea → e009e4d}/packages/editor-worker/dist/editorWorkerMain.js

@@ -1118,6 +1118,8 @@ const ExtensionHostWorker = 44;
 const MarkdownWorker = 300;
 const RendererWorker$1 = 1;
 
+const FocusEditorText$1 = 12;
+
 const rpcs = Object.create(null);
 const set$c = (id, rpc) => {
   rpcs[id] = rpc;
@@ -1348,7 +1350,7 @@ const getIcons = async requests => {
 const activateByEvent$1 = event => {
   return invoke$b('ExtensionHostManagement.activateByEvent', event);
 };
-const setAdditionalFocus$1 = focusKey => {
+const setAdditionalFocus = focusKey => {
   // @ts-ignore
   return invoke$b('Focus.setAdditionalFocus', focusKey);
 };
@@ -1530,7 +1532,7 @@ const RendererWorker = {
   sendMessagePortToSearchProcess,
   sendMessagePortToSyntaxHighlightingWorker: sendMessagePortToSyntaxHighlightingWorker$1,
   set: set$a,
-  setAdditionalFocus: setAdditionalFocus$1,
+  setAdditionalFocus,
   setColorTheme,
   setExtensionsSearchValue,
   setFocus: setFocus$1,
@@ -3762,13 +3764,12 @@ const applyWorkspaceEdit = async (editor, changes) => {
 };
 
 const handleBlur$1 = editor => {
-  if (editor.focusKey !== Empty) {
+  if (!editor.focused) {
     return editor;
   }
   const newEditor = {
     ...editor,
-    focused: false,
-    focusKey: Empty
+    focused: false
   };
   return newEditor;
 };
@@ -4212,25 +4213,6 @@ const hasWidget = (widgets, id) => {
   return false;
 };
 
-const setAdditionalFocus = async focusKey => {
-  // @ts-ignore
-  await invoke$9('Focus.setAdditionalFocus', focusKey);
-};
-
-const setFocus = async focusKey => {
-  if (!focusKey) {
-    return;
-  }
-  await invoke$9('Focus.setFocus', focusKey);
-};
-const unsetAdditionalFocus = async focusKey => {
-  if (!focusKey) {
-    return;
-  }
-  // @ts-ignore
-  await invoke$9('Focus.removeAdditionalFocus', focusKey);
-};
-
 const addWidgetToEditor = async (widgetId, focusKey, editor, factory, newStateGenerator, fullFocus) => {
   const {
     widgets
@@ -4249,14 +4231,13 @@ const addWidgetToEditor = async (widgetId, focusKey, editor, factory, newStateGe
     newState
   };
   const newWidgets = [...widgets, latestWidget];
-  // TODO avoid side effect, apply focus shift during render
-  await (fullFocus ? setFocus(focusKey) : setAdditionalFocus(focusKey));
   const newFocus = !fullFocus;
   const newEditor = {
     ...editor,
     widgets: newWidgets,
-    focusKey,
-    focused: newFocus
+    focused: newFocus,
+    focus: fullFocus ? focusKey : FocusEditorText$1,
+    additionalFocus: fullFocus ? 0 : focusKey
   };
   return newEditor;
 };
@@ -5368,6 +5349,25 @@ const goToTypeDefinition = async (editor, explicit = true) => {
   });
 };
 
+const isPersistentWidget = widgetId => {
+  switch (widgetId) {
+    case Find:
+      return true;
+    default:
+      return false;
+  }
+};
+
+// TODO widgets should have a persistence property:
+// 1 = close by click (e.g. completion, hover, source-actions)
+// 2 = stay open on click (e.g. find)
+const closeWidgetsMaybe = widgets => {
+  if (widgets.length === 0) {
+    return widgets;
+  }
+  return widgets.filter(isPersistentWidget);
+};
+
 const state$3 = {
   position: {
     rowIndex: 0,
@@ -5430,11 +5430,14 @@ const Ctrl = 1;
 const Alt = 2;
 
 const handleSingleClickDefault = (editor, position) => {
+  // TODO avoid global variables, add them to editor state
   setPosition$1(position);
+  const widgets = closeWidgetsMaybe(editor.widgets);
   return {
     ...editor,
     selections: new Uint32Array([position.rowIndex, position.columnIndex, position.rowIndex, position.columnIndex]),
-    focused: true
+    focused: true,
+    widgets
   };
 };
 const getClickHandler = modifier => {
@@ -5498,12 +5501,16 @@ const handleDoubleClick = (editor, modifier, x, y) => {
   return selectWord(editor, position.rowIndex, position.columnIndex);
 };
 
-const WhenExpressionEditorText = 12;
 const handleFocus$1 = editor => {
-  // TODO make change events functional,
-  // when rendering, send focus changes to renderer worker
-  invoke$9('Focus.setFocus', WhenExpressionEditorText);
-  return editor;
+  if (editor.focused && editor.focus === FocusEditorText$1) {
+    return editor;
+  }
+  return {
+    ...editor,
+    focused: true,
+    focus: FocusEditorText$1,
+    additionalFocus: 0
+  };
 };
 
 const Single = 1;
@@ -9213,6 +9220,17 @@ const getWordAtOffset = editor => {
   return '';
 };
 
+const setFocus = async focusKey => {
+  await invoke$9('Focus.setFocus', focusKey);
+};
+const unsetAdditionalFocus = async focusKey => {
+  if (!focusKey) {
+    return;
+  }
+  // @ts-ignore
+  await invoke$9('Focus.removeAdditionalFocus', focusKey);
+};
+
 const FocusEditor = 12;
 const FocusEditorCompletions = 9;
 const FocusEditorRename = 11;
@@ -10302,14 +10320,28 @@ const renderFocus$1 = {
     return oldState.focused === newState.focused;
   },
   apply(oldState, newState) {
-    // TODO avoid side effect
-    if (newState.focused) {
-      const FocusEditorText = 12;
-      invoke$9('Focus.setFocus', FocusEditorText);
-    }
     return [/* method */'setFocused', newState.focused];
   }
 };
+const renderFocusContext = {
+  isEqual(oldState, newState) {
+    return oldState.focus === newState.focus;
+  },
+  apply(oldState, newState) {
+    return ['Viewlet.setFocusContext', newState.uid, newState.focus];
+  }
+};
+const renderAdditionalFocusContext = {
+  isEqual(oldState, newState) {
+    return newState.additionalFocus === newState.additionalFocus;
+  },
+  apply(oldState, newState) {
+    if (newState.additionalFocus) {
+      return ['Focus.setAdditionalFocus', newState.uid, newState.additionalFocus];
+    }
+    return ['Focus.unsetAdditionalFocus', newState.uid, newState.additionalFocus];
+  }
+};
 const renderDecorations = {
   isEqual(oldState, newState) {
     return oldState.decorations === newState.decorations;
@@ -10391,11 +10423,12 @@ const renderWidgets = {
       }
     }
     const allCommands = [...addCommands, ...changeCommands, ...removeCommands];
-    return allCommands;
+    const filteredCommands = allCommands.filter(item => item[0] !== 'Viewlet.setFocusContext');
+    return filteredCommands;
   },
   multiple: true
 };
-const render$6 = [renderLines, renderSelections, renderScrollBarX, renderScrollBarY, renderFocus$1, renderDecorations, renderGutterInfo, renderWidgets];
+const render$6 = [renderLines, renderSelections, renderScrollBarX, renderScrollBarY, renderFocus$1, renderDecorations, renderGutterInfo, renderWidgets, renderFocusContext, renderAdditionalFocusContext];
 const renderEditor = id => {
   const instance = get$4(id);
   if (!instance) {
@@ -10540,8 +10573,9 @@ const widgetCommands = {
 const effects = [editorDiagnosticEffect];
 const wrapCommand = fn => async (editorUid, ...args) => {
   const oldInstance = get$4(editorUid);
-  const newEditor = await fn(oldInstance.newState, ...args);
-  if (oldInstance.newState === newEditor) {
+  const state = oldInstance.newState;
+  const newEditor = await fn(state, ...args);
+  if (state === newEditor) {
     return newEditor;
   }
   for (const effect of effects) {
@@ -10553,7 +10587,7 @@ const wrapCommand = fn => async (editorUid, ...args) => {
 
   // TODO combine neweditor with latest editor?
 
-  set$6(editorUid, oldInstance.newState, newEditor);
+  set$6(editorUid, state, newEditor);
   const commands = renderEditor(editorUid);
   return {
     ...newEditor,

package/static/{45a12ea → e009e4d}/packages/explorer-worker/dist/explorerViewWorkerMain.js

@@ -1692,19 +1692,18 @@ const copy$1 = async (oldUri, newUri) => {
 };
 
 const applyOperation = operation => {
-  if (operation.type === CreateFolder$1) {
-    return mkdir(operation.path);
-  }
-  if (operation.type === Copy$1) {
-    return copy$1(operation.from || '', operation.path);
-  }
-  if (operation.type === Rename$2) {
-    return rename$1(operation.from || '', operation.path);
-  }
-  if (operation.type === Remove) {
-    return remove(operation.path);
+  switch (operation.type) {
+    case CreateFolder$1:
+      return mkdir(operation.path);
+    case Copy$1:
+      return copy$1(operation.from || '', operation.path);
+    case Rename$2:
+      return rename$1(operation.from || '', operation.path);
+    case Remove:
+      return remove(operation.path);
+    default:
+      return writeFile(operation.path, operation.text);
   }
-  return writeFile(operation.path, operation.text);
 };
 
 const applyFileOperations = async operations => {
@@ -2513,6 +2512,9 @@ const copyRelativePath = async state => {
 // of visible items needed, e.g. when not scrolled 5 items with
 // 20px fill 100px but when scrolled 6 items are needed
 const getNumberOfVisibleItems = (listHeight, itemHeight) => {
+  if (listHeight <= 0 || itemHeight <= 0) {
+    return 0;
+  }
   return Math.ceil(listHeight / itemHeight) + 1;
 };
 
@@ -5015,15 +5017,6 @@ const restoreExpandedState = async (savedState, root, pathSeparator, excluded) =
   return dirents;
 };
 
-// TODO viewlet should only have create and refresh functions
-// every thing else can be in a separate module <viewlet>.lazy.js
-// and  <viewlet>.ipc.js
-
-// viewlet: creating | refreshing | done | disposed
-// TODO recycle viewlets (maybe)
-
-// TODO instead of root string, there should be a root dirent
-
 const getPathSeparator = root => {
   return getPathSeparator$1(root);
 };

package/static/{45a12ea → e009e4d}/packages/extension-host-worker/dist/extensionHostWorkerMain.js

@@ -2692,7 +2692,7 @@ const {
 });
 
 const getExtensionHostSubWorkerUrl = () => {
-  return '/45a12ea/packages/extension-host-sub-worker/dist/extensionHostSubWorkerMain.js';
+  return '/e009e4d/packages/extension-host-sub-worker/dist/extensionHostSubWorkerMain.js';
 };
 const extensionHostSubWorkerUrl = getExtensionHostSubWorkerUrl();
 
@@ -2967,9 +2967,9 @@ const getJson = async url => {
 
 const getAssetDir = () => {
   // @ts-ignore
-  if (typeof '/45a12ea' !== 'undefined') {
+  if (typeof '/e009e4d' !== 'undefined') {
     // @ts-ignore
-    return '/45a12ea';
+    return '/e009e4d';
   }
   if (platform === Electron) {
     return '../../../../..';

package/static/{45a12ea → e009e4d}/packages/renderer-process/dist/rendererProcessMain.js

@@ -2619,7 +2619,7 @@ const getAssetDir = () => {
   }
   return '';
 };
-const assetDir = '/45a12ea';
+const assetDir = '/e009e4d';
 
 const rendererWorkerUrl = `${assetDir}/packages/renderer-worker/dist/rendererWorkerMain.js`;
 

package/static/{45a12ea → e009e4d}/packages/renderer-worker/dist/rendererWorkerMain.js

@@ -96,7 +96,7 @@ const getAssetDir = () => {
   // @ts-ignore
   {
     // @ts-ignore
-    return '/45a12ea';
+    return '/e009e4d';
   }
 };
 const assetDir = getAssetDir();
@@ -3284,6 +3284,7 @@ const runFnWithSideEffect = async (instance, id, key, fn, ...args) => {
   if (commands.length === 0) {
     return;
   }
+  updateDynamicFocusContext(commands);
   await invoke$r(/* Viewlet.sendMultiple */kSendMultiple, /* commands */commands);
 };
 
@@ -3724,6 +3725,9 @@ const load$6 = async (viewlet, focus = false, restore = false, restoreState = un
     if (module.hasFunctionalRender) {
       const renderCommands = getRenderCommands(module, viewletState, newState, viewletUid, parentUid);
       setRenderedState(viewletUid, newState);
+      console.log({
+        renderCommands
+      });
       commands.push(...renderCommands);
       if (viewlet.show === false) {
         const allCommands = [...commands, ...extraCommands
@@ -3740,9 +3744,15 @@ const load$6 = async (viewlet, focus = false, restore = false, restoreState = un
           number(parentUid);
           allCommands.push([kAppend, parentUid, viewletUid]);
         }
+
+        // TODO avoid side effect here
+        // instead, let component send commands to renderer process and renderer worker
+        // so that those commands are not mixed together
+        updateDynamicFocusContext(allCommands);
         return allCommands;
       }
       commands.push(...extraCommands);
+      updateDynamicFocusContext(commands);
       await invoke$r(/* Viewlet.sendMultiple */kSendMultiple, /* commands */commands);
     } else {
       const allCommands = [...commands, ...extraCommands
@@ -4680,6 +4690,7 @@ const hydrate$3 = async () => {
   // TODO main parts should have nothing todo with shared process -> only sub components
   const languages = await getLanguages();
   // TODO avoid side effect here, but how?
+  // possible icon theme worker can ask for languages to be loaded, that way the dependency is reversed
   await invoke$m('IconTheme.addLanguages', languages);
   await addLanguages(languages);
   const useJsx = get$f('languages.jsFilesAsJsx');
@@ -7336,8 +7347,8 @@ const state$k = {
   files: Object.create(null)
 };
 const readFile$9 = async uri => {
-  if (uri.startsWith('localhost:')) {
-    return invoke$l('FileSystem.readFile', `http://${uri}`);
+  if (uri.startsWith('localhost:') || uri.startsWith(location.host)) {
+    return invoke$l('FileSystem.readFile', `${location.protocol}//${uri}`);
   }
   if (uri.startsWith('http://') || uri.startsWith('https://')) {
     return invoke$l('FileSystemFetch.readFile', uri);
@@ -7345,8 +7356,8 @@ const readFile$9 = async uri => {
   return invoke$o('FileSystemFetch.readFile', uri);
 };
 const readJson$3 = async uri => {
-  if (uri.startsWith('localhost:')) {
-    return invoke$l('FileSystem.readJson', `http://${uri}`);
+  if (uri.startsWith('localhost:') || uri.startsWith(location.host)) {
+    return invoke$l('FileSystem.readJson', `${location.protocol}//${uri}`);
   }
   if (uri.startsWith('http://') || uri.startsWith('https://')) {
     return invoke$l('FileSystem.readJson', uri);
@@ -17558,7 +17569,7 @@ const wrapEditorCommands = ids => {
   return all;
 };
 
-const ids = ['addCursorAbove', 'addCursorBelow', 'applyEdit', 'braceCompletion', 'cancelSelection', 'closeCodeGenerator', 'closeCompletion', 'closeCompletion', 'getSelections2', 'closeFind', 'closeFind2', 'closeRename', 'closeRename', 'closeSourceAction', 'closeSourceActions', 'ColorPicker.handleSliderPointerDown', 'ColorPicker.handleSliderPointerMove', 'compositionEnd', 'compositionStart', 'compositionUpdate', 'contextMenu', 'copy', 'copyLineDown', 'copyLineUp', 'cursorCharacterLeft', 'cursorCharacterRight', 'cursorDown', 'cursorEnd', 'cursorHome', 'cursorLeft', 'cursorRight', 'cursorSet', 'cursorUp', 'cursorWordLeft', 'cursorWordPartLeft', 'cursorWordPartRight', 'cursorWordRight', 'hotReload', 'cut', 'deleteAllLeft', 'deleteAllRight', 'deleteCharacterLeft', 'deleteCharacterRight', 'deleteHorizontalRight', 'deleteLeft', 'deleteRight', 'deleteWordLeft', 'deleteWordPartLeft', 'deleteWordPartRight', 'deleteWordRight', 'executeWidgetCommand', 'EditorCodeGenerator.accept', 'EditorRename.handleInput', 'EditorRename.accept', 'EditorRename.close', 'EditorCompletion.closeDetails', 'EditorCompletion.dispose', 'EditorCompletion.focusFirst', 'EditorCompletion.focusIndex', 'EditorCompletion.focusLast', 'EditorCompletion.focusNext', 'EditorCompletion.focusNextPage', 'EditorCompletion.focusPrevious', 'EditorCompletion.focusPreviousPage', 'EditorCompletion.handleClickAt', 'EditorCompletion.handleScrollBarCaptureLost', 'EditorCompletion.handleScrollBarClick', 'EditorCompletion.handleScrollBarMove', 'EditorCompletion.handleScrollBarThumbPointerMove', 'EditorCompletion.handleWheel', 'EditorCompletion.openDetails', 'EditorCompletion.scrollDown', 'EditorCompletion.selectCurrent', 'EditorCompletion.selectIndex', 'EditorCompletion.toggleDetails', 'EditorCompletion.close', 'EditorRename.accept', 'EditorRename.handleBlur', 'EditorSourceActions.close', 'EditorSourceActions.focusFirst', 'EditorSourceActions.focusLast', 'EditorSourceActions.focusNext', 'EditorSourceActions.focusPrevious', 'EditorSourceActions.selectCurrent', 'findAllReferences', 'FindWidget.close', 'FindWidget.focusNextElement', 'FindWidget.focusPreviousElement', 'FindWidget.focusCloseButton', 'FindWidget.focusFind', 'FindWidget.focusNext', 'FindWidget.focusNextMatchButton', 'FindWidget.focusPrevious', 'FindWidget.focusPreviousMatchButton', 'FindWidget.focusReplace', 'FindWidget.focusReplaceAllButton', 'FindWidget.focusReplaceButton', 'FindWidget.focusToggleReplace', 'FindWidget.handleBlur', 'FindWidget.handleFocus', 'FindWidget.handleFocusClose', 'FindWidget.handleFocusNext', 'FindWidget.handleFocusPrevious', 'FindWidget.handleFocusReplaceAll', 'FindWidget.handleInput', 'FindWidget.handleReplaceFocus', 'FindWidget.handleReplaceInput', 'FindWidget.handleToggleReplaceFocus', 'FindWidget.replace', 'FindWidget.replaceAll', 'FindWidget.toggleMatchCase', 'FindWidget.toggleMatchWholeWord', 'FindWidget.toggleReplace', 'FindWidget.toggleUseRegularExpression', 'FindWidget.togglePreserveCase', 'EditorSourceAction.close', 'EditorSourceAction.closeDetails', 'EditorSourceAction.focusFirst', 'EditorSourceAction.focusIndex', 'EditorSourceAction.focusNext', 'EditorSourceAction.focusPrevious', 'EditorSourceAction.handleWheel', 'EditorSourceAction.selectCurrent', 'EditorSourceAction.selectIndex', 'EditorSourceAction.selectItem', 'EditorSourceAction.toggleDetails', 'format', 'getText', 'getWordAt', 'getWordBefore', 'goToDefinition', 'goToTypeDefinition', 'handleBeforeInput', 'handleBeforeInputFromContentEditable', 'handleBlur', 'handleContextMenu', 'handleDoubleClick', 'handleFocus', 'handleMouseDown', 'handleMouseMove', 'handleMouseMoveWithAltKey', 'handleNativeSelectionChange', 'handlePointerCaptureLost', 'handleScrollBarClick', 'handleScrollBarHorizontalMove', 'handleScrollBarHorizontalPointerDown', 'handleScrollBarMove', 'handleScrollBarPointerDown', 'handleScrollBarVerticalMove', 'handleScrollBarVerticalPointerDown', 'handleSingleClick', 'handleTab', 'updateDebugInfo', 'handleTouchEnd', 'handleTouchMove', 'handleTouchStart', 'handleTripleClick', 'indentLess', 'indentMore', 'insertLineBreak', 'moveLineDown', 'moveLineUp', 'setDebugEnabled', 'moveRectangleSelection', 'moveRectangleSelectionPx', 'moveSelection', 'moveSelectionPx', 'openCodeGenerator', 'openColorPicker', 'openCompletion', 'openFind', 'openFind2', 'openRename', 'organizeImports', 'paste', 'pasteText', 'replaceRange', 'rerender', 'save', 'save', 'selectAll', 'selectAllLeft', 'selectAllOccurrences', 'selectAllRight', 'selectCharacterLeft', 'selectCharacterRight', 'selectDown', 'selectInsideString', 'selectionGrow', 'selectLine', 'selectNextOccurrence', 'selectUp', 'selectWord', 'selectWordLeft', 'selectWordRight', 'setDecorations', 'setDelta', 'setDeltaY', 'setLanguageId', 'setSelections', 'showHover', 'showHover2', 'showSourceActions', 'showSourceActions2', 'sortImports', 'sortLinesAscending', 'tabCompletion', 'toggleBlockComment', 'toggleComment', 'toggleLineComment', 'type', 'undo', 'unIndent'];
+const ids = ['addCursorAbove', 'addCursorBelow', 'applyEdit', 'braceCompletion', 'cancelSelection', 'closeCodeGenerator', 'closeCompletion', 'closeCompletion', 'getSelections2', 'closeFind', 'closeFind2', 'closeRename', 'closeRename', 'closeSourceAction', 'closeSourceActions', 'ColorPicker.handleSliderPointerDown', 'ColorPicker.handleSliderPointerMove', 'compositionEnd', 'compositionStart', 'compositionUpdate', 'contextMenu', 'copy', 'copyLineDown', 'copyLineUp', 'cursorCharacterLeft', 'cursorCharacterRight', 'cursorDown', 'cursorEnd', 'cursorHome', 'cursorLeft', 'cursorRight', 'cursorSet', 'cursorUp', 'cursorWordLeft', 'cursorWordPartLeft', 'cursorWordPartRight', 'cursorWordRight', 'hotReload', 'cut', 'deleteAllLeft', 'deleteAllRight', 'deleteCharacterLeft', 'deleteCharacterRight', 'deleteHorizontalRight', 'deleteLeft', 'deleteRight', 'deleteWordLeft', 'deleteWordPartLeft', 'deleteWordPartRight', 'deleteWordRight', 'executeWidgetCommand', 'EditorCodeGenerator.accept', 'EditorRename.handleInput', 'EditorRename.accept', 'EditorRename.close', 'EditorCompletion.closeDetails', 'EditorCompletion.dispose', 'EditorCompletion.focusFirst', 'EditorCompletion.focusIndex', 'EditorCompletion.focusLast', 'EditorCompletion.focusNext', 'EditorCompletion.focusNextPage', 'EditorCompletion.focusPrevious', 'EditorCompletion.focusPreviousPage', 'EditorCompletion.handleClickAt', 'EditorCompletion.handleScrollBarCaptureLost', 'EditorCompletion.handleScrollBarClick', 'EditorCompletion.handleScrollBarMove', 'EditorCompletion.handleScrollBarThumbPointerMove', 'EditorCompletion.handleWheel', 'EditorCompletion.openDetails', 'EditorCompletion.scrollDown', 'EditorCompletion.selectCurrent', 'EditorCompletion.selectIndex', 'EditorCompletion.toggleDetails', 'EditorCompletion.close', 'EditorRename.accept', 'EditorRename.handleBlur', 'EditorSourceActions.close', 'EditorSourceActions.focusFirst', 'EditorSourceActions.focusLast', 'EditorSourceActions.focusNext', 'EditorSourceActions.focusPrevious', 'EditorSourceActions.selectCurrent', 'findAllReferences', 'FindWidget.close', 'FindWidget.focusNextElement', 'FindWidget.focusPreviousElement', 'FindWidget.focusCloseButton', 'FindWidget.focusFind', 'FindWidget.focusNext', 'FindWidget.focusNextMatchButton', 'FindWidget.focusPrevious', 'FindWidget.focusPreviousMatchButton', 'FindWidget.focusReplace', 'FindWidget.focusReplaceAllButton', 'FindWidget.focusReplaceButton', 'FindWidget.focusToggleReplace', 'FindWidget.handleBlur', 'FindWidget.handleFocus', 'FindWidget.handleFocusClose', 'FindWidget.handleFocusNext', 'FindWidget.handleFocusPrevious', 'FindWidget.handleFocusReplaceAll', 'FindWidget.handleInput', 'FindWidget.handleReplaceFocus', 'FindWidget.handleReplaceInput', 'FindWidget.handleToggleReplaceFocus', 'FindWidget.replace', 'FindWidget.replaceAll', 'FindWidget.toggleMatchCase', 'FindWidget.toggleMatchWholeWord', 'FindWidget.toggleReplace', 'FindWidget.toggleUseRegularExpression', 'FindWidget.togglePreserveCase', 'EditorSourceAction.close', 'EditorSourceAction.closeDetails', 'EditorSourceAction.focusFirst', 'EditorSourceAction.focusIndex', 'EditorSourceAction.focusNext', 'EditorSourceAction.focusPrevious', 'EditorSourceAction.handleWheel', 'EditorSourceAction.selectCurrent', 'EditorSourceAction.selectIndex', 'EditorSourceAction.selectItem', 'EditorSourceAction.toggleDetails', 'format', 'getText', 'getWordAt', 'getWordBefore', 'goToDefinition', 'goToTypeDefinition', 'handleBeforeInput', 'handleBeforeInputFromContentEditable', 'handleBlur', 'handleContextMenu', 'handleDoubleClick', 'handleFocus', 'handleMouseDown', 'handleMouseMove', 'handleMouseMoveWithAltKey', 'handleNativeSelectionChange', 'handlePointerCaptureLost', 'handleScrollBarClick', 'handleScrollBarHorizontalMove', 'handleScrollBarHorizontalPointerDown', 'handleScrollBarMove', 'handleScrollBarPointerDown', 'handleScrollBarVerticalMove', 'handleScrollBarVerticalPointerDown', 'handleSingleClick', 'handleTab', 'updateDebugInfo', 'handleTouchEnd', 'handleTouchMove', 'handleTouchStart', 'handleTripleClick', 'indentLess', 'indentMore', 'insertLineBreak', 'moveLineDown', 'moveLineUp', 'setDebugEnabled', 'moveRectangleSelection', 'moveRectangleSelectionPx', 'moveSelection', 'moveSelectionPx', 'openCodeGenerator', 'openColorPicker', 'openCompletion', 'openFind', 'openFind2', 'openRename', 'organizeImports', 'paste', 'pasteText', 'replaceRange', 'rerender', 'save', 'save', 'selectAll', 'selectAllLeft', 'selectAllOccurrences', 'selectAllRight', 'selectCharacterLeft', 'selectCharacterRight', 'selectDown', 'selectInsideString', 'selectionGrow', 'selectLine', 'selectNextOccurrence', 'selectUp', 'selectWord', 'selectWordLeft', 'selectWordRight', 'setDecorations', 'setDelta', 'setDeltaY', 'setLanguageId', 'setSelections', 'showHover', 'showHover2', 'showSourceActions', 'showSourceActions2', 'sortImports', 'sortLinesAscending', 'tabCompletion', 'toggleBlockComment', 'toggleComment', 'toggleLineComment', 'type', 'undo', 'unIndent', 'handleClickAtPosition'];
 const Commands$u = {
   // TODO command to set cursor position
   ...wrapEditorCommands(ids),

package/static/{45a12ea → e009e4d}/packages/test-worker/dist/testWorkerMain.js

@@ -1034,6 +1034,7 @@ const WebWorkerRpcClient = {
   create: create$2
 };
 
+const EditorWorker = 99;
 const RendererWorker = 1;
 const TestWorker = 9001;
 
@@ -1079,6 +1080,31 @@ const sendMessagePortToEditorWorker = async (port, rpcId) => {
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToEditorWorker', port, command, rpcId);
 };
 
+const createLazyRpc = rpcId => {
+  let rpcPromise;
+  let factory;
+  const createRpc = async () => {
+    const rpc = await factory();
+    set$2(rpcId, rpc);
+  };
+  const ensureRpc = async () => {
+    if (!rpcPromise) {
+      rpcPromise = createRpc();
+    }
+    await rpcPromise;
+  };
+  return {
+    setFactory(value) {
+      factory = value;
+    },
+    async invoke(method, ...params) {
+      await ensureRpc();
+      const rpc = get$1(rpcId);
+      return rpc.invoke(method, ...params);
+    }
+  };
+};
+
 const callFunction = async (fn, args) => {
   try {
     await fn(args);
@@ -1245,6 +1271,20 @@ const toHaveText = async (locator, options) => {
   }
   return `expected selector ${locatorString} to have text "${text}" but was "${actual}"`;
 };
+const toContainText = async (locator, options) => {
+  const locatorString = printLocator(locator);
+  const {
+    wasFound,
+    actual
+  } = await locatorInvoke(locator, 'TestFrameWork.checkConditionError', 'toContainText', locator, options);
+  const {
+    text
+  } = options;
+  if (!wasFound) {
+    return `expected selector ${locatorString} to contain text "${text}" element was not found`;
+  }
+  return `expected selector ${locatorString} to contain text "${text}" but was "${actual}"`;
+};
 const toHaveAttribute = async (locator, options) => {
   const locatorString = printLocator(locator);
   const {
@@ -1346,6 +1386,8 @@ const getFunction = fnName => {
       return toHaveValue;
     case 'toHaveText':
       return toHaveText;
+    case 'toContainText':
+      return toContainText;
     case 'toHaveAttribute':
       return toHaveAttribute;
     case 'toHaveCount':
@@ -1883,28 +1925,10 @@ const areSelectionsEqual = (a, b) => {
   return true;
 };
 
-const send = async port => {
-  await sendMessagePortToEditorWorker(port, TestWorker);
-};
-const launchEditorWorkerRpc = async () => {
-  const rpc = await TransferMessagePortRpcParent.create({
-    commandMap: {},
-    send
-  });
-  return rpc;
-};
-
-let rpcPromise;
-const getRpc = () => {
-  if (!rpcPromise) {
-    rpcPromise = launchEditorWorkerRpc();
-  }
-  return rpcPromise;
-};
-const invoke = async (method, ...params) => {
-  const rpc = await getRpc();
-  return rpc.invoke(method, ...params);
-};
+const {
+  invoke,
+  setFactory
+} = createLazyRpc(EditorWorker);
 
 const Script = 2;
 
@@ -2223,6 +2247,26 @@ const TestFrameWorkComponentEditorHover = {
   show: show$3
 };
 
+const handleInput$4 = async value => {
+  // @ts-ignore
+  await invoke$1('EditorRename.handleInput', value, Script);
+};
+const accept = async () => {
+  // @ts-ignore
+  await invoke$1('EditorRename.accept');
+};
+const cancel = async () => {
+  // @ts-ignore
+  await invoke$1('EditorRename.cancel');
+};
+
+const TestFrameWorkComponentEditorRename = {
+  __proto__: null,
+  accept,
+  cancel,
+  handleInput: handleInput$4
+};
+
 const selectIndex$5 = async index => {
   // @ts-ignore
   await invoke$1('EditorSourceAction.selectIndex', index);
@@ -3563,6 +3607,16 @@ const TestFrameWorkComponentWebView = {
   fromId
 };
 
+const toFileUrl = url => {
+  const urlObject = new URL(url);
+  const pathName = urlObject.pathname;
+  if (!pathName.startsWith('/remote')) {
+    throw new Error(`url must start with /remote`);
+  }
+  const rest = pathName.slice('/remote'.length);
+  return `file://${rest}`;
+};
+
 const setPath = async path => {
   await invoke$1('Workspace.setPath', path);
 };
@@ -3571,10 +3625,20 @@ const openTmpDir = async () => {
   await setPath(tmpDir);
   return tmpDir;
 };
+const resolveFileUrl = url => {
+  // TODO in web, convert to memfs or fetch url
+  // TODO on web: read filemap for that fixture
+  // else, use filesystem to read the files
+  // TODO covert remote url to file url
+  // then set that as workspace path
+
+  return toFileUrl(url);
+};
 
 const TestFrameWorkComponentWorkspace = {
   __proto__: null,
   openTmpDir,
+  resolveFileUrl,
   setPath
 };
 
@@ -3591,6 +3655,7 @@ const TestFrameWorkComponent = {
   Editor: TestFrameWorkComponentEditor,
   EditorCompletion: TestFrameWorkComponentEditorCompletion,
   EditorHover: TestFrameWorkComponentEditorHover,
+  EditorRename: TestFrameWorkComponentEditorRename,
   EditorSourceAction: TestFrameWorkComponentEditorSourceAction,
   Explorer: TestFrameWorkComponentExplorer,
   Extension: TestFrameWorkComponentExtension,
@@ -3665,7 +3730,19 @@ const commandMap = {
   'Test.executeMock': executeMock
 };
 
+const send = async port => {
+  await sendMessagePortToEditorWorker(port, TestWorker);
+};
+const launchEditorWorkerRpc = async () => {
+  const rpc = await TransferMessagePortRpcParent.create({
+    commandMap: {},
+    send
+  });
+  return rpc;
+};
+
 const listen = async () => {
+  setFactory(launchEditorWorkerRpc);
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });

package/static/index.html

@@ -6,9 +6,9 @@
     <meta name="description" content="VS Code inspired text editor that mostly runs in a webworker." />
     <meta name="theme-color" content="#282e2f" />
     <title>Lvce Editor</title>
-    <link rel="stylesheet" href="/45a12ea/css/App.css" />
-    <link rel="manifest" href="/45a12ea/manifest.json" crossorigin="use-credentials" />
-    <link rel="apple-touch-icon" href="/45a12ea/icons/pwa-icon-192.png" />
-    <script type="module" src="/45a12ea/packages/renderer-process/dist/rendererProcessMain.js"></script>
+    <link rel="stylesheet" href="/e009e4d/css/App.css" />
+    <link rel="manifest" href="/e009e4d/manifest.json" crossorigin="use-credentials" />
+    <link rel="apple-touch-icon" href="/e009e4d/icons/pwa-icon-192.png" />
+    <script type="module" src="/e009e4d/packages/renderer-process/dist/rendererProcessMain.js"></script>
   </head>
 </html>