@lvce-editor/server 0.37.7 → 0.37.9

package/static/{3c2c8cd → f88d0b1}/packages/editor-worker/dist/editorWorkerMain.js

@@ -144,6 +144,7 @@ const IndentMore = 'indentMore';
 const InsertLineBreak = 'insertLineBreak';
 const ReplaceAll$2 = 'replaceAll';
 const ToggleBlockComment = 'toggleBlockComment';
+const Rename$1 = 'rename';
 
 const map$1 = Object.create(null);
 const set$7 = (id, widget) => {
@@ -398,23 +399,27 @@ const offsetAt = (textDocument, positionRowIndex, positionColumnIndex) => {
   return offset;
 };
 const positionAt = (textDocument, offset) => {
+  const {
+    lines
+  } = textDocument;
   let rowIndex = 0;
   let columnIndex = 0;
   let currentOffset = 0;
-  while (rowIndex < textDocument.lines.length && currentOffset < offset) {
-    currentOffset += textDocument.lines[rowIndex].length + 1;
+  while (rowIndex < lines.length && currentOffset < offset) {
+    currentOffset += lines[rowIndex].length + 1;
     rowIndex++;
   }
   if (currentOffset > offset) {
     rowIndex--;
-    currentOffset -= textDocument.lines[rowIndex].length + 1;
+    currentOffset -= lines[rowIndex].length + 1;
     columnIndex = offset - currentOffset;
   } else {
     columnIndex = currentOffset - offset;
   }
-  // for (let i = 0; i < textDocument.lines.length; i++) {
-  // if(currentOffset)
-  // }
+  console.log({
+    rowIndex,
+    columnIndex
+  });
   // TODO
   return {
     rowIndex,
@@ -1736,9 +1741,26 @@ const {
 const CompletionExecute = 'ExtensionHostCompletion.execute';
 const CompletionResolveExecute = 'ExtensionHostCompletion.executeResolve';
 const HoverExecute = 'ExtensionHostHover.execute';
+const RenameExecuteRename = 'ExtensionHostRename.executeRenameProvider';
 const TabCompletionExecuteTabCompletionProvider = 'ExtensionHost.executeTabCompletionProvider';
 const TextDocumentSyncFull = 'ExtensionHostTextDocument.syncFull';
 
+const ColorPicker$2 = 41;
+const CompletionDetail$1 = 999;
+const EditorCompletion = 9;
+const Empty = 0;
+const FindWidget = 16;
+const FocusEditorHover = 51;
+const FocusEditorRename = 11;
+const FocusFindWidgetCloseButton = 48;
+const FocusFindWidgetNextMatchButton = 49;
+const FocusFindWidgetPreviousMatchButton = 50;
+const FocusFindWidgetReplace = 43;
+const FocusFindWidgetReplaceAllButton = 47;
+const FocusFindWidgetReplaceButton = 46;
+const FocusFindWidgetToggleReplace = 42;
+const SourceActions = 38;
+
 const measureCharacterWidth = (fontWeight, fontSize, fontFamily, letterSpacing) => {
   return measureTextWidth('a', fontWeight, fontSize, fontFamily, letterSpacing, false, 0);
 };
@@ -1852,7 +1874,8 @@ const createEditor = async ({
     charWidth,
     uid: id,
     id,
-    widgets: []
+    widgets: [],
+    focusKey: Empty
   };
   // TODO avoid creating intermediate editors here
   const newEditor1 = setBounds(editor, x, y, width, height, 9);
@@ -1929,15 +1952,14 @@ const applyEdit = async (editor, changes) => {
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 
-const handleBlur$1 = editor => {
-  // for (const listener of state.blurListeners) {
-  //   listener(editor)
-  // }
-  // TODO save on blur
-  // Command.execute(/* Main.save */ 89)
+const handleBlur$2 = editor => {
+  if (editor.focusKey !== Empty) {
+    return editor;
+  }
   const newEditor = {
     ...editor,
-    focused: false
+    focused: false,
+    focusKey: Empty
   };
   return newEditor;
 };
@@ -2257,10 +2279,25 @@ const cancelSelection = editor => {
   return scheduleSelections(editor, newSelections);
 };
 
+const getIndex = (widgets, id) => {
+  for (let i = 0; i < widgets.length; i++) {
+    const widget = widgets[i];
+    if (widget.id === id) {
+      return i;
+    }
+  }
+  return -1;
+};
+const removeEditorWidget = (widgets, id) => {
+  const index = getIndex(widgets, id);
+  const newWidgets = [...widgets.slice(0, index), ...widgets.slice(index + 1)];
+  return newWidgets;
+};
+
 // TODO use numeric widget id
-const ColorPicker$2 = 'colorPicker';
+const ColorPicker$1 = 'colorPicker';
 const Completion = 'completion';
-const CompletionDetail$1 = 'completionDetail';
+const CompletionDetail = 'completionDetail';
 const Find = 'find';
 const Hover = 'hover';
 const Rename = 'rename';
@@ -2277,7 +2314,7 @@ const closeCompletion = editor => {
   if (completionWidgetIndex === -1) {
     return editor;
   }
-  const newWidgets = [...widgets.slice(0, completionWidgetIndex), ...widgets.slice(completionWidgetIndex + 1)];
+  const newWidgets = removeEditorWidget(widgets, Completion);
   return {
     ...editor,
     widgets: newWidgets
@@ -2295,7 +2332,7 @@ const closeFind = editor => {
   if (index === -1) {
     return editor;
   }
-  const newWidgets = [...widgets.slice(0, index), ...widgets.slice(index + 1)];
+  const newWidgets = removeEditorWidget(widgets, Find);
   return {
     ...editor,
     widgets: newWidgets
@@ -2314,9 +2351,10 @@ const closeRename = editor => {
   if (renameWidgetIndex === -1) {
     return editor;
   }
-  const newWidgets = [...widgets.slice(0, renameWidgetIndex), ...widgets.slice(renameWidgetIndex + 1)];
+  const newWidgets = removeEditorWidget(widgets, Rename);
   return {
     ...editor,
+    focused: true,
     widgets: newWidgets
   };
 };
@@ -2332,7 +2370,7 @@ const closeSourceAction = editor => {
   if (index === -1) {
     return editor;
   }
-  const newWidgets = [...widgets.slice(0, index), ...widgets.slice(index + 1)];
+  const newWidgets = removeEditorWidget(widgets, SourceAction);
   return {
     ...editor,
     widgets: newWidgets
@@ -2383,9 +2421,12 @@ const addWidgetToEditor = async (widgetId, focusKey, editor, factory, newStateGe
   } else {
     await setAdditionalFocus(focusKey);
   }
+  const newFocus = fullFocus ? false : true;
   const newEditor = {
     ...editor,
-    widgets: newWidgets
+    widgets: newWidgets,
+    focusKey,
+    focused: newFocus
   };
   return newEditor;
 };
@@ -2397,7 +2438,7 @@ const create$7 = () => {
 const create$6 = () => {
   const completionUid = create$7();
   const widget = {
-    id: ColorPicker$2,
+    id: ColorPicker$1,
     oldState: {
       color: '',
       offsetX: 0,
@@ -2424,26 +2465,11 @@ const create$6 = () => {
   return widget;
 };
 
-const ColorPicker$1 = 41;
-const CompletionDetail = 999;
-const EditorCompletion = 9;
-const Empty = 0;
-const FindWidget = 16;
-const FocusEditorHover = 51;
-const FocusFindWidgetCloseButton = 48;
-const FocusFindWidgetNextMatchButton = 49;
-const FocusFindWidgetPreviousMatchButton = 50;
-const FocusFindWidgetReplace = 43;
-const FocusFindWidgetReplaceAllButton = 47;
-const FocusFindWidgetReplaceButton = 46;
-const FocusFindWidgetToggleReplace = 42;
-const SourceActions = 38;
-
 const newStateGenerator$1 = state => {
   return loadContent$3(state);
 };
 const openColorPicker = async editor => {
-  return addWidgetToEditor(ColorPicker$2, ColorPicker$1, editor, create$6, newStateGenerator$1);
+  return addWidgetToEditor(ColorPicker$1, ColorPicker$2, editor, create$6, newStateGenerator$1);
 };
 
 const state$6 = {
@@ -2991,7 +3017,6 @@ const cutLine = async editor => {
   return scheduleDocumentAndCursorsSelections(editor, changes, selectionChanges);
 };
 
-// @ts-ignore
 const cutSelectedText = async editor => {
   const {
     selections
@@ -3336,7 +3361,8 @@ const UiStrings$1 = {
   Replace: 'Replace',
   SourceAction: 'Source Action',
   OrganizeImports: 'Organize Imports',
-  SortImports: 'Sort Imports'
+  SortImports: 'Sort Imports',
+  NoCodeActionsAvailable: 'No code actions available'
 };
 const noDefinitionFound = () => {
   return i18nString(UiStrings$1.NoDefinitionFound);
@@ -3360,6 +3386,9 @@ const noResults$1 = () => {
 const sourceAction = () => {
   return i18nString(UiStrings$1.SourceAction);
 };
+const noCodeActionsAvailable = () => {
+  return i18nString(UiStrings$1.NoCodeActionsAvailable);
+};
 
 // @ts-ignore
 const goTo = async ({
@@ -4037,15 +4066,12 @@ const handleScrollBarMove = (state, eventY) => {
 };
 const handleScrollBarVerticalPointerMove = handleScrollBarMove;
 
-// @ts-ignore
-
 // TODO scrollbar position can be in interval [0, editor.height - editor.scrollBarHeight]
 // when clicked at y <= editor.scrollbarHeight/2, position is set to zero
 // when clicked at y >= editor.height - editor.scrollBarHeight/2, position is set to (editor.height - scrollBarHeight/2)
 // when clicked at y > editor.height - editor.scrollBarHeight/2, position scrollbar at (y - scrollbarHeight/2)
 // additionally, when clicked on scrollbar, scrollbar position shouldn't move
 
-// @ts-ignore
 const handleScrollBarPointerDown = (state, eventY) => {
   const {
     y,
@@ -4544,6 +4570,7 @@ const create$5 = () => {
   return completionWidget;
 };
 
+const OnRename = 'onRename';
 const OnCompletion = 'onCompletion';
 const OnHover = 'onHover';
 const OnTabCompletion = 'onTabCompletion';
@@ -4567,7 +4594,7 @@ const execute = async ({
   return result;
 };
 
-const combineResults$1 = results => {
+const combineResults$2 = results => {
   return results[0] ?? [];
 };
 const executeCompletionProvider = (editor, offset) => {
@@ -4578,7 +4605,7 @@ const executeCompletionProvider = (editor, offset) => {
     args: [offset],
     noProviderFoundMessage: 'no completion provider found',
     noProviderFoundResult: [],
-    combineResults: combineResults$1
+    combineResults: combineResults$2
   });
 };
 const combineResultsResolve = items => {
@@ -5183,7 +5210,7 @@ const isFind = widget => {
 };
 // TODO don't call renderer worker, set editor state
 // TODO this function should be synchronous
-const focusIndex$1 = (editor, index) => {
+const focusIndex$2 = (editor, index) => {
   const findState = getFindState(editor);
   if (!findState) {
     return editor;
@@ -5226,7 +5253,7 @@ const focusFirst$1 = editor => {
   if (!findState) {
     return editor;
   }
-  return focusIndex$1(editor, 0);
+  return focusIndex$2(editor, 0);
 };
 const focusLast = editor => {
   const findState = getFindState(editor);
@@ -5236,9 +5263,9 @@ const focusLast = editor => {
   const {
     matchCount
   } = findState;
-  return focusIndex$1(editor, matchCount - 1);
+  return focusIndex$2(editor, matchCount - 1);
 };
-const focusNext$1 = editor => {
+const focusNext$2 = editor => {
   const findState = getFindState(editor);
   if (!findState) {
     return editor;
@@ -5250,7 +5277,7 @@ const focusNext$1 = editor => {
   if (matchIndex === matchCount - 1) {
     return focusFirst$1(editor);
   }
-  return focusIndex$1(editor, matchIndex + 1);
+  return focusIndex$2(editor, matchIndex + 1);
 };
 const focusPrevious$1 = editor => {
   const findState = getFindState(editor);
@@ -5263,7 +5290,7 @@ const focusPrevious$1 = editor => {
   if (matchIndex === 0) {
     return focusLast(editor);
   }
-  return focusIndex$1(editor, matchIndex - 1);
+  return focusIndex$2(editor, matchIndex - 1);
 };
 
 const focusNextMatchButton = state => {
@@ -5290,7 +5317,7 @@ const focusToggleReplaceButton = state => {
   return setFindWidgetFocus(state, FocusFindWidgetToggleReplace);
 };
 
-const handleBlur = async state => {
+const handleBlur$1 = async state => {
   await setFocus(Empty);
   return state;
 };
@@ -5535,7 +5562,7 @@ const openRename = async editor => {
     return latestState;
   };
   const fullFocus = true;
-  return addWidgetToEditor(Rename, undefined, editor, create$3, newStateGenerator, fullFocus);
+  return addWidgetToEditor(Rename, FocusEditorRename, editor, create$3, newStateGenerator, fullFocus);
 };
 
 const organizeImports = async editor => {
@@ -6702,12 +6729,19 @@ const getEditorSourceActions = async () => {
   return sourceActions;
 };
 
-const getSourceActionWidgetPosition = editor => {
+const getHeight = sourceActionCount => {
+  if (sourceActionCount === 0) {
+    return 45;
+  }
+  return 150;
+};
+const getSourceActionWidgetPosition = (editor, sourceActionCount) => {
   const width = 300;
-  const height = 150;
+  const height = getHeight(sourceActionCount);
   const cursor = getPositionAtCursor(editor);
   const x = cursor.x;
   const y = cursor.y;
+  // TODO support virtual list
   return {
     x,
     y,
@@ -6726,7 +6760,7 @@ const loadSourceActions = async (editor, state) => {
     y,
     width,
     height
-  } = getSourceActionWidgetPosition(editor);
+  } = getSourceActionWidgetPosition(editor, sourceActions.length);
   return {
     ...state,
     sourceActions,
@@ -6833,7 +6867,7 @@ const sortLinesAscending = editor => {
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 
-const combineResults = results => {
+const combineResults$1 = results => {
   return results[0];
 };
 const executeTabCompletionProvider = (editor, offset) => {
@@ -6843,7 +6877,7 @@ const executeTabCompletionProvider = (editor, offset) => {
     method: TabCompletionExecuteTabCompletionProvider,
     args: [offset],
     noProviderFoundMessage: 'No tab completion provider found',
-    combineResults,
+    combineResults: combineResults$1,
     noProviderFoundResult: undefined
   });
 };
@@ -7563,7 +7597,7 @@ const editorUnindent = editor => {
 // editor.lines //?
 
 const isCompletionDetailWidget = widget => {
-  return widget.id === CompletionDetail$1;
+  return widget.id === CompletionDetail;
 };
 const closeDetails = editor => {
   const {
@@ -7580,7 +7614,7 @@ const closeDetails = editor => {
   };
 };
 
-const focusIndex = (state, index) => {
+const focusIndex$1 = (state, index) => {
   const newState = {
     ...state,
     focusedIndex: index,
@@ -7591,17 +7625,17 @@ const focusIndex = (state, index) => {
 
 const focusFirst = state => {
   const firstIndex = 0;
-  return focusIndex(state, firstIndex);
+  return focusIndex$1(state, firstIndex);
 };
 
-const focusNext = state => {
+const focusNext$1 = state => {
   const nextIndex = state.focusedIndex + 1;
-  return focusIndex(state, nextIndex);
+  return focusIndex$1(state, nextIndex);
 };
 
 const focusPrevious = state => {
   const previousIndex = state.focusedIndex - 1;
-  return focusIndex(state, previousIndex);
+  return focusIndex$1(state, previousIndex);
 };
 
 // TODO optimize this function to return the minimum number
@@ -7651,7 +7685,7 @@ const handelWheel = (state, deltaMode, deltaY) => {
 const create = () => {
   const completionUid = create$7();
   const completionWidget = {
-    id: CompletionDetail$1,
+    id: CompletionDetail,
     oldState: {
       content: '',
       uid: completionUid,
@@ -7702,7 +7736,7 @@ const openDetails = editor => {
     };
     return newestState;
   };
-  return addWidgetToEditor(CompletionDetail$1, CompletionDetail, editor, create, newStateGenerator);
+  return addWidgetToEditor(CompletionDetail, CompletionDetail$1, editor, create, newStateGenerator);
 };
 
 const getEdits = async (editor, completionItem) => {
@@ -7725,9 +7759,6 @@ const getEdits = async (editor, completionItem) => {
   const changes = replaceRange(editor, replaceRange$1, [inserted], '');
   return changes;
 };
-const isCompletion = widget => {
-  return widget.id === Completion;
-};
 const select = async (editor, completionItem) => {
   const changes = await getEdits(editor, completionItem);
   const index = editor.widgets.indexOf
@@ -7744,8 +7775,7 @@ const select = async (editor, completionItem) => {
   const {
     widgets
   } = editor;
-  const completionWidgetIndex = editor.widgets.findIndex(isCompletion);
-  const newWidgets = [...widgets.slice(0, completionWidgetIndex), ...widgets.slice(completionWidgetIndex + 1)];
+  const newWidgets = removeEditorWidget(widgets, Completion);
   const intermediateEditor = await applyEdit(editor, changes);
   return {
     ...intermediateEditor,
@@ -7783,7 +7813,7 @@ const selectCurrent = editor => {
 };
 
 const getCompletionDetailState = editor => {
-  return getWidgetState(editor, CompletionDetail$1);
+  return getWidgetState(editor, CompletionDetail);
 };
 
 const toggleDetails = editor => {
@@ -7846,6 +7876,7 @@ const ColorPickerSliderThumb = 'ColorPickerSliderThumb';
 const SourceActionItem = 'SourceActionItem';
 const SourceActionItemFocused = 'SourceActionItemFocused';
 const CompletionDetailCloseButton = 'CompletionDetailCloseButton';
+const EditorSourceActionsList = 'EditorSourceActionsList';
 const IconButtonDisabled = 'IconButtonDisabled';
 const IconButton = 'IconButton';
 const SourceActionHeading = 'SourceActionHeading';
@@ -7854,6 +7885,7 @@ const Diagnostic = 'Diagnostic';
 const FindWidgetReplace = 'FindWidgetReplace';
 const FindWidgetFind = 'FindWidgetFind';
 const FindWidgetMatchCount = 'FindWidgetMatchCount';
+const FindWidgetMatchCountEmpty = 'FindWidgetMatchCountEmpty';
 const FindWidgetRight = 'FindWidgetRight';
 const EditorCompletionItem = 'EditorCompletionItem';
 const EditorCompletionItemDeprecated = 'EditorCompletionItemDeprecated';
@@ -7922,6 +7954,15 @@ const HandleSashPointerDown = 'handleSashPointerDown';
 const HandleClose = 'handleClose';
 const HandleFocusIn = 'handleFocusIn';
 const HandleClick = 'handleClick';
+const HandleInput = 'handleInput';
+const HandleFocus = 'handleFocus';
+const HandleClickPreviousMatch = 'handleClickPreviousMatch';
+const HandleClickNextMatch = 'handleClickNextMatch';
+const HandleClickClose = 'handleClickClose';
+const HandleClickReplace = 'handleClickReplace';
+const HandleClickReplaceAll = 'handleClickReplaceAll';
+const HandleReplaceInput = 'handleReplaceInput';
+const HandleReplaceFocus = 'handleReplaceFocus';
 
 const hoverProblemMessage = {
   type: Span,
@@ -8019,6 +8060,97 @@ const renderHover = (oldState, newState) => {
   return commands;
 };
 
+const combineResults = results => {
+  return results[0] ?? [];
+};
+const executeRenameProvider = (editor, offset, newName) => {
+  return execute({
+    editor,
+    event: OnRename,
+    method: RenameExecuteRename,
+    args: [offset, newName],
+    noProviderFoundMessage: 'no rename provider found',
+    noProviderFoundResult: [],
+    combineResults
+  });
+};
+
+const getRenameState = editor => {
+  return getWidgetState(editor, Rename);
+};
+
+const getRenameChanges = (editor, result) => {
+  if (!result || !result.edits) {
+    return [];
+  }
+  const changes = [];
+  console.log({
+    result
+  });
+  for (const edit of result.edits) {
+    const position = positionAt(editor, edit.offset);
+    const start = position;
+    const end = {
+      ...position,
+      columnIndex: start.columnIndex + edit.deleted
+    };
+    const selection = {
+      start,
+      end
+    };
+    changes.push({
+      start,
+      end,
+      inserted: [result.inserted],
+      deleted: getSelectionText(editor, selection),
+      origin: Rename$1
+    });
+  }
+  return changes;
+};
+const accept = async editor => {
+  const child = getRenameState(editor);
+  if (!child) {
+    return editor;
+  }
+  const {
+    widgets
+  } = editor;
+  const newWidgets = removeEditorWidget(widgets, Rename);
+  // TODO
+  const offset = getOffsetAtCursor(editor);
+  const result = await executeRenameProvider(editor, offset, child.newValue);
+  const changes = getRenameChanges(editor, result);
+  console.log({
+    changes
+  });
+  // 1. ask extension host for rename edits
+  // 2. apply rename edit across editor (and whole workspace)
+  // 3. close rename widget
+  return {
+    ...editor,
+    focused: true,
+    widgets: newWidgets
+  };
+};
+
+const handleBlur = editor => {
+  return closeRename(editor);
+};
+
+const focusIndex = (state, index) => {
+  const newState = {
+    ...state,
+    focusedIndex: index
+  };
+  return newState;
+};
+
+const focusNext = state => {
+  const nextIndex = state.focusedIndex + 1;
+  return focusIndex(state, nextIndex);
+};
+
 const replaceTextOccurrences = (editor, matches, oldValue, newValue) => {
   const ranges = [];
   const oldValueLength = oldValue.length;
@@ -9074,8 +9206,8 @@ const wrapWidgetCommand = (widgetId, fn) => {
 };
 
 const widgetCommands = {
-  'ColorPicker.handleSliderPointerDown': ColorPicker$2,
-  'ColorPicker.handleSliderPointerMove': ColorPicker$2,
+  'ColorPicker.handleSliderPointerDown': ColorPicker$1,
+  'ColorPicker.handleSliderPointerMove': ColorPicker$1,
   // 'FindWidget.focusNext': WidgetId.Find,
   // 'FindWidget.focusPrevious': WidgetId.Find,
   'FindWidget.close': Find,
@@ -9184,7 +9316,7 @@ const commandMap = {
   'Editor.goToTypeDefinition': goToTypeDefinition,
   'Editor.handleBeforeInput': handleBeforeInput,
   'Editor.handleBeforeInputFromContentEditable': handleBeforeInputFromContentEditable,
-  'Editor.handleBlur': handleBlur$1,
+  'Editor.handleBlur': handleBlur$2,
   'Editor.handleContextMenu': handleContextMenu,
   'Editor.handleDoubleClick': handleDoubleClick,
   'Editor.handleFocus': handleFocus,
@@ -9265,8 +9397,8 @@ const commandMap = {
   'EditorCompletion.advance': advance,
   'EditorCompletion.closeDetails': closeDetails,
   'EditorCompletion.focusFirst': focusFirst,
-  'EditorCompletion.focusIndex': focusIndex,
-  'EditorCompletion.focusNext': focusNext,
+  'EditorCompletion.focusIndex': focusIndex$1,
+  'EditorCompletion.focusNext': focusNext$1,
   'EditorCompletion.focusPrevious': focusPrevious,
   'EditorCompletion.handleEditorBlur': handleEditorBlur,
   'EditorCompletion.handleEditorClick': handleEditorClick,
@@ -9278,13 +9410,16 @@ const commandMap = {
   'EditorCompletion.selectCurrent': selectCurrent,
   'EditorCompletion.selectIndex': selectIndex,
   'EditorCompletion.toggleDetails': toggleDetails,
+  'EditorRename.accept': accept,
+  'EditorRename.handleBlur': handleBlur,
+  'EditorSourceActions.focusNext': focusNext,
   'FindWidget.close': close$1,
   'FindWidget.focusCloseButton': focusCloseButton,
   'FindWidget.focusFind': focusFind,
   'FindWidget.focusFirst': focusFirst$1,
-  'FindWidget.focusIndex': focusIndex$1,
+  'FindWidget.focusIndex': focusIndex$2,
   'FindWidget.focusLast': focusLast,
-  'FindWidget.focusNext': focusNext$1,
+  'FindWidget.focusNext': focusNext$2,
   'FindWidget.focusNextMatchButton': focusNextMatchButton,
   'FindWidget.focusPrevious': focusPrevious$1,
   'FindWidget.focusPreviousMatchButton': focusPreviousMatchButton,
@@ -9292,7 +9427,7 @@ const commandMap = {
   'FindWidget.focusReplaceAllButton': focusReplaceAllButton,
   'FindWidget.focusReplaceButton': focusReplaceButton,
   'FindWidget.focusToggleReplace': focusToggleReplaceButton,
-  'FindWidget.handleBlur': handleBlur,
+  'FindWidget.handleBlur': handleBlur$1,
   'FindWidget.handleFocus': handleFindWidgetFocus,
   'FindWidget.handleInput': handleInput,
   'FindWidget.handleReplaceAllFocus': handleReplaceAllFocus,
@@ -10466,37 +10601,37 @@ const FocusNext = 'FocusNext';
 const FocusPrevious = 'FocusPrevious';
 const Replace = 'Replace';
 
-const getFindWidgetButtons = buttonsEnabled => {
+const getFindWidgetButtons = (findButtonsEnabled, replaceButtonsEnabled) => {
   const findButtons = [{
     label: previousMatch(),
     icon: ArrowUp,
-    disabled: !buttonsEnabled,
-    onClick: 'handleClickPreviousMatch',
+    disabled: !findButtonsEnabled,
+    onClick: HandleClickPreviousMatch,
     name: FocusPrevious
   }, {
     label: nextMatch(),
     icon: ArrowDown,
-    disabled: !buttonsEnabled,
-    onClick: 'handleClickNextMatch',
+    disabled: !findButtonsEnabled,
+    onClick: HandleClickNextMatch,
     name: FocusNext
   }, {
     label: close(),
     icon: Close$1,
     disabled: false,
-    onClick: 'handleClickClose',
+    onClick: HandleClickClose,
     name: Close
   }];
   const replaceButtons = [{
     label: replace(),
     icon: Replace$1,
-    disabled: !buttonsEnabled,
-    onClick: 'handleClickReplace',
+    disabled: !replaceButtonsEnabled,
+    onClick: HandleClickReplace,
     name: Replace
   }, {
     label: replaceAll(),
     icon: ReplaceAll$1,
-    disabled: !buttonsEnabled,
-    onClick: 'handleClickReplaceAll',
+    disabled: !replaceButtonsEnabled,
+    onClick: HandleClickReplaceAll,
     name: ReplaceAll
   }];
   return {
@@ -10505,6 +10640,15 @@ const getFindWidgetButtons = buttonsEnabled => {
   };
 };
 
+const getFindWidgetButtonsEnabled = (matchCount, value) => {
+  const findButtonsEnabled = matchCount > 0;
+  const replaceButtonsEnabled = value.length > 0;
+  return {
+    findButtonsEnabled,
+    replaceButtonsEnabled
+  };
+};
+
 // TODO always focus element by name
 const getFindWidgetFocusSelector = focus => {
   switch (focus) {
@@ -10529,6 +10673,13 @@ const getFindWidgetFocusSelector = focus => {
   }
 };
 
+const getFindMatchCountClassName = (matchCount, value) => {
+  if (value && matchCount === 0) {
+    return mergeClassNames(FindWidgetMatchCount, FindWidgetMatchCountEmpty);
+  }
+  return FindWidgetMatchCount;
+};
+
 const getIconVirtualDom = (icon, type = Div) => {
   return {
     type,
@@ -10611,17 +10762,18 @@ const getSearchFieldVirtualDom = (name, placeholder, onInput, insideButtons, out
   return dom;
 };
 
-const getFindWidgetFindVirtualDom = (matchCountText, buttons) => {
+const getFindWidgetFindVirtualDom = (matchCountText, buttons, matchCount, value) => {
   const dom = [];
   dom.push({
     type: Div,
     className: FindWidgetFind,
     childCount: 5
   });
-  dom.push(...getSearchFieldVirtualDom('search-value', find(), 'handleInput', [], [], 'handleFocus'));
+  dom.push(...getSearchFieldVirtualDom('search-value', find(), HandleInput, [], [], HandleFocus));
+  const findClassName = getFindMatchCountClassName(matchCount, value);
   dom.push({
     type: Div,
-    className: FindWidgetMatchCount,
+    className: findClassName,
     childCount: 1
   }, text(matchCountText), ...buttons.flatMap(getIconButtonVirtualDom));
   return dom;
@@ -10634,7 +10786,7 @@ const getFindWidgetReplaceVirtualDom = (replaceExpanded, replaceButtons) => {
       type: Div,
       className: FindWidgetReplace,
       childCount: 1 + replaceButtons.length
-    }, ...getSearchFieldVirtualDom('replace-value', replace(), 'handleReplaceInput', [], [], 'handleReplaceFocus'), ...replaceButtons.flatMap(getIconButtonVirtualDom));
+    }, ...getSearchFieldVirtualDom('replace-value', replace(), HandleReplaceInput, [], [], HandleReplaceFocus), ...replaceButtons.flatMap(getIconButtonVirtualDom));
   }
   return dom;
 };
@@ -10658,7 +10810,7 @@ const getSearchToggleButtonVirtualDom = (replaceExpanded, onClick = '') => {
   }];
 };
 
-const getFindWidgetVirtualDom = (matchCountText, replaceExpanded, findButtons, replaceButtons, matchCase, matchWholeWord, useRegularExpression) => {
+const getFindWidgetVirtualDom = (matchCountText, replaceExpanded, findButtons, replaceButtons, matchCase, matchWholeWord, useRegularExpression, matchCount, value) => {
   const dom = [];
   dom.push({
     type: Div,
@@ -10672,7 +10824,7 @@ const getFindWidgetVirtualDom = (matchCountText, replaceExpanded, findButtons, r
     className: FindWidgetRight,
     childCount: replaceExpanded ? 2 : 1
   });
-  dom.push(...getFindWidgetFindVirtualDom(matchCountText, findButtons));
+  dom.push(...getFindWidgetFindVirtualDom(matchCountText, findButtons, matchCount, value));
   if (replaceExpanded) {
     dom.push(...getFindWidgetReplaceVirtualDom(replaceExpanded, replaceButtons));
   }
@@ -10696,16 +10848,19 @@ const renderValue = {
 };
 const renderDetails = {
   isEqual(oldState, newState) {
-    return oldState.matchIndex === newState.matchIndex && oldState.matchCount === newState.matchCount && oldState.replaceExpanded === newState.replaceExpanded;
+    return oldState.matchIndex === newState.matchIndex && oldState.matchCount === newState.matchCount && oldState.replaceExpanded === newState.replaceExpanded && oldState.value === newState.value;
   },
   apply(oldState, newState) {
     const matchCountText = getMatchCountText(newState.matchIndex, newState.matchCount);
-    const buttonsEnabled = newState.matchCount > 0;
+    const {
+      findButtonsEnabled,
+      replaceButtonsEnabled
+    } = getFindWidgetButtonsEnabled(newState.matchCount, newState.value);
     const {
       findButtons,
       replaceButtons
-    } = getFindWidgetButtons(buttonsEnabled);
-    const dom = getFindWidgetVirtualDom(matchCountText, newState.replaceExpanded, findButtons, replaceButtons);
+    } = getFindWidgetButtons(findButtonsEnabled, replaceButtonsEnabled);
+    const dom = getFindWidgetVirtualDom(matchCountText, newState.replaceExpanded, findButtons, replaceButtons, newState.matchCase, newState.matchWholeWord, newState.useRegularExpression, newState.matchCount, newState.value);
     return ['Viewlet.setDom2', dom];
   }
 };
@@ -10780,13 +10935,13 @@ const add$3 = widget => {
 const remove$3 = removeWidget;
 const Commands = {
   'FindWidget.close': close$1,
-  'FindWidget.focusNext': focusNext$1,
+  'FindWidget.focusNext': focusNext$2,
   'FindWidget.focusPrevious': focusPrevious$1,
-  'FindWidget.focusIndex': focusIndex$1,
+  'FindWidget.focusIndex': focusIndex$2,
   'FindWidget.focusLast': focusLast,
   'FindWidget.toggleReplace': toggleReplace,
   'FindWidget.handleFocus': focusFind,
-  'FindWidget.handleBlur': handleBlur
+  'FindWidget.handleBlur': handleBlur$1
 };
 
 const EditorFindWidget = {
@@ -10831,7 +10986,8 @@ const getRenameVirtualDom = state => {
     type: Input,
     className: 'InputBox RenameInputBox',
     value: state.newValue,
-    childCount: 0
+    childCount: 0,
+    onBlur: 'handleBlur'
   }];
 };
 
@@ -10920,7 +11076,32 @@ const getSourceActionListItemVirtualDom = sourceAction => {
   }, text(name)];
 };
 
+const getEditorMessageVirtualDom = message => {
+  const dom = [{
+    type: Div,
+    className: 'Viewlet EditorMessage',
+    tabIndex: -1,
+    childCount: 2
+  }, {
+    type: Div,
+    className: 'EditorMessageText',
+    childCount: 1
+  }, text(message), {
+    type: Div,
+    className: 'EditorMessageTriangle',
+    childCount: 0
+  }];
+  return dom;
+};
+
+const getEmptySourceActionsVirtualDom = () => {
+  return getEditorMessageVirtualDom(noCodeActionsAvailable());
+};
+
 const getSourceActionsVirtualDom = sourceActions => {
+  if (sourceActions.length === 0) {
+    return getEmptySourceActionsVirtualDom();
+  }
   const dom = [{
     type: Div,
     className: 'Viewlet EditorSourceActions',
@@ -10933,7 +11114,7 @@ const getSourceActionsVirtualDom = sourceActions => {
     childCount: 1
   }, text(sourceAction()), {
     type: Div,
-    className: 'EditorSourceActionsList',
+    className: EditorSourceActionsList,
     childCount: sourceActions.length,
     onClick: HandleClick
   }, ...sourceActions.flatMap(getSourceActionListItemVirtualDom)];
@@ -11008,9 +11189,9 @@ const EditorSourceActionWidget = {
 };
 
 const registerWidgets = () => {
-  set$7(ColorPicker$2, EditorColorPickerWidget);
+  set$7(ColorPicker$1, EditorColorPickerWidget);
   set$7(Completion, EditorCompletionWidget);
-  set$7(CompletionDetail$1, EditorCompletionDetailWidget);
+  set$7(CompletionDetail, EditorCompletionDetailWidget);
   set$7(Find, EditorFindWidget);
   set$7(Hover, EditorHoverWidget);
   set$7(Rename, EditorRenameWidget);