@lvce-editor/problems-view 1.26.1 → 1.26.3

package/dist/problemsViewWorkerMain.js

@@ -300,61 +300,6 @@ class VError extends Error {
   }
 }
 
-class AssertionError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = 'AssertionError';
-  }
-}
-const Object$1 = 1;
-const Number$1 = 2;
-const Array$1 = 3;
-const String$1 = 4;
-const Boolean$1 = 5;
-const Function = 6;
-const Null = 7;
-const Unknown = 8;
-const getType = value => {
-  switch (typeof value) {
-    case 'number':
-      return Number$1;
-    case 'function':
-      return Function;
-    case 'string':
-      return String$1;
-    case 'object':
-      if (value === null) {
-        return Null;
-      }
-      if (Array.isArray(value)) {
-        return Array$1;
-      }
-      return Object$1;
-    case 'boolean':
-      return Boolean$1;
-    default:
-      return Unknown;
-  }
-};
-const number = value => {
-  const type = getType(value);
-  if (type !== Number$1) {
-    throw new AssertionError('expected value to be of type number');
-  }
-};
-const array = value => {
-  const type = getType(value);
-  if (type !== Array$1) {
-    throw new AssertionError('expected value to be of type array');
-  }
-};
-const string = value => {
-  const type = getType(value);
-  if (type !== String$1) {
-    throw new AssertionError('expected value to be of type string');
-  }
-};
-
 const isMessagePort = value => {
   return value && value instanceof MessagePort;
 };
@@ -1616,7 +1561,7 @@ const Checked = 2;
 const Unchecked = 3;
 
 const EditorWorker$1 = 99;
-const RendererWorker$1 = 1;
+const RendererWorker = 1;
 
 const SetCss = 'Viewlet.setCss';
 
@@ -1641,11 +1586,66 @@ const EditorWorker = {
   set: set$3
 };
 
+class AssertionError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = 'AssertionError';
+  }
+}
+const Object$1 = 1;
+const Number$1 = 2;
+const Array$1 = 3;
+const String$1 = 4;
+const Boolean$1 = 5;
+const Function = 6;
+const Null = 7;
+const Unknown = 8;
+const getType = value => {
+  switch (typeof value) {
+    case 'number':
+      return Number$1;
+    case 'function':
+      return Function;
+    case 'string':
+      return String$1;
+    case 'object':
+      if (value === null) {
+        return Null;
+      }
+      if (Array.isArray(value)) {
+        return Array$1;
+      }
+      return Object$1;
+    case 'boolean':
+      return Boolean$1;
+    default:
+      return Unknown;
+  }
+};
+const number = value => {
+  const type = getType(value);
+  if (type !== Number$1) {
+    throw new AssertionError('expected value to be of type number');
+  }
+};
+const array = value => {
+  const type = getType(value);
+  if (type !== Array$1) {
+    throw new AssertionError('expected value to be of type array');
+  }
+};
+const string = value => {
+  const type = getType(value);
+  if (type !== String$1) {
+    throw new AssertionError('expected value to be of type string');
+  }
+};
+
 const {
   invoke,
   invokeAndTransfer,
   set: set$2
-} = create$1(RendererWorker$1);
+} = create$1(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
   number(menuId);
@@ -1664,23 +1664,18 @@ const getActiveEditorId$1 = () => {
   return invoke('GetActiveEditor.getActiveEditorId');
 };
 
-const RendererWorker = {
-  __proto__: null,
-  getActiveEditorId: getActiveEditorId$1,
-  invoke,
-  invokeAndTransfer,
-  sendMessagePortToEditorWorker: sendMessagePortToEditorWorker$1,
-  set: set$2,
-  showContextMenu2,
-  writeClipBoardText: writeClipBoardText$1
+const getActiveEditorId = () => {
+  return getActiveEditorId$1();
+};
+const sendMessagePortToEditorWorker = (port, rpcId) => {
+  return sendMessagePortToEditorWorker$1(port, rpcId);
+};
+const set$1 = rpc => {
+  set$2(rpc);
+};
+const writeClipBoardText = text => {
+  return writeClipBoardText$1(text);
 };
-
-const {
-  getActiveEditorId,
-  sendMessagePortToEditorWorker,
-  set: set$1,
-  writeClipBoardText
-} = RendererWorker;
 
 const writeText = async text => {
   await writeClipBoardText(text);
@@ -1813,13 +1808,6 @@ const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
   return Math.min(Math.max(Math.round(size ** 2 / contentSize), minimumSliderSize), size);
 };
 
-const matchesFilterValue = (string, filterValueLower) => {
-  if (filterValueLower) {
-    return string.toLowerCase().indexOf(filterValueLower);
-  }
-  return 0;
-};
-
 const Item = 0;
 const Expanded = 1;
 const Collapsed = 2;
@@ -1833,8 +1821,17 @@ const getListItemType = (listItemType, isCollapsed) => {
   }
   return Expanded;
 };
+
+const matchesFilterValue = (string, filterValueLower) => {
+  if (filterValueLower) {
+    return string.toLowerCase().indexOf(filterValueLower);
+  }
+  return 0;
+};
+
 const filterProblems = (problems, collapsedUris, filterValue) => {
   const filterValueLower = filterValue.toLowerCase();
+  const collapsedUriSet = new Set(collapsedUris);
   const filtered = [];
   for (const problem of problems) {
     const uriMatchIndex = matchesFilterValue(problem.uri, filterValueLower);
@@ -1843,7 +1840,7 @@ const filterProblems = (problems, collapsedUris, filterValue) => {
     if (uriMatchIndex === -1 && sourceMatchIndex === -1 && messageMatchIndex === -1) {
       continue;
     }
-    const isCollapsed = collapsedUris.includes(problem.uri);
+    const isCollapsed = collapsedUriSet.has(problem.uri);
     if (isCollapsed && problem.listItemType === Item) {
       continue;
     }
@@ -2123,6 +2120,9 @@ const {
   getProblems: getProblems$1,
   getUri} = EditorWorker;
 
+const leadingSlashesRegex = /^\/+/;
+const trailingSlashRegex = /\/$/;
+const windowsDrivePathRegex = /^\/[a-z]:\//i;
 const toProblem = (diagnostic, index) => {
   const {
     code,
@@ -2152,11 +2152,11 @@ const toProblem = (diagnostic, index) => {
 };
 const normalizeFileUri = uri => {
   const normalizedUri = uri.startsWith('file://') ? uri.slice('file://'.length) : uri;
-  return /^\/[a-z]:\//i.test(normalizedUri) ? normalizedUri.slice(1) : normalizedUri;
+  return windowsDrivePathRegex.test(normalizedUri) ? normalizedUri.slice(1) : normalizedUri;
 };
 const getRelativeParentUri = (uri, workspaceUri) => {
   const normalizedUri = normalizeFileUri(uri);
-  const normalizedWorkspaceUri = normalizeFileUri(workspaceUri).replace(/\/$/, '');
+  const normalizedWorkspaceUri = normalizeFileUri(workspaceUri).replace(trailingSlashRegex, '');
   const slashIndex = normalizedUri.lastIndexOf('/');
   const parentUri = normalizedUri.slice(0, slashIndex);
   if (parentUri === normalizedWorkspaceUri) {
@@ -2165,7 +2165,7 @@ const getRelativeParentUri = (uri, workspaceUri) => {
   if (normalizedWorkspaceUri && parentUri.startsWith(`${normalizedWorkspaceUri}/`)) {
     return parentUri.slice(normalizedWorkspaceUri.length + 1);
   }
-  return parentUri.replace(/^\/+/, '');
+  return parentUri.replace(leadingSlashesRegex, '');
 };
 const getFileName = uri => {
   const slashIndex = uri.lastIndexOf('/');
@@ -2251,14 +2251,10 @@ const getProblems = async (workspaceUri, activeUri) => {
   }
 };
 
-const handleActiveEditorChange = async (state, activeUri) => {
+const refreshProblems = async (state, activeUri) => {
   const {
-    activeUri: oldActiveUri,
     workspaceUri
   } = state;
-  if (activeUri === oldActiveUri) {
-    return state;
-  }
   const {
     error,
     problems
@@ -2273,6 +2269,24 @@ const handleActiveEditorChange = async (state, activeUri) => {
     problems
   };
 };
+const handleActiveEditorChange = async (state, activeUri) => {
+  const {
+    activeUri: oldActiveUri
+  } = state;
+  if (activeUri === oldActiveUri) {
+    return state;
+  }
+  return refreshProblems(state, activeUri);
+};
+const handleDiagnosticsChange = async (state, uri) => {
+  const {
+    activeUri
+  } = state;
+  if (uri !== activeUri) {
+    return state;
+  }
+  return refreshProblems(state, uri);
+};
 
 const getArrowLeftNewFocusedIndex = (problems, collapsedUris, focusedIndex) => {
   for (let i = focusedIndex; i >= 0; i--) {
@@ -2280,7 +2294,7 @@ const getArrowLeftNewFocusedIndex = (problems, collapsedUris, focusedIndex) => {
     if (problem.listItemType !== Item) {
       return {
         index: i,
-        newCollapsedUris: [...collapsedUris, problem.uri]
+        newCollapsedUris: collapsedUris.includes(problem.uri) ? collapsedUris : [...collapsedUris, problem.uri]
       };
     }
   }
@@ -2306,17 +2320,9 @@ const handleArrowLeft = state => {
   };
 };
 
-const removeElement = (array, element) => {
-  const index = array.indexOf(element);
-  if (index === -1) {
-    return array;
-  }
-  return [...array.slice(0, index), ...array.slice(index + 1)];
-};
-
 const getArrowRightNewFocusedIndex = (problems, collapsedUris, focusedIndex) => {
   const problem = problems[focusedIndex];
-  const newCollapsedUris = removeElement(collapsedUris, problem.uri);
+  const newCollapsedUris = collapsedUris.includes(problem.uri) ? collapsedUris.filter(uri => uri !== problem.uri) : collapsedUris;
   return {
     index: focusedIndex,
     newCollapsedUris
@@ -2544,27 +2550,32 @@ const getActiveUri = async () => {
   return getUri(editorId);
 };
 
-const getSavedViewMode = savedState => {
-  if (savedState && typeof savedState.viewMode === 'number') {
-    return savedState.viewMode;
+const isString = value => {
+  return typeof value === 'string';
+};
+
+const getSavedCollapsedUris = savedState => {
+  const collapsedUris = savedState?.collapsedUris;
+  if (Array.isArray(collapsedUris) && collapsedUris.every(isString)) {
+    return [...new Set(collapsedUris)];
   }
-  return List;
+  return [];
 };
+
 const getSavedFilterValue = savedState => {
   if (savedState && typeof savedState.filterValue === 'string') {
     return savedState.filterValue;
   }
   return '';
 };
-const isString = value => {
-  return typeof value === 'string';
-};
-const getSavedCollapsedUris = savedState => {
-  if (savedState && savedState.collapsedUris && Array.isArray(savedState.collapsedUris) && savedState.collapsedUris.every(isString)) {
-    return savedState.collapsedUris;
+
+const getSavedViewMode = savedState => {
+  if (savedState && typeof savedState.viewMode === 'number') {
+    return savedState.viewMode;
   }
-  return [];
+  return List;
 };
+
 const loadContent = async (state, savedState) => {
   const {
     workspaceUri
@@ -2819,8 +2830,10 @@ const getFilterBadgeDom = badgeText => {
 
 const getInputBoxVirtualDom = (name, onInput, placeholder) => {
   return {
+    ariaLabel: placeholder,
     autocapitalize: 'off',
     autocorrect: 'off',
+    childCount: 0,
     className: InputBox,
     name,
     onInput,
@@ -2899,6 +2912,7 @@ const getChevronRightVirtualDom = (extraClassName = '') => {
 
 const getFileIconVirtualDom = icon => {
   return {
+    alt: '',
     childCount: 0,
     className: FileIcon,
     role: None$1,
@@ -3017,7 +3031,7 @@ const getProblemVirtualDom = problem => {
     role: TreeItem,
     type: Div
   }, getProblemsIconVirtualDom(type), label];
-  if (filterValueLength) {
+  if (filterValueLength && messageMatchIndex >= 0) {
     const before = message.slice(0, messageMatchIndex);
     const middle = message.slice(messageMatchIndex, messageMatchIndex + filterValueLength);
     const after = message.slice(messageMatchIndex + filterValueLength);
@@ -3421,6 +3435,7 @@ const commandMap = {
   'Problems.handleClickButton': wrapCommand(handleClickButton),
   'Problems.handleClickMoreFilters': wrapCommand(handleClickMoreFilters),
   'Problems.handleContextMenu': wrapCommand(handleContextMenu),
+  'Problems.handleDiagnosticsChange': wrapCommand(handleDiagnosticsChange),
   'Problems.handleFilterInput': wrapCommand(handleFilterInput),
   'Problems.handleIconThemeChange': wrapCommand(handleIconThemeChange),
   'Problems.handleScrollBarCaptureLost': wrapCommand(handleScrollBarCaptureLost),

package/package.json

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