@lvce-editor/problems-view 1.33.0 → 1.34.1

package/dist/problemsViewWorkerMain.js

@@ -2243,6 +2243,25 @@ const getFileName = uri => {
   const slashIndex = uri.lastIndexOf('/');
   return uri.slice(slashIndex + 1);
 };
+const toRelatedProblem = (relatedInformation, diagnostic, index, setSize) => {
+  return {
+    code: '',
+    columnIndex: relatedInformation.columnIndex || 0,
+    count: 0,
+    fileName: '',
+    level: 3,
+    listItemType: Item,
+    message: relatedInformation.message || '',
+    posInSet: index,
+    relativePath: '',
+    rowIndex: relatedInformation.rowIndex || 0,
+    setSize,
+    source: getFileName(relatedInformation.uri),
+    targetUri: relatedInformation.uri,
+    type: diagnostic.type || 'error',
+    uri: diagnostic.uri
+  };
+};
 const toProblems = (diagnostics, workspaceUri = '') => {
   const problems = [];
   let problem = {
@@ -2287,13 +2306,18 @@ const toProblems = (diagnostics, workspaceUri = '') => {
       problems.push(problem);
     }
     problems.push(toProblem(diagnostic, relativeIndex));
+    const relatedInformation = diagnostic.relatedInformation || [];
+    for (let i = 0; i < relatedInformation.length; i++) {
+      problems.push(toRelatedProblem(relatedInformation[i], diagnostic, i + 1, relatedInformation.length));
+    }
   }
   for (const problem of problems) {
     // TODO maybe rename property, this should be the relative path of the parent folder of the file
     // @ts-ignore
-    problem.relativePath = getRelativeParentUri(problem.uri, workspaceUri);
+    const displayUri = problem.targetUri || problem.uri;
+    problem.relativePath = getRelativeParentUri(displayUri, workspaceUri);
     // @ts-ignore
-    problem.fileName = getFileName(problem.uri);
+    problem.fileName = getFileName(displayUri);
     // problem.uri = problem.uri // TODO
   }
   return problems;
@@ -2327,7 +2351,7 @@ const getProblems = async (workspaceUri, activeUri) => {
     };
   } catch (error) {
     return {
-      error: `${error}`,
+      error: String(error),
       problems: []
     };
   }
@@ -2716,9 +2740,10 @@ const handleProblemClick = async (state, eventX, eventY) => {
   const {
     columnIndex,
     rowIndex,
+    targetUri,
     uri
   } = problem;
-  await openUri(uri, true);
+  await openUri(targetUri || uri, true);
   await focusEditor();
   await setEditorCursor(rowIndex, columnIndex);
   return newState;
@@ -2924,16 +2949,16 @@ const getTreeItemIndent = depth => {
   return `${depth * defaultIndent}rem`;
 };
 
-const getProblemIndent = listItemType => {
+const getProblemIndent = (listItemType, level) => {
   const isGroup = listItemType === Expanded || listItemType === Collapsed;
-  const depth = isGroup ? 1 : 2;
+  const depth = isGroup ? 1 : Math.max(2, level || 2);
   return getTreeItemIndent(depth);
 };
 
 const getUniqueIndents = problems => {
   const uniqueIndents = [];
   for (const problem of problems) {
-    const indent = getProblemIndent(problem.listItemType);
+    const indent = getProblemIndent(problem.listItemType, problem.level);
     if (!uniqueIndents.includes(indent)) {
       uniqueIndents.push(indent);
     }
@@ -3194,7 +3219,7 @@ const getBadgeVirtualDom = (className, count) => {
     childCount: 1,
     className: mergeClassNames('Badge', className) + (''),
     type: Div
-  }, text(`${count}`)];
+  }, text(String(count))];
 };
 
 const getChevronDownVirtualDom = (extraClassName = '') => {
@@ -3244,7 +3269,7 @@ const getProblemsIconVirtualDom = type => {
 const getProblemSourceDetail = (source, code) => {
   let message = '';
   if (source) {
-    message += `${source}`;
+    message += source;
   }
   if (code) {
     message += `(${code})`;
@@ -3295,23 +3320,24 @@ const getProblemVirtualDom = problem => {
     uri
   } = problem;
   let className = Problem;
-  const indent = getProblemIndent(listItemType);
+  const indent = getProblemIndent(listItemType, level);
   className = mergeClassNames(className, `Indent-${indent}`);
   if (isActive) {
     className = mergeClassNames(className, ProblemSelected);
   }
   if (listItemType === Expanded || listItemType === Collapsed) {
+    const fileIconDom = icon ? [getFileIconVirtualDom(icon)] : [];
     return [{
       ariaExpanded: !isCollapsed,
       ariaLevel: level,
       ariaPosInSet: posInSet,
       ariaSelected: isActive,
       ariaSetSize: setSize,
-      childCount: 5,
+      childCount: 4 + fileIconDom.length,
       className,
       role: TreeItem,
       type: Div
-    }, listItemType === Collapsed ? getChevronRightVirtualDom() : getChevronDownVirtualDom(), getFileIconVirtualDom(icon), {
+    }, listItemType === Collapsed ? getChevronRightVirtualDom() : getChevronDownVirtualDom(), ...fileIconDom, {
       ...labelNode,
       'data-uri': uri,
       onClick: HandleFileNameClick

package/package.json

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