@lvce-editor/problems-view 1.13.0 → 1.14.0

package/dist/problemsViewWorkerMain.js

@@ -1072,10 +1072,11 @@ const create$2 = () => {
     wrapCommand(fn) {
       const wrapped = async (uid, ...args) => {
         const {
+          oldState,
           newState
         } = states[uid];
         const newerState = await fn(newState, ...args);
-        if (newState === newerState) {
+        if (oldState === newerState || newState === newerState) {
           return;
         }
         const latest = states[uid];
@@ -1146,6 +1147,8 @@ const UpArrow = 14;
 const RightArrow = 15;
 const DownArrow = 16;
 
+const Script$1 = 2;
+
 const DebugWorker = 55;
 const EditorWorker$1 = 99;
 const RendererWorker$1 = 1;
@@ -1298,9 +1301,20 @@ const searchFileHtml = async uri => {
 const getFilePathElectron = async file => {
   return invoke('FileSystemHandle.getFilePathElectron', file);
 };
+/**
+ * @deprecated
+ */
 const showContextMenu = async (x, y, id, ...args) => {
   return invoke('ContextMenu.show', x, y, id, ...args);
 };
+const showContextMenu2 = async (uid, menuId, x, y, args) => {
+  number(uid);
+  number(menuId);
+  number(x);
+  number(y);
+  // @ts-ignore
+  await invoke('ContextMenu.show2', uid, menuId, x, y, args);
+};
 const getElectronVersion = async () => {
   return invoke('Process.getElectronVersion');
 };
@@ -1348,6 +1362,11 @@ const sendMessagePortToMarkdownWorker = async (port, rpcId) => {
   // @ts-ignore
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToMarkdownWorker', port, command, rpcId);
 };
+const sendMessagePortToIconThemeWorker = async (port, rpcId) => {
+  const command = 'IconTheme.handleMessagePort';
+  // @ts-ignore
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToIconThemeWorker', port, command, rpcId);
+};
 const sendMessagePortToFileSystemWorker = async (port, rpcId) => {
   const command = 'FileSystem.handleMessagePort';
   // @ts-ignore
@@ -1387,6 +1406,9 @@ const handleDebugChange = async params => {
 const getFolderIcon = async options => {
   return invoke('IconTheme.getFolderIcon', options);
 };
+const handleWorkspaceRefresh = async () => {
+  return invoke('Layout.handleWorkspaceRefresh');
+};
 const closeWidget = async widgetId => {
   return invoke('Viewlet.closeWidget', widgetId);
 };
@@ -1411,6 +1433,9 @@ const getKeyBindings$1 = async () => {
 const writeClipBoardText$1 = async text => {
   await invoke('ClipBoard.writeText', /* text */text);
 };
+const readClipBoardText = async () => {
+  return invoke('ClipBoard.readText');
+};
 const writeClipBoardImage = async blob => {
   // @ts-ignore
   await invoke('ClipBoard.writeImage', /* text */blob);
@@ -1454,6 +1479,20 @@ const sendMessagePortToRendererProcess = async port => {
   // @ts-ignore
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToRendererProcess', port, command, DebugWorker);
 };
+const sendMessagePortToTextMeasurementWorker = async port => {
+  const command = 'TextMeasurement.handleMessagePort';
+  // @ts-ignore
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToTextMeasurementWorker', port, command, 0);
+};
+const sendMessagePortToSourceControlWorker = async port => {
+  const command = 'SourceControl.handleMessagePort';
+  // @ts-ignore
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToSourceControlWorker', port, command, 0);
+};
+const sendMessagePortToFileSystemProcess = async (port, rpcId) => {
+  const command = 'HandleMessagePortForFileSystemProcess.handleMessagePortForFileSystemProcess';
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToSharedProcess', port, command, rpcId);
+};
 const getPreference = async key => {
   return await invoke('Preferences.get', key);
 };
@@ -1525,7 +1564,7 @@ const openExtensionSearch = async () => {
 };
 const setExtensionsSearchValue = async searchValue => {
   // @ts-ignore
-  return invoke('Extensions.handleInput', searchValue);
+  return invoke('Extensions.handleInput', searchValue, Script$1);
 };
 const openExternal = async uri => {
   // @ts-ignore
@@ -1547,6 +1586,9 @@ const getLogsDir = async () => {
   // @ts-ignore
   return invoke('PlatformPaths.getLogsDir');
 };
+const measureTextBlockHeight = async (actualInput, fontFamily, fontSize, lineHeightPx, width) => {
+  return invoke(`MeasureTextHeight.measureTextBlockHeight`, actualInput, fontFamily, fontSize, lineHeightPx, width);
+};
 const registerMockRpc = commandMap => {
   const mockRpc = createMockRpc({
     commandMap
@@ -1593,15 +1635,18 @@ const RendererWorker = {
   handleDebugPaused,
   handleDebugResumed,
   handleDebugScriptParsed,
+  handleWorkspaceRefresh,
   installExtension,
   invoke,
   invokeAndTransfer,
+  measureTextBlockHeight,
   openExtensionSearch,
   openExternal,
   openNativeFolder,
   openUri,
   openUrl,
   openWidget,
+  readClipBoardText,
   readFile,
   registerMockRpc,
   registerWebViewInterceptor,
@@ -1613,11 +1658,15 @@ const RendererWorker = {
   sendMessagePortToEditorWorker: sendMessagePortToEditorWorker$1,
   sendMessagePortToErrorWorker,
   sendMessagePortToExtensionHostWorker,
+  sendMessagePortToFileSystemProcess,
   sendMessagePortToFileSystemWorker,
+  sendMessagePortToIconThemeWorker,
   sendMessagePortToMarkdownWorker,
   sendMessagePortToRendererProcess,
   sendMessagePortToSearchProcess,
+  sendMessagePortToSourceControlWorker,
   sendMessagePortToSyntaxHighlightingWorker,
+  sendMessagePortToTextMeasurementWorker,
   set: set$3,
   setAdditionalFocus,
   setColorTheme,
@@ -1626,6 +1675,7 @@ const RendererWorker = {
   setWebViewPort,
   setWorkspacePath,
   showContextMenu,
+  showContextMenu2,
   showErrorDialog,
   showMessageBox,
   showSaveFilePicker,
@@ -1636,9 +1686,9 @@ const RendererWorker = {
 };
 
 const {
+  sendMessagePortToEditorWorker,
   set: set$2,
-  writeClipBoardText,
-  sendMessagePortToEditorWorker
+  writeClipBoardText
 } = RendererWorker;
 
 const writeText = async text => {
@@ -1647,8 +1697,8 @@ const writeText = async text => {
 
 const copyMessage = async state => {
   const {
-    problems,
-    focusedIndex
+    focusedIndex,
+    problems
   } = state;
   const problem = problems[focusedIndex];
   await writeText(problem.message);
@@ -1670,25 +1720,25 @@ const List = 2;
 
 const create = (id, uri, x, y, width, height, workspaceUri) => {
   const state = {
-    uid: id,
-    problems: [],
+    collapsedUris: [],
+    filteredProblems: [],
+    filterValue: '',
     focusedIndex: -2,
-    message: '',
-    itemHeight: 22,
-    x,
-    y,
-    width,
     height,
-    filterValue: '',
-    viewMode: None,
     inputSource: User,
-    minLineY: 0,
-    maxLineY: 0,
+    itemHeight: 22,
     listItems: [],
-    collapsedUris: [],
+    maxLineY: 0,
+    message: '',
+    minLineY: 0,
+    problems: [],
     smallWidthBreakPoint: 650,
-    filteredProblems: [],
-    workspaceUri
+    uid: id,
+    viewMode: None,
+    width,
+    workspaceUri,
+    x,
+    y
   };
   set$1(id, state, state);
 };
@@ -1720,8 +1770,8 @@ const diff = (oldState, newState) => {
 
 const diff2 = uid => {
   const {
-    oldState,
-    newState
+    newState,
+    oldState
   } = get(uid);
   const diffResult = diff(oldState, newState);
   return diffResult;
@@ -1762,48 +1812,48 @@ const FocusProblems = 19;
 
 const getKeyBindings = () => {
   return [{
-    key: DownArrow,
     command: 'Problems.focusNext',
+    key: DownArrow,
     when: FocusProblems
   }, {
-    key: UpArrow,
     command: 'Problems.focusPrevious',
+    key: UpArrow,
     when: FocusProblems
   }, {
-    key: Home,
     command: 'Problems.focusFirst',
+    key: Home,
     when: FocusProblems
   }, {
-    key: PageUp,
     command: 'Problems.focusFirst',
+    key: PageUp,
     when: FocusProblems
   }, {
-    key: PageDown,
     command: 'Problems.focusLast',
+    key: PageDown,
     when: FocusProblems
   }, {
-    key: End,
     command: 'Problems.focusLast',
+    key: End,
     when: FocusProblems
   }, {
-    key: Space,
     command: 'Problems.selectCurrent',
+    key: Space,
     when: FocusProblems
   }, {
-    key: Home,
     command: 'Problems.focusFirst',
+    key: Home,
     when: FocusProblems
   }, {
-    key: End,
     command: 'Problems.focusLast',
+    key: End,
     when: FocusProblems
   }, {
-    key: LeftArrow,
     command: 'Problems.handleArrowLeft',
+    key: LeftArrow,
     when: FocusProblems
   }, {
-    key: RightArrow,
     command: 'Problems.handleArrowRight',
+    key: RightArrow,
     when: FocusProblems
   }];
 };
@@ -1829,9 +1879,9 @@ const getArrowLeftNewFocusedIndex = (problems, collapsedUris, focusedIndex) => {
 };
 const handleArrowLeft = state => {
   const {
-    problems,
+    collapsedUris,
     focusedIndex,
-    collapsedUris
+    problems
   } = state;
   const {
     index,
@@ -1839,8 +1889,8 @@ const handleArrowLeft = state => {
   } = getArrowLeftNewFocusedIndex(problems, collapsedUris, focusedIndex);
   return {
     ...state,
-    focusedIndex: index,
-    collapsedUris: newCollapsedUris
+    collapsedUris: newCollapsedUris,
+    focusedIndex: index
   };
 };
 
@@ -1862,9 +1912,9 @@ const getArrowRightNewFocusedIndex = (problems, collapsedUris, focusedIndex) =>
 };
 const handleArrowRight = state => {
   const {
-    problems,
+    collapsedUris,
     focusedIndex,
-    collapsedUris
+    problems
   } = state;
   const {
     index,
@@ -1872,8 +1922,8 @@ const handleArrowRight = state => {
   } = getArrowRightNewFocusedIndex(problems, collapsedUris, focusedIndex);
   return {
     ...state,
-    focusedIndex: index,
-    collapsedUris: newCollapsedUris
+    collapsedUris: newCollapsedUris,
+    focusedIndex: index
   };
 };
 
@@ -1885,10 +1935,10 @@ const getListIndex = (eventX, eventY, x, y, deltaY, itemHeight) => {
 
 const handleClickAt = (state, eventX, eventY) => {
   const {
+    itemHeight,
     problems,
     x,
-    y,
-    itemHeight
+    y
   } = state;
 
   // TODO use functional focus rendering
@@ -1911,8 +1961,6 @@ const handleClickButton = async (state, name) => {
 };
 
 const handleContextMenu = async (state, eventX, eventY) => {
-  // @ts-ignore
-  // await ContextMenu.show(eventX, eventY, MenuEntryId.Problems)
   return state;
 };
 
@@ -1947,8 +1995,8 @@ const createEditorWorkerRpc = async () => {
 };
 
 const {
-  set,
-  getProblems: getProblems$1
+  getProblems: getProblems$1,
+  set
 } = EditorWorker;
 
 const initialize = async () => {
@@ -1958,29 +2006,29 @@ const initialize = async () => {
 
 const toProblem = (diagnostic, index) => {
   const {
+    code,
+    columnIndex,
     message,
     rowIndex,
-    columnIndex,
     source,
-    code,
     type,
     uri
   } = diagnostic;
   return {
-    message: message || '',
-    rowIndex: rowIndex || 0,
+    code: code || '',
     columnIndex: columnIndex || 0,
-    uri,
-    relativePath: '',
     count: 0,
-    source: source || '',
-    code: code || '',
-    type: type || 'error',
+    fileName: '',
+    level: 2,
     listItemType: Item,
+    message: message || '',
     posInSet: index,
+    relativePath: '',
+    rowIndex: rowIndex || 0,
     setSize: 1,
-    level: 2,
-    fileName: ''
+    source: source || '',
+    type: type || 'error',
+    uri
   };
 };
 const getRelativeParentUri = (uri, workspaceUri) => {
@@ -1994,20 +2042,20 @@ const getFileName = uri => {
 const toProblems = (diagnostics, workspaceUri = '') => {
   const problems = [];
   let problem = {
-    message: '',
-    rowIndex: 0,
+    code: '',
     columnIndex: 0,
-    uri: '',
-    relativePath: '',
     count: 0,
-    source: '',
-    code: '',
+    fileName: '',
     level: 0,
     listItemType: 0,
+    message: '',
     posInSet: 0,
+    relativePath: '',
+    rowIndex: 0,
     setSize: 0,
+    source: '',
     type: '',
-    fileName: ''
+    uri: ''
   };
   let relativeIndex = 0;
   for (const diagnostic of diagnostics) {
@@ -2017,20 +2065,20 @@ const toProblems = (diagnostics, workspaceUri = '') => {
     } else {
       relativeIndex = 1;
       problem = {
-        message: '',
-        rowIndex: 0,
+        code: '',
         columnIndex: 0,
-        uri: diagnostic.uri,
-        relativePath: '',
         count: 1,
-        source: '',
-        type: '',
+        fileName: '',
+        level: 1,
         listItemType: Expanded,
+        message: '',
         posInSet: relativeIndex,
+        relativePath: '',
+        rowIndex: 0,
         setSize: 123,
-        level: 1,
-        code: '',
-        fileName: ''
+        source: '',
+        type: '',
+        uri: diagnostic.uri
       };
       problems.push(problem);
     }
@@ -2055,13 +2103,13 @@ const getProblems = async workspaceUri => {
     // @ts-ignore
     const problems = toProblems(diagnostics, workspaceUri);
     return {
-      problems,
-      error: ''
+      error: '',
+      problems
     };
   } catch (error) {
     return {
-      problems: [],
-      error: `${error}`
+      error: `${error}`,
+      problems: []
     };
   }
 };
@@ -2168,8 +2216,8 @@ const getSavedCollapsedUris = savedState => {
 };
 const loadContent = async (state, savedState) => {
   const {
-    problems,
-    error
+    error,
+    problems
   } = await getProblems(state.workspaceUri);
   if (error) {
     return {
@@ -2183,14 +2231,14 @@ const loadContent = async (state, savedState) => {
   const collapsedUris = getSavedCollapsedUris(savedState);
   return {
     ...state,
-    problems,
-    message,
-    viewMode,
+    collapsedUris,
+    filteredProblems: problems,
     filterValue,
     inputSource: Script,
-    filteredProblems: problems,
     listItems: [],
-    collapsedUris
+    message,
+    problems,
+    viewMode
   };
 };
 
@@ -2240,38 +2288,38 @@ const HandlePointerDown = 'handlePointerDown';
 
 const getIconVirtualDom = (icon, type = Div) => {
   return {
-    type,
+    childCount: 0,
     className: mergeClassNames('MaskIcon', `MaskIcon${icon}`),
     role: None$1,
-    childCount: 0
+    type
   };
 };
 
 const getActionButtonVirtualDom = action => {
   const {
-    id,
+    command,
     icon,
-    command
+    id
   } = action;
   return [{
-    type: Button$1,
+    childCount: 1,
     className: IconButton,
-    title: id,
     'data-command': command,
-    childCount: 1
+    title: id,
+    type: Button$1
   }, getIconVirtualDom(icon)];
 };
 
 const getInputBoxVirtualDom = (name, onInput, placeholder) => {
   return {
-    type: Input,
-    className: InputBox,
     autocapitalize: 'off',
     autocorrect: 'off',
+    className: InputBox,
     name,
     onInput: onInput,
     placeholder: placeholder,
-    spellcheck: false
+    spellcheck: false,
+    type: Input
   };
 };
 
@@ -2294,70 +2342,69 @@ const getBadgeDom = badgeText => {
     return [];
   }
   return [{
-    type: Div,
+    childCount: 1,
     className: FilterBadge,
-    childCount: 1
+    type: Div
   }, text(badgeText)];
 };
 const getProblemsFilterVirtualDom = action => {
   return [{
-    type: Div,
+    childCount: getChildCount(action.badgeText),
     className: Filter$1,
-    childCount: getChildCount(action.badgeText)
+    type: Div
   }, getInputBoxVirtualDom(Filter$2, action.command, action.placeholder || ''), ...getBadgeDom(action.badgeText), ...getActionButtonVirtualDom({
-    id: 'more filters',
-    // TODO use i18n string
+    command: 'more filters',
     icon: Filter,
-    command: 'more filters'
+    id: 'more filters' // TODO use i18n string
   })];
 };
 
 const getNoResultsWithFilterVirtualDom = () => {
   return [{
-    type: Div,
+    childCount: 3,
     className: Message,
-    childCount: 3
+    type: Div
   }, {
-    type: Span,
-    childCount: 1
+    childCount: 1,
+    type: Span
   }, text(noResultsFoundWithProvidedFilterCriteria()), {
-    type: A,
-    className: MessageAction,
     childCount: 1,
-    onClick: HandleClearFilterClick
+    className: MessageAction,
+    onClick: HandleClearFilterClick,
+    type: A
   }, text(clearFilter()), text('.')];
 };
 
 const getBadgeVirtualDom = (className, count) => {
   return [{
-    type: Div,
+    childCount: 1,
     className: mergeClassNames('Badge', className) + (''),
-    childCount: 1
+    type: Div
   }, text(`${count}`)];
 };
 
 const getChevronDownVirtualDom = (extraClassName = '') => {
   return {
-    type: Div,
+    childCount: 0,
     className: mergeClassNames(Chevron, 'MaskIconChevronDown', extraClassName) + (extraClassName === '' ? ' ' : ''),
-    childCount: 0
+    type: Div
   };
 };
 const getChevronRightVirtualDom = (extraClassName = '') => {
   return {
-    type: Div,
+    childCount: 0,
     className: mergeClassNames(Chevron, 'MaskIconChevronRight', extraClassName) + (extraClassName === '' ? ' ' : ''),
-    childCount: 0
+    type: Div
   };
 };
 
 const getFileIconVirtualDom = icon => {
   return {
-    type: Img,
+    childCount: 0,
     className: FileIcon,
-    src: icon,
     role: None$1,
-    childCount: 0
+    src: icon,
+    type: Img
   };
 };
 
@@ -2366,15 +2413,15 @@ const Warning = 'warning';
 const getProblemsIconVirtualDom = type => {
   if (type === Warning) {
     return {
-      type: Div,
+      childCount: 0,
       className: mergeClassNames(ProblemsIcon, ProblemsWarningIcon),
-      childCount: 0
+      type: Div
     };
   }
   return {
-    type: Div,
+    childCount: 0,
     className: mergeClassNames(ProblemsIcon, ProblemsErrorIcon),
-    childCount: 0
+    type: Div
   };
 };
 
@@ -2400,6 +2447,7 @@ const getProblemVirtualDom = problem => {
   const {
     code,
     columnIndex,
+    fileName,
     filterValueLength,
     icon,
     isActive,
@@ -2413,8 +2461,7 @@ const getProblemVirtualDom = problem => {
     rowIndex,
     setSize,
     source,
-    type,
-    fileName
+    type
   } = problem;
   let className = Problem;
   if (isActive) {
@@ -2422,41 +2469,41 @@ const getProblemVirtualDom = problem => {
   }
   if (listItemType === Expanded || listItemType === Collapsed) {
     return [{
-      type: Div,
-      className,
-      childCount: 5,
-      paddingLeft: getTreeItemIndent(1),
-      ariaPosInSet: posInSet,
-      ariaSetSize: setSize,
-      ariaLevel: level,
       ariaExpanded: !isCollapsed,
+      ariaLevel: level,
+      ariaPosInSet: posInSet,
       ariaSelected: isActive,
-      role: TreeItem
+      ariaSetSize: setSize,
+      childCount: 5,
+      className,
+      paddingLeft: getTreeItemIndent(1),
+      role: TreeItem,
+      type: Div
     }, listItemType === Collapsed ? getChevronRightVirtualDom() : getChevronDownVirtualDom(), getFileIconVirtualDom(icon), text(fileName), {
-      type: Div,
+      childCount: 1,
       className: LabelDetail,
-      childCount: 1
+      type: Div
     }, text(relativePath), ...getBadgeVirtualDom(ProblemBadge, problem.count)];
   }
   const lineColumn = atLineColumn(rowIndex, columnIndex);
   const label = {
-    type: Div,
+    childCount: 1,
     className: Label,
-    childCount: 1
+    type: Div
   };
   /**
    * @type {any}
    */
   const dom = [{
-    type: Div,
-    className,
-    childCount: 3,
-    paddingLeft: getTreeItemIndent(2),
-    ariaPosInSet: posInSet,
-    ariaSetSize: setSize,
     ariaLevel: level,
+    ariaPosInSet: posInSet,
     ariaSelected: isActive,
-    role: TreeItem
+    ariaSetSize: setSize,
+    childCount: 3,
+    className,
+    paddingLeft: getTreeItemIndent(2),
+    role: TreeItem,
+    type: Div
   }, getProblemsIconVirtualDom(type), label];
   if (filterValueLength) {
     const before = message.slice(0, messageMatchIndex);
@@ -2464,37 +2511,38 @@ const getProblemVirtualDom = problem => {
     const after = message.slice(messageMatchIndex + filterValueLength);
     label.childCount += 2;
     dom.push(text(before), {
-      type: Div,
+      childCount: 1,
       className: Highlight,
-      childCount: 1
+      type: Div
     }, text(middle), text(after));
   } else {
     dom.push(text(message));
   }
   dom.push({
-    type: Span,
+    childCount: 2,
     className: ProblemAt,
-    childCount: 2
+    type: Span
   }, text(getProblemSourceDetail(source, code)), text(lineColumn));
   return dom;
 };
 
 const getProblemsListVirtualDom = problems => {
   const dom = [{
-    type: Div,
-    className: ProblemsList,
+    ariaLabel: 'Problems Tree',
+    // TODO use i18n string
     childCount: problems.length,
+    className: ProblemsList,
     role: Tree,
-    ariaLabel: 'Problems Tree' // TODO use i18n string
+    type: Div
   }, ...problems.flatMap(getProblemVirtualDom)];
   return dom;
 };
 
 const getProblemsNoProblemsFoundVirtualDom = () => {
   return [{
-    type: Div,
+    childCount: 1,
     className: Message,
-    childCount: 1
+    type: Div
   }, text(noProblemsDetected())];
 };
 
@@ -2507,11 +2555,11 @@ const getClassName = isEven => {
 const getProblemsTableRowVirtualDom = problem => {
   const {
     code,
-    source,
-    uri,
-    message,
     isEven,
-    type
+    message,
+    source,
+    type,
+    uri
   } = problem;
   // TODO problems are grouped by uri, depending
   // on which renderer is used the data needs to look different
@@ -2519,38 +2567,38 @@ const getProblemsTableRowVirtualDom = problem => {
     return [];
   }
   const dom = [{
-    type: Div,
+    childCount: 5,
     className: getClassName(isEven),
-    childCount: 5
+    type: Div
   }, {
-    type: Div,
+    childCount: 1,
     className: ProblemsTableRowItem,
-    childCount: 1
+    type: Div
   }, getProblemsIconVirtualDom(type), {
-    type: Div,
+    childCount: 1,
     className: ProblemsTableRowItem,
-    childCount: 1
+    type: Div
   }, text(getProblemSourceDetail(source, code)), {
-    type: Div,
+    childCount: 1,
     className: ProblemsTableRowItem,
-    childCount: 1
+    type: Div
   }, text(message), {
-    type: Div,
+    childCount: 1,
     className: ProblemsTableRowItem,
-    childCount: 1
+    type: Div
   }, text(uri), {
-    type: Div,
+    childCount: 1,
     className: ProblemsTableRowItem,
-    childCount: 1
+    type: Div
   }, text(source)];
   return dom;
 };
 
 const getProblemsTableBodyVirtualDom = problems => {
   const dom = [{
-    type: Div,
+    childCount: problems.length,
     className: ProblemsTableBody,
-    childCount: problems.length
+    type: Div
   }, ...problems.flatMap(getProblemsTableRowVirtualDom)];
   return dom;
 };
@@ -2561,42 +2609,42 @@ const getProblemsTableHeaderVirtualDom = () => {
   const textMessage = message();
   const textFile = file();
   const dom = [{
-    type: Div,
+    childCount: 1,
     className: ProblemsTableHeader,
-    childCount: 1
+    type: Div
   }, {
-    type: Div,
+    childCount: 5,
     className: ProblemsTableRow,
-    childCount: 5
+    type: Div
   }, {
-    type: Div,
+    childCount: 0,
     className: ProblemsTableRowItem,
-    childCount: 0
+    type: Div
   }, {
-    type: Div,
+    childCount: 1,
     className: ProblemsTableRowItem,
-    childCount: 1
+    type: Div
   }, text(textCode), {
-    type: Div,
+    childCount: 1,
     className: ProblemsTableRowItem,
-    childCount: 1
+    type: Div
   }, text(textMessage), {
-    type: Div,
+    childCount: 1,
     className: ProblemsTableRowItem,
-    childCount: 1
+    type: Div
   }, text(textFile), {
-    type: Div,
+    childCount: 1,
     className: ProblemsTableRowItem,
-    childCount: 1
+    type: Div
   }, text(textSource)];
   return dom;
 };
 
 const getProblemsTableVirtualDom = problems => {
   const dom = [{
-    type: Div,
+    childCount: 2,
     className: ProblemsTable,
-    childCount: 2
+    type: Div
   }, ...getProblemsTableHeaderVirtualDom(), ...getProblemsTableBodyVirtualDom(problems)];
   return dom;
 };
@@ -2604,9 +2652,9 @@ const getProblemsTableVirtualDom = problems => {
 const getProblemsVirtualDom$1 = (viewMode, problems, filterValue, message) => {
   if (problems.length === 0 && message) {
     return [{
-      type: Div,
+      childCount: 1,
       className: Message,
-      childCount: 1
+      type: Div
     }, text(message)];
   }
   if (problems.length === 0 && filterValue) {
@@ -2625,19 +2673,19 @@ const getProblemsVirtualDom = (viewMode, problems, filterValue, isSmall, message
   // TODO avoid mutation
   const dom = [];
   dom.push({
-    type: Div,
+    childCount: 1,
     className: mergeClassNames(Viewlet, Problems),
-    tabIndex: 0,
-    onPointerDown: HandlePointerDown,
-    onContextMenu: HandleContextMenu,
     onBlur: HandleBlur,
-    childCount: 1
+    onContextMenu: HandleContextMenu,
+    onPointerDown: HandlePointerDown,
+    tabIndex: 0,
+    type: Div
   });
   if (isSmall) {
     dom[0].childCount++;
     dom.push(...getProblemsFilterVirtualDom({
-      command: HandleFilterInput,
       badgeText: '',
+      command: HandleFilterInput,
       placeholder: filter()}));
   }
   dom.push(...getProblemsVirtualDom$1(viewMode, problems, filterValue, message));
@@ -2675,11 +2723,11 @@ const filterProblems = (problems, collapsedUris, filterValue) => {
     }
     filtered.push({
       ...problem,
-      uriMatchIndex,
-      sourceMatchIndex,
-      messageMatchIndex,
+      isCollapsed,
       listItemType: getListItemType(problem.listItemType, isCollapsed),
-      isCollapsed
+      messageMatchIndex,
+      sourceMatchIndex,
+      uriMatchIndex
     });
   }
   return filtered;
@@ -2707,10 +2755,10 @@ const getVisibleProblems = (problems, collapsedUris, focusedIndex, filterValue)
     const problem = filtered[i];
     visibleItems.push({
       ...problem,
-      isEven: i % 2 === 0,
-      isActive: i === focusedIndex,
+      filterValueLength,
       icon: getIcon(problem.uri),
-      filterValueLength
+      isActive: i === focusedIndex,
+      isEven: i % 2 === 0
     });
   }
   return visibleItems;
@@ -2718,14 +2766,14 @@ const getVisibleProblems = (problems, collapsedUris, focusedIndex, filterValue)
 
 const renderItems = (oldState, newState) => {
   const {
-    problems,
-    width,
-    smallWidthBreakPoint,
     collapsedUris,
+    filterValue,
     focusedIndex,
+    message,
+    problems,
+    smallWidthBreakPoint,
     viewMode,
-    filterValue,
-    message
+    width
   } = newState;
   const visible = getVisibleProblems(problems, collapsedUris, focusedIndex, filterValue);
   const isSmall = width <= smallWidthBreakPoint;
@@ -2735,10 +2783,10 @@ const renderItems = (oldState, newState) => {
 
 const getRenderer = diffType => {
   switch (diffType) {
-    case RenderItems:
-      return renderItems;
     case RenderFilterValue:
       return renderFilterValue;
+    case RenderItems:
+      return renderItems;
     default:
       throw new Error('unknown renderer');
   }
@@ -2755,8 +2803,8 @@ const applyRender = (oldState, newState, diffResult) => {
 
 const render2 = (uid, diffResult) => {
   const {
-    oldState,
-    newState
+    newState,
+    oldState
   } = get(uid);
   set$1(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
@@ -2776,23 +2824,23 @@ const getActionVirtualDom = action => {
 
 const getActionsVirtualDom = actions => {
   return [{
-    type: Div,
+    childCount: actions.length,
     className: Actions,
     role: ToolBar,
-    childCount: actions.length
+    type: Div
   }, ...actions.flatMap(getActionVirtualDom)];
 };
 
 const getActions = state => {
   const {
-    problems,
-    width,
     collapsedUris,
-    focusedIndex,
-    smallWidthBreakPoint,
     filterValue,
+    focusedIndex,
     inputSource,
-    viewMode
+    problems,
+    smallWidthBreakPoint,
+    viewMode,
+    width
   } = state;
   const visibleCount = getVisibleProblems(problems, collapsedUris, focusedIndex, filterValue).length;
   const problemsCount = problems.length;
@@ -2800,32 +2848,32 @@ const getActions = state => {
   const actions = [];
   if (!isSmall) {
     actions.push({
-      type: ProblemsFilter,
-      id: 'Filter',
-      command: HandleFilterInput,
       badgeText: visibleCount === problemsCount ? '' : showingOf(visibleCount, problemsCount),
+      command: HandleFilterInput,
+      id: 'Filter',
       placeholder: filter(),
+      type: ProblemsFilter,
       value: inputSource === Script ? filterValue : ''
     });
   }
   if (viewMode === Table) {
     actions.push({
-      type: Button,
-      id: viewAsList$1(),
       command: 'viewAsList',
-      icon: ListTree
+      icon: ListTree,
+      id: viewAsList$1(),
+      type: Button
     });
   } else {
     actions.push({
-      type: Button,
-      id: collapseAll(),
       command: 'collapseAll',
-      icon: CollapseAll
+      icon: CollapseAll,
+      id: collapseAll(),
+      type: Button
     }, {
-      type: Button,
-      id: viewAsTable$1(),
       command: 'viewAsTable',
-      icon: ListFlat
+      icon: ListFlat,
+      id: viewAsTable$1(),
+      type: Button
     });
   }
   return actions;
@@ -2870,14 +2918,14 @@ const resize = (state, dimensions) => {
 
 const saveState = state => {
   const {
-    viewMode,
+    collapsedUris,
     filterValue,
-    collapsedUris
+    viewMode
   } = state;
   return {
-    viewMode,
+    collapsedUris,
     filterValue,
-    collapsedUris
+    viewMode
   };
 };
 
@@ -2905,8 +2953,8 @@ const commandMap = {
   'Problems.handleArrowLeft': wrapCommand(handleArrowLeft),
   'Problems.handleArrowRight': wrapCommand(handleArrowRight),
   'Problems.handleClickAt': wrapCommand(handleClickAt),
-  'Problems.handleContextMenu': wrapCommand(handleContextMenu),
   'Problems.handleClickButton': wrapCommand(handleClickButton),
+  'Problems.handleContextMenu': wrapCommand(handleContextMenu),
   'Problems.handleFilterInput': wrapCommand(handleFilterInput),
   'Problems.handleIconThemeChange': wrapCommand(handleIconThemeChange),
   'Problems.initialize': initialize,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/problems-view",
-  "version": "1.13.0",
+  "version": "1.14.0",
   "description": "Problems View Worker",
   "repository": {
     "type": "git",