@lvce-editor/problems-view 1.26.2 → 1.26.4

package/dist/problemsViewWorkerMain.js

@@ -1266,6 +1266,34 @@ const listen$1 = async (module, options) => {
   return ipc;
 };
 
+const createSharedLazyRpc = factory => {
+  let rpcPromise;
+  const getOrCreate = () => {
+    if (!rpcPromise) {
+      rpcPromise = factory();
+    }
+    return rpcPromise;
+  };
+  return {
+    async dispose() {
+      const rpc = await getOrCreate();
+      await rpc.dispose();
+    },
+    async invoke(method, ...params) {
+      const rpc = await getOrCreate();
+      return rpc.invoke(method, ...params);
+    },
+    async invokeAndTransfer(method, ...params) {
+      const rpc = await getOrCreate();
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    async send(method, ...params) {
+      const rpc = await getOrCreate();
+      rpc.send(method, ...params);
+    }
+  };
+};
+
 const create$5 = async ({
   commandMap,
   isMessagePortOpen = true,
@@ -1301,34 +1329,6 @@ const create$4 = async ({
   });
 };
 
-const createSharedLazyRpc = factory => {
-  let rpcPromise;
-  const getOrCreate = () => {
-    if (!rpcPromise) {
-      rpcPromise = factory();
-    }
-    return rpcPromise;
-  };
-  return {
-    async dispose() {
-      const rpc = await getOrCreate();
-      await rpc.dispose();
-    },
-    async invoke(method, ...params) {
-      const rpc = await getOrCreate();
-      return rpc.invoke(method, ...params);
-    },
-    async invokeAndTransfer(method, ...params) {
-      const rpc = await getOrCreate();
-      return rpc.invokeAndTransfer(method, ...params);
-    },
-    async send(method, ...params) {
-      const rpc = await getOrCreate();
-      rpc.send(method, ...params);
-    }
-  };
-};
-
 const create$3 = async ({
   commandMap,
   isMessagePortOpen,
@@ -1808,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;
@@ -1828,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);
@@ -1838,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;
     }
@@ -2118,6 +2120,9 @@ const {
   getProblems: getProblems$1,
   getUri} = EditorWorker;
 
+const leadingSlashesRegex = /^\/+/;
+const trailingSlashRegex = /\/$/;
+const windowsDrivePathRegex = /^\/[a-z]:\//i;
 const toProblem = (diagnostic, index) => {
   const {
     code,
@@ -2147,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) {
@@ -2160,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('/');
@@ -2289,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]
       };
     }
   }
@@ -2315,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
@@ -2553,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
@@ -2826,16 +2828,21 @@ const getFilterBadgeDom = badgeText => {
   return [filterBadgeNode, text(badgeText)];
 };
 
-const getInputBoxVirtualDom = (name, onInput, placeholder) => {
+const getInputBoxVirtualDom = (name, onInput, placeholder, value) => {
   return {
+    ariaLabel: placeholder,
     autocapitalize: 'off',
     autocorrect: 'off',
+    childCount: 0,
     className: InputBox,
     name,
     onInput,
     placeholder,
     spellcheck: false,
-    type: Input
+    type: Input,
+    ...(value && {
+      value
+    })
   };
 };
 
@@ -2858,7 +2865,7 @@ const getProblemsFilterVirtualDom = action => {
     childCount: getChildCount(action.badgeText),
     className: Filter$1,
     type: Div
-  }, getInputBoxVirtualDom(Filter$2, action.command, action.placeholder || ''), ...getFilterBadgeDom(action.badgeText), ...getActionButtonVirtualDom({
+  }, getInputBoxVirtualDom(Filter$2, action.command, action.placeholder || '', action.value), ...getFilterBadgeDom(action.badgeText), ...getActionButtonVirtualDom({
     command: 'more filters',
     icon: Filter,
     id: 'more filters'})];
@@ -2908,6 +2915,7 @@ const getChevronRightVirtualDom = (extraClassName = '') => {
 
 const getFileIconVirtualDom = icon => {
   return {
+    alt: '',
     childCount: 0,
     className: FileIcon,
     role: None$1,
@@ -3026,7 +3034,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);
@@ -3196,7 +3204,9 @@ const getProblemsVirtualDom = (activeUri, viewMode, problems, filterValue, isSma
   const filterDom = isSmall ? getProblemsFilterVirtualDom({
     badgeText: '',
     command: HandleFilterInput,
-    placeholder: filter()}) : [];
+    placeholder: filter(),
+    value: filterValue
+  }) : [];
   const itemsDom = getProblemsVirtualDom$1(viewMode, problems, filterValue, message, problemCount);
   const scrollBarDom = getScrollBarVirtualDom(scrollBarHeight, scrollBarActive);
   const contentClassName = viewMode === Table ? mergeClassNames(ProblemsContent, ProblemsContentTable) : ProblemsContent;

package/package.json

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