@lvce-editor/problems-view 1.25.2 → 1.25.4

package/dist/problemsViewWorkerMain.js

@@ -712,7 +712,10 @@ const constructError = (message, type, name) => {
   if (ErrorConstructor === Error) {
     const error = new Error(message);
     if (name && name !== 'VError') {
-      error.name = name;
+      Object.defineProperty(error, 'name', {
+        configurable: true,
+        value: name
+      });
     }
     return error;
   }
@@ -729,8 +732,10 @@ const getCurrentStack = () => {
   const currentStack = joinLines(splitLines(new Error().stack || '').slice(stackLinesToSkip));
   return currentStack;
 };
-const getNewLineIndex = (string, startIndex = undefined) => {
-  return string.indexOf(NewLine, startIndex);
+const getNewLineIndex = (string, startIndex) => {
+  {
+    return string.indexOf(NewLine);
+  }
 };
 const getParentStack = error => {
   let parentStack = error.stack || error.data || error.message || '';
@@ -741,55 +746,91 @@ const getParentStack = error => {
 };
 const MethodNotFound = -32601;
 const Custom = -32001;
+const setStack = (error, stack) => {
+  const descriptor = Object.getOwnPropertyDescriptor(error, 'stack');
+  if (descriptor) {
+    if (!descriptor.configurable && !descriptor.writable) {
+      return;
+    }
+    if (!descriptor.configurable && descriptor.writable) {
+      error.stack = stack;
+      return;
+    }
+  }
+  Object.defineProperty(error, 'stack', {
+    configurable: true,
+    value: stack,
+    writable: true
+  });
+};
+const restoreExistingError = (error, currentStack) => {
+  if (typeof error.stack === 'string') {
+    setStack(error, `${error.stack}${NewLine}${currentStack}`);
+  }
+  return error;
+};
+const restoreMethodNotFoundError = (error, currentStack) => {
+  const restoredError = new JsonRpcError(error.message);
+  const parentStack = getParentStack(error);
+  setStack(restoredError, `${parentStack}${NewLine}${currentStack}`);
+  return restoredError;
+};
+const restoreStackFromData = (restoredError, error, currentStack) => {
+  if (error.data.stack && error.data.type && error.message) {
+    setStack(restoredError, `${error.data.type}: ${error.message}${NewLine}${error.data.stack}${NewLine}${currentStack}`);
+    return;
+  }
+  if (error.data.stack) {
+    setStack(restoredError, error.data.stack);
+  }
+};
+const applyDataProperties = (restoredError, error) => {
+  restoreStackFromData(restoredError, error, getCurrentStack());
+  if (error.data.codeFrame) {
+    // @ts-ignore
+    restoredError.codeFrame = error.data.codeFrame;
+  }
+  if (error.data.code) {
+    // @ts-ignore
+    restoredError.code = error.data.code;
+  }
+  if (error.data.type) {
+    // @ts-ignore
+    restoredError.name = error.data.type;
+  }
+};
+const applyDirectProperties = (restoredError, error) => {
+  if (error.stack) {
+    const lowerStack = restoredError.stack || '';
+    const indexNewLine = getNewLineIndex(lowerStack);
+    const parentStack = getParentStack(error);
+    // @ts-ignore
+    setStack(restoredError, `${parentStack}${lowerStack.slice(indexNewLine)}`);
+  }
+  if (error.codeFrame) {
+    // @ts-ignore
+    restoredError.codeFrame = error.codeFrame;
+  }
+};
+const restoreMessageError = (error, _currentStack) => {
+  const restoredError = constructError(error.message, error.type, error.name);
+  if (error.data) {
+    applyDataProperties(restoredError, error);
+  } else {
+    applyDirectProperties(restoredError, error);
+  }
+  return restoredError;
+};
 const restoreJsonRpcError = error => {
   const currentStack = getCurrentStack();
   if (error && error instanceof Error) {
-    if (typeof error.stack === 'string') {
-      error.stack = error.stack + NewLine + currentStack;
-    }
-    return error;
+    return restoreExistingError(error, currentStack);
   }
   if (error && error.code && error.code === MethodNotFound) {
-    const restoredError = new JsonRpcError(error.message);
-    const parentStack = getParentStack(error);
-    restoredError.stack = parentStack + NewLine + currentStack;
-    return restoredError;
+    return restoreMethodNotFoundError(error, currentStack);
   }
   if (error && error.message) {
-    const restoredError = constructError(error.message, error.type, error.name);
-    if (error.data) {
-      if (error.data.stack && error.data.type && error.message) {
-        restoredError.stack = error.data.type + ': ' + error.message + NewLine + error.data.stack + NewLine + currentStack;
-      } else if (error.data.stack) {
-        restoredError.stack = error.data.stack;
-      }
-      if (error.data.codeFrame) {
-        // @ts-ignore
-        restoredError.codeFrame = error.data.codeFrame;
-      }
-      if (error.data.code) {
-        // @ts-ignore
-        restoredError.code = error.data.code;
-      }
-      if (error.data.type) {
-        // @ts-ignore
-        restoredError.name = error.data.type;
-      }
-    } else {
-      if (error.stack) {
-        const lowerStack = restoredError.stack || '';
-        // @ts-ignore
-        const indexNewLine = getNewLineIndex(lowerStack);
-        const parentStack = getParentStack(error);
-        // @ts-ignore
-        restoredError.stack = parentStack + lowerStack.slice(indexNewLine);
-      }
-      if (error.codeFrame) {
-        // @ts-ignore
-        restoredError.codeFrame = error.codeFrame;
-      }
-    }
-    return restoredError;
+    return restoreMessageError(error);
   }
   if (typeof error === 'string') {
     return new Error(`JsonRpc Error: ${error}`);
@@ -1280,6 +1321,8 @@ const Unchecked = 3;
 const EditorWorker$1 = 99;
 const RendererWorker$1 = 1;
 
+const SetCss = 'Viewlet.setCss';
+
 const {
   invoke: invoke$1,
   set: set$3
@@ -1401,6 +1444,10 @@ const create = (id, uri, x, y, width, height, workspaceUri) => {
   set(id, state, state);
 };
 
+const isEqual$2 = (oldState, newState) => {
+  return oldState.collapsedUris === newState.collapsedUris && oldState.filterValue === newState.filterValue && oldState.problems === newState.problems;
+};
+
 const isEqual$1 = (oldState, newState) => {
   return newState.inputSource === User || oldState.filterValue === newState.filterValue;
 };
@@ -1411,9 +1458,10 @@ const isEqual = (oldState, newState) => {
 
 const RenderItems = 1;
 const RenderFilterValue = 2;
+const RenderCss = 4;
 
-const modules = [isEqual, isEqual$1];
-const numbers = [RenderItems, RenderFilterValue];
+const modules = [isEqual, isEqual$1, isEqual$2];
+const numbers = [RenderItems, RenderFilterValue, RenderCss];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -1670,9 +1718,22 @@ const toProblem = (diagnostic, index) => {
     uri
   };
 };
+const normalizeFileUri = uri => {
+  const normalizedUri = uri.startsWith('file://') ? uri.slice('file://'.length) : uri;
+  return /^\/[a-z]:\//i.test(normalizedUri) ? normalizedUri.slice(1) : normalizedUri;
+};
 const getRelativeParentUri = (uri, workspaceUri) => {
-  const slashIndex = uri.lastIndexOf('/');
-  return uri.slice(0, slashIndex).slice(workspaceUri.length);
+  const normalizedUri = normalizeFileUri(uri);
+  const normalizedWorkspaceUri = normalizeFileUri(workspaceUri).replace(/\/$/, '');
+  const slashIndex = normalizedUri.lastIndexOf('/');
+  const parentUri = normalizedUri.slice(0, slashIndex);
+  if (parentUri === normalizedWorkspaceUri) {
+    return '';
+  }
+  if (normalizedWorkspaceUri && parentUri.startsWith(`${normalizedWorkspaceUri}/`)) {
+    return parentUri.slice(normalizedWorkspaceUri.length + 1);
+  }
+  return parentUri.replace(/^\/+/, '');
 };
 const getFileName = uri => {
   const slashIndex = uri.lastIndexOf('/');
@@ -1997,6 +2058,122 @@ const loadContent = async (state, savedState) => {
   };
 };
 
+const getIndentRule = indent => {
+  return `.Indent-${indent} {
+  padding-left: ${indent};
+}`;
+};
+
+const defaultIndent = 1;
+const getTreeItemIndent = depth => {
+  return `${depth * defaultIndent}rem`;
+};
+
+const getProblemIndent = listItemType => {
+  const isGroup = listItemType === Expanded || listItemType === Collapsed;
+  const depth = isGroup ? 1 : 2;
+  return getTreeItemIndent(depth);
+};
+
+const getUniqueIndents = problems => {
+  const uniqueIndents = [];
+  for (const problem of problems) {
+    const indent = getProblemIndent(problem.listItemType);
+    if (!uniqueIndents.includes(indent)) {
+      uniqueIndents.push(indent);
+    }
+  }
+  return uniqueIndents;
+};
+
+const matchesFilterValue = (string, filterValueLower) => {
+  if (filterValueLower) {
+    return string.toLowerCase().indexOf(filterValueLower);
+  }
+  return 0;
+};
+
+const getListItemType = (listItemType, isCollapsed) => {
+  if (listItemType === Item) {
+    return Item;
+  }
+  if (isCollapsed) {
+    return Collapsed;
+  }
+  return Expanded;
+};
+const filterProblems = (problems, collapsedUris, filterValue) => {
+  const filterValueLower = filterValue.toLowerCase();
+  const filtered = [];
+  for (const problem of problems) {
+    const uriMatchIndex = matchesFilterValue(problem.uri, filterValueLower);
+    const sourceMatchIndex = matchesFilterValue(problem.source, filterValueLower);
+    const messageMatchIndex = matchesFilterValue(problem.message, filterValueLower);
+    if (uriMatchIndex === -1 && sourceMatchIndex === -1 && messageMatchIndex === -1) {
+      continue;
+    }
+    const isCollapsed = collapsedUris.includes(problem.uri);
+    if (isCollapsed && problem.listItemType === Item) {
+      continue;
+    }
+    filtered.push({
+      ...problem,
+      isCollapsed,
+      listItemType: getListItemType(problem.listItemType, isCollapsed),
+      messageMatchIndex,
+      sourceMatchIndex,
+      uriMatchIndex
+    });
+  }
+  return filtered;
+};
+
+const getFileNameIcon = file => {
+  return '';
+};
+
+const getIcon = uri => {
+  if (!uri) {
+    return '';
+  }
+  return getFileNameIcon();
+};
+
+const getVisibleProblems = (problems, collapsedUris, focusedIndex, filterValue) => {
+  array(problems);
+  array(collapsedUris);
+  number(focusedIndex);
+  string(filterValue);
+  const visibleItems = [];
+  const filterValueLength = filterValue.length;
+  const filtered = filterProblems(problems, collapsedUris, filterValue);
+  for (let i = 0; i < filtered.length; i++) {
+    const problem = filtered[i];
+    visibleItems.push({
+      ...problem,
+      filterValueLength,
+      icon: getIcon(problem.uri),
+      isActive: i === focusedIndex,
+      isEven: i % 2 === 0
+    });
+  }
+  return visibleItems;
+};
+
+const renderCss = (oldState, newState) => {
+  const {
+    collapsedUris,
+    filterValue,
+    focusedIndex,
+    problems,
+    uid
+  } = newState;
+  const visibleProblems = getVisibleProblems(problems, collapsedUris, focusedIndex, filterValue);
+  const uniqueIndents = getUniqueIndents(visibleProblems);
+  const css = uniqueIndents.map(getIndentRule).join('\n');
+  return [SetCss, uid, css];
+};
+
 const Filter$2 = 'filter';
 
 const renderFilterValue = (oldState, newState) => {
@@ -2021,6 +2198,7 @@ const MessageAction = 'MessageAction';
 const Problem = 'Problem';
 const ProblemAt = 'ProblemAt';
 const ProblemBadge = 'ProblemBadge';
+const ProblemLabel = 'ProblemLabel';
 const Problems = 'Problems';
 const ProblemSelected = 'ProblemSelected';
 const ProblemsErrorIcon = 'ProblemsErrorIcon';
@@ -2198,11 +2376,6 @@ const getProblemSourceDetail = (source, code) => {
   return message;
 };
 
-const defaultIndent = 1;
-const getTreeItemIndent = depth => {
-  return `${depth * defaultIndent}rem`;
-};
-
 const labelNode = {
   childCount: 1,
   className: Label,
@@ -2244,6 +2417,8 @@ const getProblemVirtualDom = problem => {
     type
   } = problem;
   let className = Problem;
+  const indent = getProblemIndent(listItemType);
+  className = mergeClassNames(className, `Indent-${indent}`);
   if (isActive) {
     className = mergeClassNames(className, ProblemSelected);
   }
@@ -2256,7 +2431,6 @@ const getProblemVirtualDom = problem => {
       ariaSetSize: setSize,
       childCount: 5,
       className,
-      paddingLeft: getTreeItemIndent(1),
       role: TreeItem,
       type: Div
     }, listItemType === Collapsed ? getChevronRightVirtualDom() : getChevronDownVirtualDom(), getFileIconVirtualDom(icon), labelNode, text(fileName), labelDetailNode, text(relativePath), ...getBadgeVirtualDom(ProblemBadge, problem.count)];
@@ -2264,7 +2438,7 @@ const getProblemVirtualDom = problem => {
   const lineColumn = atLineColumn(rowIndex, columnIndex);
   const label = {
     childCount: 1,
-    className: Label,
+    className: ProblemLabel,
     type: Div
   };
   /**
@@ -2277,7 +2451,6 @@ const getProblemVirtualDom = problem => {
     ariaSetSize: setSize,
     childCount: 3,
     className,
-    paddingLeft: getTreeItemIndent(2),
     role: TreeItem,
     type: Div
   }, getProblemsIconVirtualDom(type), label];
@@ -2438,80 +2611,6 @@ const getProblemsVirtualDom = (activeUri, viewMode, problems, filterValue, isSma
   return [baseDom, ...filterDom, ...itemsDom];
 };
 
-const matchesFilterValue = (string, filterValueLower) => {
-  if (filterValueLower) {
-    return string.toLowerCase().indexOf(filterValueLower);
-  }
-  return 0;
-};
-
-const getListItemType = (listItemType, isCollapsed) => {
-  if (listItemType === Item) {
-    return Item;
-  }
-  if (isCollapsed) {
-    return Collapsed;
-  }
-  return Expanded;
-};
-const filterProblems = (problems, collapsedUris, filterValue) => {
-  const filterValueLower = filterValue.toLowerCase();
-  const filtered = [];
-  for (const problem of problems) {
-    const uriMatchIndex = matchesFilterValue(problem.uri, filterValueLower);
-    const sourceMatchIndex = matchesFilterValue(problem.source, filterValueLower);
-    const messageMatchIndex = matchesFilterValue(problem.message, filterValueLower);
-    if (uriMatchIndex === -1 && sourceMatchIndex === -1 && messageMatchIndex === -1) {
-      continue;
-    }
-    const isCollapsed = collapsedUris.includes(problem.uri);
-    if (isCollapsed && problem.listItemType === Item) {
-      continue;
-    }
-    filtered.push({
-      ...problem,
-      isCollapsed,
-      listItemType: getListItemType(problem.listItemType, isCollapsed),
-      messageMatchIndex,
-      sourceMatchIndex,
-      uriMatchIndex
-    });
-  }
-  return filtered;
-};
-
-const getFileNameIcon = file => {
-  return '';
-};
-
-const getIcon = uri => {
-  if (!uri) {
-    return '';
-  }
-  return getFileNameIcon();
-};
-
-const getVisibleProblems = (problems, collapsedUris, focusedIndex, filterValue) => {
-  array(problems);
-  array(collapsedUris);
-  number(focusedIndex);
-  string(filterValue);
-  const visibleItems = [];
-  const filterValueLength = filterValue.length;
-  const filtered = filterProblems(problems, collapsedUris, filterValue);
-  for (let i = 0; i < filtered.length; i++) {
-    const problem = filtered[i];
-    visibleItems.push({
-      ...problem,
-      filterValueLength,
-      icon: getIcon(problem.uri),
-      isActive: i === focusedIndex,
-      isEven: i % 2 === 0
-    });
-  }
-  return visibleItems;
-};
-
 const renderItems = (oldState, newState) => {
   const {
     activeUri,
@@ -2532,6 +2631,8 @@ const renderItems = (oldState, newState) => {
 
 const getRenderer = diffType => {
   switch (diffType) {
+    case RenderCss:
+      return renderCss;
     case RenderFilterValue:
       return renderFilterValue;
     case RenderItems:

package/package.json

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