@lvce-editor/problems-view 1.35.0 → 1.36.0

package/dist/problemsViewWorkerMain.js

@@ -1437,7 +1437,7 @@ const create$1 = rpcId => {
   };
 };
 
-const None$1 = 'none';
+const None$2 = 'none';
 const ToolBar = 'toolbar';
 const Tree = 'tree';
 const TreeItem = 'treeitem';
@@ -1749,7 +1749,7 @@ const {
   wrapGetter
 } = create$a();
 
-const None = 0;
+const None$1 = 0;
 const Table = 1;
 const List = 2;
 
@@ -1780,7 +1780,7 @@ const create = (id, uri, x, y, width, height, workspaceUri) => {
     showWarnings: true,
     smallWidthBreakPoint: 650,
     uid: id,
-    viewMode: None,
+    viewMode: None$1,
     width,
     workspaceUri,
     x,
@@ -1833,7 +1833,7 @@ const diff = (oldState, newState) => {
 const FilterHeight = 24;
 const TableHeaderHeight = 22;
 const getListTopOffset = (width, smallWidthBreakPoint, viewMode) => {
-  const filterHeight = viewMode !== None && width <= smallWidthBreakPoint ? FilterHeight : 0;
+  const filterHeight = viewMode !== None$1 && width <= smallWidthBreakPoint ? FilterHeight : 0;
   const tableHeaderHeight = viewMode === Table ? TableHeaderHeight : 0;
   return filterHeight + tableHeaderHeight;
 };
@@ -1855,9 +1855,6 @@ const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
   return Math.min(Math.max(Math.round(size ** 2 / contentSize), minimumSliderSize), size);
 };
 
-const Error$1 = 'error';
-const Warning = 'warning';
-
 const getListItemType = (listItemType, isCollapsed) => {
   if (listItemType === Item) {
     return Item;
@@ -1875,11 +1872,18 @@ const matchesFilterValue = (string, filterValueLower) => {
   return 0;
 };
 
+const None = 0;
+const Error$2 = 1;
+const Warning$1 = 2;
+const Spelling = 3;
+const Info = 4;
+const Other = 5;
+
 const matchesSeverity = (problem, showErrors, showWarnings, showInfos) => {
   switch (problem.type) {
-    case Error$1:
+    case Error$2:
       return showErrors;
-    case Warning:
+    case Warning$1:
       return showWarnings;
     default:
       return showInfos;
@@ -2189,6 +2193,9 @@ const getMenuIds = () => {
   return [ProblemsFilter$1];
 };
 
+const Error$1 = 'error';
+const Warning = 'warning';
+
 const {
   getProblems: getProblems$1,
   getUri} = EditorWorker;
@@ -2196,9 +2203,21 @@ const getDiagnostics = editorId => {
   return invoke$3('Editor.getDiagnostics', editorId);
 };
 
-const leadingSlashesRegex = /^\/+/;
-const trailingSlashRegex = /\/$/;
-const windowsDrivePathRegex = /^\/[a-z]:\//i;
+const getProblemType = type => {
+  switch (type) {
+    case Error$1:
+      return Error$2;
+    case Warning:
+      return Warning$1;
+    case 'info':
+      return Info;
+    case 'spelling':
+      return Spelling;
+    default:
+      return type ? Other : Error$2;
+  }
+};
+
 const toProblem = (diagnostic, index) => {
   const {
     code,
@@ -2218,31 +2237,13 @@ const toProblem = (diagnostic, index) => {
     listItemType: Item,
     message: message || '',
     posInSet: index,
-    relativePath: '',
     rowIndex: rowIndex || 0,
     setSize: 1,
     source: source || '',
-    type: type || 'error',
+    type: getProblemType(type),
     uri
   };
 };
-const normalizeFileUri = uri => {
-  const normalizedUri = uri.startsWith('file://') ? uri.slice('file://'.length) : uri;
-  return windowsDrivePathRegex.test(normalizedUri) ? normalizedUri.slice(1) : normalizedUri;
-};
-const getRelativeParentUri = (uri, workspaceUri) => {
-  const normalizedUri = normalizeFileUri(uri);
-  const normalizedWorkspaceUri = normalizeFileUri(workspaceUri).replace(trailingSlashRegex, '');
-  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(leadingSlashesRegex, '');
-};
 const getFileName = uri => {
   const slashIndex = uri.lastIndexOf('/');
   return uri.slice(slashIndex + 1);
@@ -2257,16 +2258,15 @@ const toRelatedProblem = (relatedInformation, diagnostic, index, setSize) => {
     listItemType: Item,
     message: relatedInformation.message || '',
     posInSet: index,
-    relativePath: '',
     rowIndex: relatedInformation.rowIndex || 0,
     setSize,
     source: getFileName(relatedInformation.uri),
     targetUri: relatedInformation.uri,
-    type: diagnostic.type || 'error',
+    type: getProblemType(diagnostic.type),
     uri: diagnostic.uri
   };
 };
-const toProblems = (diagnostics, workspaceUri = '') => {
+const toProblems = diagnostics => {
   const problems = [];
   let problem = {
     code: '',
@@ -2277,11 +2277,10 @@ const toProblems = (diagnostics, workspaceUri = '') => {
     listItemType: 0,
     message: '',
     posInSet: 0,
-    relativePath: '',
     rowIndex: 0,
     setSize: 0,
     source: '',
-    type: '',
+    type: None,
     uri: ''
   };
   let relativeIndex = 0;
@@ -2300,11 +2299,10 @@ const toProblems = (diagnostics, workspaceUri = '') => {
         listItemType: Expanded,
         message: '',
         posInSet: relativeIndex,
-        relativePath: '',
         rowIndex: 0,
         setSize: 123,
         source: '',
-        type: '',
+        type: None,
         uri: diagnostic.uri
       };
       problems.push(problem);
@@ -2316,13 +2314,8 @@ const toProblems = (diagnostics, workspaceUri = '') => {
     }
   }
   for (const problem of problems) {
-    // TODO maybe rename property, this should be the relative path of the parent folder of the file
-    // @ts-ignore
     const displayUri = problem.targetUri || problem.uri;
-    problem.relativePath = getRelativeParentUri(displayUri, workspaceUri);
-    // @ts-ignore
     problem.fileName = getFileName(displayUri);
-    // problem.uri = problem.uri // TODO
   }
   return problems;
 };
@@ -2339,7 +2332,7 @@ const getUniqueDiagnostics = diagnostics => {
     return true;
   });
 };
-const getProblems = async (workspaceUri, activeUri) => {
+const getProblems = async activeUri => {
   if (!activeUri) {
     return {
       error: '',
@@ -2348,7 +2341,7 @@ const getProblems = async (workspaceUri, activeUri) => {
   }
   try {
     const diagnostics = getUniqueDiagnostics(await getProblems$1());
-    const problems = toProblems(diagnostics, workspaceUri);
+    const problems = toProblems(diagnostics);
     return {
       error: '',
       problems
@@ -2436,13 +2429,12 @@ const getFileIcons = async (problems, fileIconCache) => {
 
 const refreshProblems = async (state, activeUri) => {
   const {
-    fileIconCache,
-    workspaceUri
+    fileIconCache
   } = state;
   const {
     error,
     problems
-  } = await getProblems(workspaceUri, activeUri);
+  } = await getProblems(activeUri);
   const newFileIconCache = await getFileIcons(problems, fileIconCache);
   return {
     ...state,
@@ -2938,7 +2930,7 @@ const loadContent = async (state, savedState) => {
   const {
     error,
     problems
-  } = await getProblems(workspaceUri, activeUri);
+  } = await getProblems(activeUri);
   if (error) {
     return {
       ...state,
@@ -3136,7 +3128,7 @@ const getIconVirtualDom = (icon, type = Div) => {
   return {
     childCount: 0,
     className: mergeClassNames('MaskIcon', `MaskIcon${icon}`),
-    role: None$1,
+    role: None$2,
     type
   };
 };
@@ -3274,7 +3266,7 @@ const getFileIconVirtualDom = icon => {
     alt: '',
     childCount: 0,
     className: FileIcon,
-    role: None$1,
+    role: None$2,
     src: icon,
     type: Img
   };
@@ -3291,7 +3283,7 @@ const errorIconNode = {
   type: Div
 };
 const getProblemsIconVirtualDom = type => {
-  if (type === Warning) {
+  if (type === Warning$1) {
     return warningIconNode;
   }
   return errorIconNode;
@@ -3310,6 +3302,34 @@ const getProblemSourceDetail = (source, code) => {
   return message;
 };
 
+const leadingSlashesRegex = /^\/+/;
+const trailingSlashRegex = /\/$/;
+const schemeRootRegex = /^[a-z][a-z\d+.-]*:\/\/$/i;
+const windowsDrivePathRegex = /^\/[a-z]:\//i;
+const normalizeFileUri = uri => {
+  const normalizedUri = uri.startsWith('file://') ? uri.slice('file://'.length) : uri;
+  return windowsDrivePathRegex.test(normalizedUri) ? normalizedUri.slice(1) : normalizedUri;
+};
+const getRelativeParentUri = (uri, workspaceUri) => {
+  const normalizedUri = normalizeFileUri(uri);
+  const normalizedWorkspaceUri = normalizeFileUri(workspaceUri).replace(trailingSlashRegex, '');
+  const slashIndex = normalizedUri.lastIndexOf('/');
+  if (slashIndex === -1) {
+    return '';
+  }
+  const parentUri = normalizedUri.slice(0, slashIndex);
+  if (schemeRootRegex.test(parentUri)) {
+    return '';
+  }
+  if (parentUri === normalizedWorkspaceUri) {
+    return '';
+  }
+  if (normalizedWorkspaceUri && parentUri.startsWith(`${normalizedWorkspaceUri}/`)) {
+    return parentUri.slice(normalizedWorkspaceUri.length + 1);
+  }
+  return parentUri.replace(leadingSlashesRegex, '');
+};
+
 const labelNode = {
   childCount: 1,
   className: Label,
@@ -3330,7 +3350,7 @@ const problemAtNode = {
   className: ProblemAt,
   type: Span
 };
-const getProblemVirtualDom = problem => {
+const getProblemVirtualDom = (problem, workspaceUri = '') => {
   const {
     code,
     columnIndex,
@@ -3344,7 +3364,6 @@ const getProblemVirtualDom = problem => {
     message,
     messageMatchIndex,
     posInSet,
-    relativePath,
     rowIndex,
     setSize,
     source,
@@ -3373,7 +3392,7 @@ const getProblemVirtualDom = problem => {
       ...labelNode,
       'data-uri': uri,
       onClick: HandleFileNameClick
-    }, text(fileName), labelDetailNode, text(relativePath), ...getBadgeVirtualDom(ProblemBadge, problem.count)];
+    }, text(fileName), labelDetailNode, text(getRelativeParentUri(uri, workspaceUri)), ...getBadgeVirtualDom(ProblemBadge, problem.count)];
   }
   const lineColumn = atLineColumn(rowIndex + 1, columnIndex + 1);
   const label = {
@@ -3407,7 +3426,7 @@ const getProblemVirtualDom = problem => {
   return dom;
 };
 
-const getProblemsListVirtualDom = problems => {
+const getProblemsListVirtualDom = (problems, workspaceUri = '') => {
   const dom = [{
     ariaLabel: 'Problems Tree',
     // TODO use i18n string
@@ -3415,7 +3434,7 @@ const getProblemsListVirtualDom = problems => {
     className: ProblemsList,
     role: Tree,
     type: Div
-  }, ...problems.flatMap(getProblemVirtualDom)];
+  }, ...problems.flatMap(problem => getProblemVirtualDom(problem, workspaceUri))];
   return dom;
 };
 
@@ -3514,7 +3533,7 @@ const messageNode = {
   className: Message,
   type: Div
 };
-const getProblemsVirtualDom$1 = (viewMode, problems, filterValue, message, problemCount = problems.length) => {
+const getProblemsVirtualDom$1 = (viewMode, problems, filterValue, message, problemCount = problems.length, workspaceUri = '') => {
   if (problemCount === 0 && message) {
     return [messageNode, text(message)];
   }
@@ -3527,7 +3546,7 @@ const getProblemsVirtualDom$1 = (viewMode, problems, filterValue, message, probl
   if (viewMode === Table) {
     return getProblemsTableVirtualDom(problems);
   }
-  return getProblemsListVirtualDom(problems);
+  return getProblemsListVirtualDom(problems, workspaceUri);
 };
 
 const scrollBarNode = {
@@ -3549,7 +3568,7 @@ const getScrollBarVirtualDom = (scrollBarHeight, scrollBarActive) => {
 
 const Focusable = 0;
 
-const getProblemsVirtualDom = (activeUri, viewMode, problems, filterValue, inputSource, isSmall, message, scrollBarHeight = 0, scrollBarActive = false, problemCount = problems.length) => {
+const getProblemsVirtualDom = (activeUri, viewMode, problems, filterValue, inputSource, isSmall, message, scrollBarHeight = 0, scrollBarActive = false, problemCount = problems.length, workspaceUri = '') => {
   const baseDom = {
     childCount: isSmall ? 2 : 1,
     className: mergeClassNames(Viewlet, Problems),
@@ -3568,7 +3587,7 @@ const getProblemsVirtualDom = (activeUri, viewMode, problems, filterValue, input
     placeholder: filter(),
     value: filterValue
   }) : [];
-  const itemsDom = getProblemsVirtualDom$1(viewMode, problems, filterValue, message, problemCount);
+  const itemsDom = getProblemsVirtualDom$1(viewMode, problems, filterValue, message, problemCount, workspaceUri);
   const scrollBarDom = getScrollBarVirtualDom(scrollBarHeight, scrollBarActive);
   const contentClassName = viewMode === Table ? mergeClassNames(ProblemsContent, ProblemsContentTable) : ProblemsContent;
   const contentDom = {
@@ -3598,12 +3617,13 @@ const renderItems = (oldState, newState) => {
     showWarnings,
     smallWidthBreakPoint,
     viewMode,
-    width
+    width,
+    workspaceUri
   } = newState;
   const problemCount = getVisibleProblemCount(problems, collapsedUris, filterValue, viewMode, showErrors, showWarnings, showInfos);
   const visible = getVisibleProblems(problems, fileIconCache, collapsedUris, focusedIndex, filterValue, minLineY, maxLineY, viewMode, showErrors, showWarnings, showInfos);
   const isSmall = width <= smallWidthBreakPoint;
-  const dom = getProblemsVirtualDom(activeUri, viewMode, visible, filterValue, inputSource, isSmall, message, scrollBarHeight, scrollBarActive, problemCount);
+  const dom = getProblemsVirtualDom(activeUri, viewMode, visible, filterValue, inputSource, isSmall, message, scrollBarHeight, scrollBarActive, problemCount, workspaceUri);
   return ['Viewlet.setDom2', newState.uid, dom];
 };
 

package/package.json

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