@lvce-editor/problems-view 1.9.0 → 1.11.0

package/dist/problemsViewWorkerMain.js

@@ -1169,10 +1169,9 @@ const None$1 = 0;
 const Table = 1;
 const List = 2;
 
-const create = (id, uri, x, y, width, height, args, parentUid) => {
+const create = (id, uri, x, y, width, height, workspaceUri) => {
   const state = {
     uid: id,
-    parentUid,
     problems: [],
     focusedIndex: -2,
     message: '',
@@ -1189,7 +1188,8 @@ const create = (id, uri, x, y, width, height, args, parentUid) => {
     listItems: [],
     collapsedUris: [],
     smallWidthBreakPoint: 650,
-    filteredProblems: []
+    filteredProblems: [],
+    workspaceUri
   };
   set$1(id, state, state);
 };
@@ -1199,7 +1199,7 @@ const isEqual$1 = (oldState, newState) => {
 };
 
 const isEqual = (oldState, newState) => {
-  return oldState.problems === newState.problems && oldState.filterValue === newState.filterValue && oldState.message === newState.message;
+  return oldState.problems === newState.problems && oldState.filterValue === newState.filterValue && oldState.message === newState.message && oldState.viewMode === newState.viewMode;
 };
 
 const RenderItems = 1;
@@ -1453,6 +1453,10 @@ const handleClickAt = (state, eventX, eventY) => {
   };
 };
 
+const handleClickButton = async (state, name) => {
+  return state;
+};
+
 const handleContextMenu = async (state, eventX, eventY) => {
   // @ts-ignore
   // await ContextMenu.show(eventX, eventY, MenuEntryId.Problems)
@@ -1498,14 +1502,107 @@ const initialize = async () => {
   set(rpc);
 };
 
-const getProblems = async state => {
+const toProblem = (diagnostic, index) => {
+  const {
+    message,
+    rowIndex,
+    columnIndex,
+    source,
+    code,
+    type,
+    uri
+  } = diagnostic;
+  return {
+    message: message || '',
+    rowIndex: rowIndex || 0,
+    columnIndex: columnIndex || 0,
+    uri,
+    relativePath: '',
+    count: 0,
+    source: source || '',
+    code: code || '',
+    type: type || 'error',
+    listItemType: Item,
+    posInSet: index,
+    setSize: 1,
+    level: 2,
+    fileName: ''
+  };
+};
+const getRelativeParentUri = (uri, workspaceUri) => {
+  const slashIndex = uri.lastIndexOf('/');
+  return uri.slice(0, slashIndex).slice(workspaceUri.length);
+};
+const getFileName = uri => {
+  const slashIndex = uri.lastIndexOf('/');
+  return uri.slice(slashIndex + 1);
+};
+const toProblems = (diagnostics, workspaceUri = '') => {
+  const problems = [];
+  let problem = {
+    message: '',
+    rowIndex: 0,
+    columnIndex: 0,
+    uri: '',
+    relativePath: '',
+    count: 0,
+    source: '',
+    code: '',
+    level: 0,
+    listItemType: 0,
+    posInSet: 0,
+    setSize: 0,
+    type: '',
+    fileName: ''
+  };
+  let relativeIndex = 0;
+  for (const diagnostic of diagnostics) {
+    if (diagnostic.uri === problem.uri) {
+      relativeIndex++;
+      problem.count++;
+    } else {
+      relativeIndex = 1;
+      problem = {
+        message: '',
+        rowIndex: 0,
+        columnIndex: 0,
+        uri: diagnostic.uri,
+        relativePath: '',
+        count: 1,
+        source: '',
+        type: '',
+        listItemType: Expanded,
+        posInSet: relativeIndex,
+        setSize: 123,
+        level: 1,
+        code: '',
+        fileName: ''
+      };
+      problems.push(problem);
+    }
+    problems.push(toProblem(diagnostic, relativeIndex));
+  }
+  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);
+    // @ts-ignore
+    problem.fileName = getFileName(problem.uri);
+    // problem.uri = problem.uri // TODO
+  }
+  return problems;
+};
+
+// TODO send event listener to editor, asking to send problem updates to this worker
+
+const getProblems = async workspaceUri => {
   try {
-    // TODO send event listener to editor, asking to send problem updates to this worker
     // @ts-ignore
-    await invoke('Editor.getProblems');
-    // TODO ask editor worker for problems
+    const diagnostics = await invoke('Editor.getProblems');
+    // @ts-ignore
+    const problems = toProblems(diagnostics, workspaceUri);
     return {
-      problems: [],
+      problems,
       error: ''
     };
   } catch (error) {
@@ -1620,7 +1717,7 @@ const loadContent = async (state, savedState) => {
   const {
     problems,
     error
-  } = await getProblems();
+  } = await getProblems(state.workspaceUri);
   if (error) {
     return {
       ...state,
@@ -1849,23 +1946,23 @@ const getTreeItemIndent = depth => {
 
 const getProblemVirtualDom = problem => {
   const {
-    message,
-    rowIndex,
+    code,
     columnIndex,
-    isActive,
-    uri,
+    filterValueLength,
     icon,
-    source,
-    relativePath,
+    isActive,
+    isCollapsed,
+    level,
+    listItemType,
+    message,
     messageMatchIndex,
-    filterValueLength,
-    code,
-    type,
     posInSet,
+    relativePath,
+    rowIndex,
     setSize,
-    level,
-    listItemType,
-    isCollapsed
+    source,
+    type,
+    fileName
   } = problem;
   let className = Problem;
   if (isActive) {
@@ -1883,7 +1980,7 @@ const getProblemVirtualDom = problem => {
       ariaExpanded: !isCollapsed,
       ariaSelected: isActive,
       role: AriaRoles.TreeItem
-    }, listItemType === Collapsed ? getChevronRightVirtualDom() : getChevronDownVirtualDom(), getFileIconVirtualDom(icon), text(uri), {
+    }, listItemType === Collapsed ? getChevronRightVirtualDom() : getChevronDownVirtualDom(), getFileIconVirtualDom(icon), text(fileName), {
       type: VirtualDomElements.Div,
       className: LabelDetail,
       childCount: 1
@@ -2053,7 +2150,7 @@ const getProblemsTableVirtualDom = problems => {
 };
 
 const getProblemsVirtualDom$1 = (viewMode, problems, filterValue, message) => {
-  if (message) {
+  if (problems.length === 0 && message) {
     return [{
       type: VirtualDomElements.Div,
       className: Message,
@@ -2347,18 +2444,19 @@ const viewAsTable = state => {
 };
 
 const commandMap = {
-  'Problems.copyMessage': copyMessage,
+  'Problems.copyMessage': wrapCommand(copyMessage),
   'Problems.create': create,
   'Problems.diff2': diff2,
-  'Problems.focusIndex': focusIndex,
+  'Problems.focusIndex': wrapCommand(focusIndex),
   'Problems.getCommandIds': getCommandIds,
   'Problems.getKeyBindings': getKeyBindings,
   'Problems.handleArrowLeft': wrapCommand(handleArrowLeft),
   'Problems.handleArrowRight': wrapCommand(handleArrowRight),
   'Problems.handleClickAt': wrapCommand(handleClickAt),
-  'Problems.handleContextMenu': handleContextMenu,
+  'Problems.handleContextMenu': wrapCommand(handleContextMenu),
+  'Problems.handleClickButton': wrapCommand(handleClickButton),
   'Problems.handleFilterInput': wrapCommand(handleFilterInput),
-  'Problems.handleIconThemeChange': handleIconThemeChange,
+  'Problems.handleIconThemeChange': wrapCommand(handleIconThemeChange),
   'Problems.initialize': initialize,
   'Problems.loadContent': wrapCommand(loadContent),
   'Problems.render2': render2,
@@ -2367,8 +2465,8 @@ const commandMap = {
   'Problems.resize': resize,
   'Problems.saveState': saveState,
   'Problems.terminate': terminate,
-  'Problems.viewAsList': viewAsList,
-  'Problems.viewAsTable': viewAsTable
+  'Problems.viewAsList': wrapCommand(viewAsList),
+  'Problems.viewAsTable': wrapCommand(viewAsTable)
 };
 
 const listen = async () => {

package/package.json

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