@lvce-editor/problems-view 1.29.0 → 1.30.0

package/dist/problemsViewWorkerMain.js

@@ -1783,7 +1783,7 @@ const create = (id, uri, x, y, width, height, workspaceUri) => {
 };
 
 const isEqual$2 = (oldState, newState) => {
-  return oldState.collapsedUris === newState.collapsedUris && oldState.deltaY === newState.deltaY && oldState.filterValue === newState.filterValue && oldState.finalDeltaY === newState.finalDeltaY && oldState.height === newState.height && oldState.itemHeight === newState.itemHeight && oldState.maxLineY === newState.maxLineY && oldState.minLineY === newState.minLineY && oldState.problems === newState.problems && oldState.scrollBarHeight === newState.scrollBarHeight && oldState.viewMode === newState.viewMode && oldState.width === newState.width;
+  return oldState.collapsedUris === newState.collapsedUris && oldState.deltaY === newState.deltaY && oldState.filterValue === newState.filterValue && oldState.finalDeltaY === newState.finalDeltaY && oldState.height === newState.height && oldState.itemHeight === newState.itemHeight && oldState.maxLineY === newState.maxLineY && oldState.minLineY === newState.minLineY && oldState.problems === newState.problems && oldState.showErrors === newState.showErrors && oldState.showInfos === newState.showInfos && oldState.showWarnings === newState.showWarnings && oldState.scrollBarHeight === newState.scrollBarHeight && oldState.viewMode === newState.viewMode && oldState.width === newState.width;
 };
 
 const isEqual$1 = (oldState, newState) => {
@@ -1802,7 +1802,7 @@ const haveSameCollapsedUris = (oldState, newState) => {
   return oldCollapsedUris.length === newCollapsedUris.length && oldCollapsedUris.every((uri, index) => uri === newCollapsedUris[index]);
 };
 const isEqual = (oldState, newState) => {
-  return oldState.activeUri === newState.activeUri && haveSameCollapsedUris(oldState, newState) && oldState.fileIconCache === newState.fileIconCache && oldState.focusedIndex === newState.focusedIndex && oldState.height === newState.height && oldState.maxLineY === newState.maxLineY && oldState.minLineY === newState.minLineY && oldState.problems === newState.problems && oldState.filterValue === newState.filterValue && oldState.message === newState.message && oldState.scrollBarActive === newState.scrollBarActive && oldState.scrollBarHeight === newState.scrollBarHeight && oldState.width === newState.width && oldState.viewMode === newState.viewMode;
+  return oldState.activeUri === newState.activeUri && haveSameCollapsedUris(oldState, newState) && oldState.fileIconCache === newState.fileIconCache && oldState.focusedIndex === newState.focusedIndex && oldState.height === newState.height && oldState.maxLineY === newState.maxLineY && oldState.minLineY === newState.minLineY && oldState.problems === newState.problems && oldState.showErrors === newState.showErrors && oldState.showInfos === newState.showInfos && oldState.showWarnings === newState.showWarnings && oldState.filterValue === newState.filterValue && oldState.message === newState.message && oldState.scrollBarActive === newState.scrollBarActive && oldState.scrollBarHeight === newState.scrollBarHeight && oldState.width === newState.width && oldState.viewMode === newState.viewMode;
 };
 
 const RenderItems = 1;
@@ -1848,6 +1848,9 @@ 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;
@@ -1865,11 +1868,30 @@ const matchesFilterValue = (string, filterValueLower) => {
   return 0;
 };
 
-const filterProblems = (problems, collapsedUris, filterValue) => {
+const matchesSeverity = (problem, showErrors, showWarnings, showInfos) => {
+  switch (problem.type) {
+    case Error$1:
+      return showErrors;
+    case Warning:
+      return showWarnings;
+    default:
+      return showInfos;
+  }
+};
+const filterProblems = (problems, collapsedUris, filterValue, showErrors = true, showWarnings = true, showInfos = true) => {
   const filterValueLower = filterValue.toLowerCase();
   const collapsedUriSet = new Set(collapsedUris);
+  const hasSeverityFilter = !showErrors || !showWarnings || !showInfos;
+  const visibleUris = new Set(problems.filter(problem => problem.listItemType === Item && matchesSeverity(problem, showErrors, showWarnings, showInfos)).map(problem => problem.uri));
   const filtered = [];
   for (const problem of problems) {
+    if (problem.listItemType === Item) {
+      if (!matchesSeverity(problem, showErrors, showWarnings, showInfos)) {
+        continue;
+      }
+    } else if (hasSeverityFilter && !visibleUris.has(problem.uri)) {
+      continue;
+    }
     const uriMatchIndex = matchesFilterValue(problem.uri, filterValueLower);
     const sourceMatchIndex = matchesFilterValue(problem.source, filterValueLower);
     const messageMatchIndex = matchesFilterValue(problem.message, filterValueLower);
@@ -1892,8 +1914,8 @@ const filterProblems = (problems, collapsedUris, filterValue) => {
   return filtered;
 };
 
-const getVisibleProblemCount = (problems, collapsedUris, filterValue, viewMode) => {
-  const filtered = filterProblems(problems, collapsedUris, filterValue);
+const getVisibleProblemCount = (problems, collapsedUris, filterValue, viewMode, showErrors = true, showWarnings = true, showInfos = true) => {
+  const filtered = filterProblems(problems, collapsedUris, filterValue, showErrors, showWarnings, showInfos);
   if (viewMode !== Table) {
     return filtered.length;
   }
@@ -1915,11 +1937,14 @@ const updateVirtualList = (state, newDeltaY) => {
     itemHeight,
     minimumSliderSize,
     problems,
+    showErrors,
+    showInfos,
+    showWarnings,
     smallWidthBreakPoint,
     viewMode,
     width
   } = state;
-  const itemCount = getVisibleProblemCount(problems, collapsedUris, filterValue, viewMode);
+  const itemCount = getVisibleProblemCount(problems, collapsedUris, filterValue, viewMode, showErrors, showWarnings, showInfos);
   const listHeight = getListHeight(height, width, smallWidthBreakPoint, viewMode);
   const contentHeight = itemCount * itemHeight;
   const finalDeltaY = Math.max(contentHeight - listHeight, 0);
@@ -2119,17 +2144,17 @@ const getMenuEntriesFilter = state => {
     showWarnings: showWarnings$1
   } = state;
   return [{
-    command: '-1',
+    command: 'Problems.toggleShowErrors',
     flags: showErrors$1 ? Checked : Unchecked,
     id: 'show-errors',
     label: showErrors()
   }, {
-    command: '-1',
+    command: 'Problems.toggleShowWarnings',
     flags: showWarnings$1 ? Checked : Unchecked,
     id: 'show-warnings',
     label: showWarnings()
   }, {
-    command: '-1',
+    command: 'Problems.toggleShowInfos',
     flags: showInfos$1 ? Checked : Unchecked,
     id: 'show-infos',
     label: showInfos()
@@ -2152,51 +2177,12 @@ const getMenuIds = () => {
   return [ProblemsFilter$1];
 };
 
-const getMissingRequests = (problems, fileIconCache) => {
-  const missingRequests = [];
-  const pendingUris = new Set();
-  for (const problem of problems) {
-    const {
-      fileName,
-      uri
-    } = problem;
-    if (!uri || uri in fileIconCache || pendingUris.has(uri)) {
-      continue;
-    }
-    pendingUris.add(uri);
-    missingRequests.push({
-      name: fileName,
-      uri
-    });
-  }
-  return missingRequests;
-};
-const requestFileIcon = name => {
-  if (!name) {
-    return Promise.resolve('');
-  }
-  return getFileIcon({
-    name
-  });
-};
-const getFileIcons = async (problems, fileIconCache) => {
-  const missingRequests = getMissingRequests(problems, fileIconCache);
-  if (missingRequests.length === 0) {
-    return fileIconCache;
-  }
-  const icons = await Promise.all(missingRequests.map(request => requestFileIcon(request.name)));
-  const newFileIconCache = {
-    ...fileIconCache
-  };
-  for (let i = 0; i < missingRequests.length; i++) {
-    newFileIconCache[missingRequests[i].uri] = icons[i];
-  }
-  return newFileIconCache;
-};
-
 const {
   getProblems: getProblems$1,
   getUri} = EditorWorker;
+const getDiagnostics = editorId => {
+  return invoke$1('Editor.getDiagnostics', editorId);
+};
 
 const leadingSlashesRegex = /^\/+/;
 const trailingSlashRegex = /\/$/;
@@ -2339,6 +2325,72 @@ const getProblems = async (workspaceUri, activeUri) => {
   }
 };
 
+const countByType = (diagnostics, type) => {
+  return diagnostics.filter(diagnostic => diagnostic.type === type).length;
+};
+const getProblemsSummary = async () => {
+  const editorId = await getActiveEditorId();
+  if (editorId === -1) {
+    return {
+      errorCount: 0,
+      hasEditor: false,
+      problemCount: 0,
+      warningCount: 0
+    };
+  }
+  const [allDiagnostics, activeDiagnostics] = await Promise.all([getProblems$1(), getDiagnostics(editorId)]);
+  const uniqueDiagnostics = getUniqueDiagnostics(allDiagnostics);
+  const uniqueActiveDiagnostics = getUniqueDiagnostics(activeDiagnostics);
+  return {
+    errorCount: countByType(uniqueActiveDiagnostics, Error$1),
+    hasEditor: true,
+    problemCount: uniqueDiagnostics.length,
+    warningCount: countByType(uniqueActiveDiagnostics, Warning)
+  };
+};
+
+const getMissingRequests = (problems, fileIconCache) => {
+  const missingRequests = [];
+  const pendingUris = new Set();
+  for (const problem of problems) {
+    const {
+      fileName,
+      uri
+    } = problem;
+    if (!uri || uri in fileIconCache || pendingUris.has(uri)) {
+      continue;
+    }
+    pendingUris.add(uri);
+    missingRequests.push({
+      name: fileName,
+      uri
+    });
+  }
+  return missingRequests;
+};
+const requestFileIcon = name => {
+  if (!name) {
+    return Promise.resolve('');
+  }
+  return getFileIcon({
+    name
+  });
+};
+const getFileIcons = async (problems, fileIconCache) => {
+  const missingRequests = getMissingRequests(problems, fileIconCache);
+  if (missingRequests.length === 0) {
+    return fileIconCache;
+  }
+  const icons = await Promise.all(missingRequests.map(request => requestFileIcon(request.name)));
+  const newFileIconCache = {
+    ...fileIconCache
+  };
+  for (let i = 0; i < missingRequests.length; i++) {
+    newFileIconCache[missingRequests[i].uri] = icons[i];
+  }
+  return newFileIconCache;
+};
+
 const refreshProblems = async (state, activeUri) => {
   const {
     fileIconCache,
@@ -2522,14 +2574,14 @@ const getIcon = (uri, fileIconCache) => {
   return fileIconCache[uri] || '';
 };
 
-const getVisibleProblems = (problems, fileIconCache, collapsedUris, focusedIndex, filterValue, minLineY = 0, maxLineY = Infinity, viewMode = List) => {
+const getVisibleProblems = (problems, fileIconCache, collapsedUris, focusedIndex, filterValue, minLineY = 0, maxLineY = Infinity, viewMode = List, showErrors = true, showWarnings = true, showInfos = true) => {
   array(problems);
   array(collapsedUris);
   number(focusedIndex);
   string(filterValue);
   const visibleItems = [];
   const filterValueLength = filterValue.length;
-  const filtered = filterProblems(problems, collapsedUris, filterValue);
+  const filtered = filterProblems(problems, collapsedUris, filterValue, showErrors, showWarnings, showInfos);
   const displayProblems = viewMode === Table ? filtered.filter(problem => problem.message) : filtered;
   const finalLineY = Math.min(maxLineY, displayProblems.length);
   for (let i = minLineY; i < finalLineY; i++) {
@@ -2558,6 +2610,9 @@ const handleClickAt = (state, eventX, eventY) => {
     filterValue,
     itemHeight,
     problems,
+    showErrors,
+    showInfos,
+    showWarnings,
     smallWidthBreakPoint,
     viewMode,
     width,
@@ -2567,7 +2622,7 @@ const handleClickAt = (state, eventX, eventY) => {
 
   // TODO use functional focus rendering
   // Focus.setFocus(FocusKey.Problems)
-  const problemCount = getVisibleProblemCount(problems, collapsedUris, filterValue, viewMode);
+  const problemCount = getVisibleProblemCount(problems, collapsedUris, filterValue, viewMode, showErrors, showWarnings, showInfos);
   if (problemCount === 0) {
     return focusIndex(state, -1);
   }
@@ -2595,9 +2650,12 @@ const handleProblemClick = async (state, eventX, eventY) => {
     fileIconCache,
     filterValue,
     problems,
+    showErrors,
+    showInfos,
+    showWarnings,
     viewMode
   } = newState;
-  const visibleProblems = getVisibleProblems(problems, fileIconCache, collapsedUris, focusedIndex, filterValue, focusedIndex, focusedIndex + 1, viewMode);
+  const visibleProblems = getVisibleProblems(problems, fileIconCache, collapsedUris, focusedIndex, filterValue, focusedIndex, focusedIndex + 1, viewMode, showErrors, showWarnings, showInfos);
   const problem = visibleProblems[0];
   if (!problem || problem.listItemType !== Item) {
     return newState;
@@ -2840,12 +2898,15 @@ const renderCss = (oldState, newState) => {
     minLineY,
     problems,
     scrollBarHeight,
+    showErrors,
+    showInfos,
+    showWarnings,
     smallWidthBreakPoint,
     uid,
     viewMode,
     width
   } = newState;
-  const visibleProblems = getVisibleProblems(problems, fileIconCache, collapsedUris, focusedIndex, filterValue, minLineY, maxLineY, viewMode);
+  const visibleProblems = getVisibleProblems(problems, fileIconCache, collapsedUris, focusedIndex, filterValue, minLineY, maxLineY, viewMode, showErrors, showWarnings, showInfos);
   const uniqueIndents = getUniqueIndents(visibleProblems);
   const listHeight = getListHeight(height, width, smallWidthBreakPoint, viewMode);
   const scrollBarTop = getScrollBarTop(listHeight, finalDeltaY, deltaY, scrollBarHeight);
@@ -3105,8 +3166,6 @@ const getFileIconVirtualDom = icon => {
   };
 };
 
-const Warning = 'warning';
-
 const warningIconNode = {
   childCount: 0,
   className: mergeClassNames(ProblemsIcon, ProblemsWarningIcon),
@@ -3419,12 +3478,15 @@ const renderItems = (oldState, newState) => {
     problems,
     scrollBarActive,
     scrollBarHeight,
+    showErrors,
+    showInfos,
+    showWarnings,
     smallWidthBreakPoint,
     viewMode,
     width
   } = newState;
-  const problemCount = getVisibleProblemCount(problems, collapsedUris, filterValue, viewMode);
-  const visible = getVisibleProblems(problems, fileIconCache, collapsedUris, focusedIndex, filterValue, minLineY, maxLineY, viewMode);
+  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);
   return ['Viewlet.setDom2', dom];
@@ -3490,11 +3552,14 @@ const getActions = state => {
     focusedIndex,
     inputSource,
     problems,
+    showErrors,
+    showInfos,
+    showWarnings,
     smallWidthBreakPoint,
     viewMode,
     width
   } = state;
-  const visibleCount = getVisibleProblems(problems, fileIconCache, collapsedUris, focusedIndex, filterValue, 0, Infinity, viewMode).length;
+  const visibleCount = getVisibleProblems(problems, fileIconCache, collapsedUris, focusedIndex, filterValue, 0, Infinity, viewMode, showErrors, showWarnings, showInfos).length;
   const problemsCount = problems.length;
   const isSmall = width <= smallWidthBreakPoint;
   const actions = [];
@@ -3627,6 +3692,36 @@ const toggleFileGroup = (state, uri) => {
   };
 };
 
+const toggleShowErrors = state => {
+  const {
+    showErrors
+  } = state;
+  return {
+    ...state,
+    showErrors: !showErrors
+  };
+};
+
+const toggleShowInfos = state => {
+  const {
+    showInfos
+  } = state;
+  return {
+    ...state,
+    showInfos: !showInfos
+  };
+};
+
+const toggleShowWarnings = state => {
+  const {
+    showWarnings
+  } = state;
+  return {
+    ...state,
+    showWarnings: !showWarnings
+  };
+};
+
 const commandMap = {
   'Problems.collapseAll': wrapCommand(collapseAll$1),
   'Problems.copyMessage': wrapCommand(copyMessage),
@@ -3637,6 +3732,7 @@ const commandMap = {
   'Problems.getKeyBindings': getKeyBindings,
   'Problems.getMenuEntries2': wrapGetter(getMenuEntries2),
   'Problems.getMenuIds': getMenuIds,
+  'Problems.getProblemsSummary': getProblemsSummary,
   'Problems.handleActiveEditorChange': wrapCommand(handleActiveEditorChange),
   'Problems.handleArrowLeft': wrapCommand(handleArrowLeft),
   'Problems.handleArrowRight': wrapCommand(handleArrowRight),
@@ -3661,6 +3757,9 @@ const commandMap = {
   'Problems.saveState': wrapGetter(saveState),
   'Problems.terminate': terminate,
   'Problems.toggleFileGroup': wrapCommand(toggleFileGroup),
+  'Problems.toggleShowErrors': wrapCommand(toggleShowErrors),
+  'Problems.toggleShowInfos': wrapCommand(toggleShowInfos),
+  'Problems.toggleShowWarnings': wrapCommand(toggleShowWarnings),
   'Problems.viewAsList': wrapCommand(viewAsList),
   'Problems.viewAsTable': wrapCommand(viewAsTable)
 };

package/package.json

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