@lvce-editor/problems-view 1.25.1 → 1.25.3

package/dist/problemsViewWorkerMain.js

@@ -1280,6 +1280,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 +1403,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 +1417,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 +1677,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 +2017,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) => {
@@ -2066,15 +2202,16 @@ const getActionButtonVirtualDom = action => {
   }, getIconVirtualDom(icon)];
 };
 
+const filterBadgeNode = {
+  childCount: 1,
+  className: FilterBadge,
+  type: Div
+};
 const getFilterBadgeDom = badgeText => {
   if (!badgeText) {
     return [];
   }
-  return [{
-    childCount: 1,
-    className: FilterBadge,
-    type: Div
-  }, text(badgeText)];
+  return [filterBadgeNode, text(badgeText)];
 };
 
 const getInputBoxVirtualDom = (name, onInput, placeholder) => {
@@ -2115,20 +2252,23 @@ const getProblemsFilterVirtualDom = action => {
     id: 'more filters'})];
 };
 
+const messageNode$2 = {
+  childCount: 3,
+  className: Message,
+  type: Div
+};
+const spanNode = {
+  childCount: 1,
+  type: Span
+};
+const clearFilterNode = {
+  childCount: 1,
+  className: MessageAction,
+  onClick: HandleClearFilterClick,
+  type: A
+};
 const getNoResultsWithFilterVirtualDom = () => {
-  return [{
-    childCount: 3,
-    className: Message,
-    type: Div
-  }, {
-    childCount: 1,
-    type: Span
-  }, text(noResultsFoundWithProvidedFilterCriteria()), {
-    childCount: 1,
-    className: MessageAction,
-    onClick: HandleClearFilterClick,
-    type: A
-  }, text(clearFilter()), text('.')];
+  return [messageNode$2, spanNode, text(noResultsFoundWithProvidedFilterCriteria()), clearFilterNode, text(clearFilter()), text('.')];
 };
 
 const getBadgeVirtualDom = (className, count) => {
@@ -2194,11 +2334,26 @@ const getProblemSourceDetail = (source, code) => {
   return message;
 };
 
-const defaultIndent = 1;
-const getTreeItemIndent = depth => {
-  return `${depth * defaultIndent}rem`;
+const labelNode = {
+  childCount: 1,
+  className: Label,
+  type: Span
+};
+const labelDetailNode = {
+  childCount: 1,
+  className: LabelDetail,
+  type: Div
+};
+const highlightNode = {
+  childCount: 1,
+  className: Highlight,
+  type: Div
+};
+const problemAtNode = {
+  childCount: 2,
+  className: ProblemAt,
+  type: Span
 };
-
 const getProblemVirtualDom = problem => {
   const {
     code,
@@ -2220,8 +2375,10 @@ const getProblemVirtualDom = problem => {
     type
   } = problem;
   let className = Problem;
+  const indent = getProblemIndent(listItemType);
+  className = mergeClassNames(className, `Indent-${indent}`);
   if (isActive) {
-    className += ' ' + ProblemSelected;
+    className = mergeClassNames(className, ProblemSelected);
   }
   if (listItemType === Expanded || listItemType === Collapsed) {
     return [{
@@ -2232,18 +2389,9 @@ const getProblemVirtualDom = problem => {
       ariaSetSize: setSize,
       childCount: 5,
       className,
-      paddingLeft: getTreeItemIndent(1),
       role: TreeItem,
       type: Div
-    }, listItemType === Collapsed ? getChevronRightVirtualDom() : getChevronDownVirtualDom(), getFileIconVirtualDom(icon), {
-      childCount: 1,
-      className: Label,
-      type: Span
-    }, text(fileName), {
-      childCount: 1,
-      className: LabelDetail,
-      type: Div
-    }, text(relativePath), ...getBadgeVirtualDom(ProblemBadge, problem.count)];
+    }, listItemType === Collapsed ? getChevronRightVirtualDom() : getChevronDownVirtualDom(), getFileIconVirtualDom(icon), labelNode, text(fileName), labelDetailNode, text(relativePath), ...getBadgeVirtualDom(ProblemBadge, problem.count)];
   }
   const lineColumn = atLineColumn(rowIndex, columnIndex);
   const label = {
@@ -2261,7 +2409,6 @@ const getProblemVirtualDom = problem => {
     ariaSetSize: setSize,
     childCount: 3,
     className,
-    paddingLeft: getTreeItemIndent(2),
     role: TreeItem,
     type: Div
   }, getProblemsIconVirtualDom(type), label];
@@ -2270,19 +2417,11 @@ const getProblemVirtualDom = problem => {
     const middle = message.slice(messageMatchIndex, messageMatchIndex + filterValueLength);
     const after = message.slice(messageMatchIndex + filterValueLength);
     label.childCount += 2;
-    dom.push(text(before), {
-      childCount: 1,
-      className: Highlight,
-      type: Div
-    }, text(middle), text(after));
+    dom.push(text(before), highlightNode, text(middle), text(after));
   } else {
     dom.push(text(message));
   }
-  dom.push({
-    childCount: 2,
-    className: ProblemAt,
-    type: Span
-  }, text(getProblemSourceDetail(source, code)), text(lineColumn));
+  dom.push(problemAtNode, text(getProblemSourceDetail(source, code)), text(lineColumn));
   return dom;
 };
 
@@ -2298,14 +2437,20 @@ const getProblemsListVirtualDom = problems => {
   return dom;
 };
 
+const messageNode$1 = {
+  childCount: 1,
+  className: Message,
+  type: Div
+};
 const getProblemsNoProblemsFoundVirtualDom = () => {
-  return [{
-    childCount: 1,
-    className: Message,
-    type: Div
-  }, text(noProblemsDetected())];
+  return [messageNode$1, text(noProblemsDetected())];
 };
 
+const rowItemNode$1 = {
+  childCount: 1,
+  className: ProblemsTableRowItem,
+  type: Div
+};
 const getClassName = isEven => {
   if (isEven) {
     return ProblemsTableRow;
@@ -2330,27 +2475,7 @@ const getProblemsTableRowVirtualDom = problem => {
     childCount: 5,
     className: getClassName(isEven),
     type: Div
-  }, {
-    childCount: 1,
-    className: ProblemsTableRowItem,
-    type: Div
-  }, getProblemsIconVirtualDom(type), {
-    childCount: 1,
-    className: ProblemsTableRowItem,
-    type: Div
-  }, text(getProblemSourceDetail(source, code)), {
-    childCount: 1,
-    className: ProblemsTableRowItem,
-    type: Div
-  }, text(message), {
-    childCount: 1,
-    className: ProblemsTableRowItem,
-    type: Div
-  }, text(uri), {
-    childCount: 1,
-    className: ProblemsTableRowItem,
-    type: Div
-  }, text(source)];
+  }, rowItemNode$1, getProblemsIconVirtualDom(type), rowItemNode$1, text(getProblemSourceDetail(source, code)), rowItemNode$1, text(message), rowItemNode$1, text(uri), rowItemNode$1, text(source)];
   return dom;
 };
 
@@ -2363,59 +2488,53 @@ const getProblemsTableBodyVirtualDom = problems => {
   return dom;
 };
 
+const tableHeaderNode = {
+  childCount: 1,
+  className: ProblemsTableHeader,
+  type: Div
+};
+const tableRowNode = {
+  childCount: 5,
+  className: ProblemsTableRow,
+  type: Div
+};
+const emptyRowItemNode = {
+  childCount: 0,
+  className: ProblemsTableRowItem,
+  type: Div
+};
+const rowItemNode = {
+  childCount: 1,
+  className: ProblemsTableRowItem,
+  type: Div
+};
 const getProblemsTableHeaderVirtualDom = () => {
   const textCode = code();
   const textSource = source();
   const textMessage = message();
   const textFile = file();
-  const dom = [{
-    childCount: 1,
-    className: ProblemsTableHeader,
-    type: Div
-  }, {
-    childCount: 5,
-    className: ProblemsTableRow,
-    type: Div
-  }, {
-    childCount: 0,
-    className: ProblemsTableRowItem,
-    type: Div
-  }, {
-    childCount: 1,
-    className: ProblemsTableRowItem,
-    type: Div
-  }, text(textCode), {
-    childCount: 1,
-    className: ProblemsTableRowItem,
-    type: Div
-  }, text(textMessage), {
-    childCount: 1,
-    className: ProblemsTableRowItem,
-    type: Div
-  }, text(textFile), {
-    childCount: 1,
-    className: ProblemsTableRowItem,
-    type: Div
-  }, text(textSource)];
+  const dom = [tableHeaderNode, tableRowNode, emptyRowItemNode, rowItemNode, text(textCode), rowItemNode, text(textMessage), rowItemNode, text(textFile), rowItemNode, text(textSource)];
   return dom;
 };
 
+const tableNode = {
+  childCount: 2,
+  className: ProblemsTable,
+  type: Div
+};
 const getProblemsTableVirtualDom = problems => {
-  const dom = [{
-    childCount: 2,
-    className: ProblemsTable,
-    type: Div
-  }, ...getProblemsTableHeaderVirtualDom(), ...getProblemsTableBodyVirtualDom(problems)];
+  const dom = [tableNode, ...getProblemsTableHeaderVirtualDom(), ...getProblemsTableBodyVirtualDom(problems)];
   return dom;
 };
 
+const messageNode = {
+  childCount: 1,
+  className: Message,
+  type: Div
+};
 const getProblemsVirtualDom$1 = (viewMode, problems, filterValue, message) => {
   if (problems.length === 0 && message) {
-    return [{
-      childCount: 1,
-      className: Message,
-      type: Div
-    }, text(message)];
+    return [messageNode, text(message)];
   }
   if (problems.length === 0 && filterValue) {
     return getNoResultsWithFilterVirtualDom();
@@ -2435,7 +2554,7 @@ const getProblemsVirtualDom = (activeUri, viewMode, problems, filterValue, isSma
   const baseDom = {
     childCount: isSmall ? 2 : 1,
     className: mergeClassNames(Viewlet, Problems),
-    dataActiveUri: activeUri,
+    'data-activeUri': activeUri,
     onBlur: HandleBlur,
     onContextMenu: HandleContextMenu,
     onPointerDown: HandlePointerDown,
@@ -2450,80 +2569,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,
@@ -2544,6 +2589,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.1",
+  "version": "1.25.3",
   "description": "Problems View Worker",
   "repository": {
     "type": "git",