@lvce-editor/problems-view 1.26.4 → 1.26.6

package/dist/problemsViewWorkerMain.js

@@ -244,6 +244,21 @@ const terminate = () => {
   globalThis.close();
 };
 
+const Item = 0;
+const Expanded = 1;
+const Collapsed = 2;
+
+const collapseAll$1 = state => {
+  const {
+    problems
+  } = state;
+  const collapsedUris = problems.filter(problem => problem.listItemType !== Item).map(problem => problem.uri);
+  return {
+    ...state,
+    collapsedUris: [...new Set(collapsedUris)]
+  };
+};
+
 const normalizeLine = line => {
   if (line.startsWith('Error: ')) {
     return line.slice('Error: '.length);
@@ -1596,9 +1611,11 @@ const VirtualDomElements = {
   Video
 };
 
+const ClientX = 'event.clientX';
 const ClientY = 'event.clientY';
 const DeltaMode = 'event.deltaMode';
 const DeltaY = 'event.deltaY';
+const TargetName = 'event.target.name';
 
 const Space = 9;
 const PageUp = 10;
@@ -1657,6 +1674,9 @@ const sendMessagePortToEditorWorker$1 = async (port, rpcId) => {
   const command = 'HandleMessagePort.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToEditorWorker', port, command, rpcId);
 };
+const getFileIcon = async options => {
+  return invoke('IconTheme.getFileIcon', options);
+};
 const writeClipBoardText$1 = async text => {
   await invoke('ClipBoard.writeText', /* text */text);
 };
@@ -1712,6 +1732,7 @@ const create = (id, uri, x, y, width, height, workspaceUri) => {
     activeUri: '',
     collapsedUris: [],
     deltaY: 0,
+    fileIconCache: {},
     filteredProblems: [],
     filterValue: '',
     finalDeltaY: 0,
@@ -1762,7 +1783,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.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.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;
@@ -1808,10 +1829,6 @@ const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
   return Math.min(Math.max(Math.round(size ** 2 / contentSize), minimumSliderSize), size);
 };
 
-const Item = 0;
-const Expanded = 1;
-const Collapsed = 2;
-
 const getListItemType = (listItemType, isCollapsed) => {
   if (listItemType === Item) {
     return Item;
@@ -2116,6 +2133,48 @@ 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;
@@ -2227,6 +2286,18 @@ const toProblems = (diagnostics, workspaceUri = '') => {
   return problems;
 };
 
+const getDiagnosticKey = diagnostic => JSON.stringify([diagnostic.uri, diagnostic.rowIndex, diagnostic.columnIndex, diagnostic.message, diagnostic.source, diagnostic.type, diagnostic.code]);
+const getUniqueDiagnostics = diagnostics => {
+  const keys = new Set();
+  return diagnostics.filter(diagnostic => {
+    const key = getDiagnosticKey(diagnostic);
+    if (keys.has(key)) {
+      return false;
+    }
+    keys.add(key);
+    return true;
+  });
+};
 const getProblems = async (workspaceUri, activeUri) => {
   if (!activeUri) {
     return {
@@ -2235,10 +2306,8 @@ const getProblems = async (workspaceUri, activeUri) => {
     };
   }
   try {
-    const diagnostics = await getProblems$1();
-    const activeDiagnostics = diagnostics.filter(diagnostic => diagnostic.uri === activeUri);
-    // @ts-ignore
-    const problems = toProblems(activeDiagnostics, workspaceUri);
+    const diagnostics = getUniqueDiagnostics(await getProblems$1());
+    const problems = toProblems(diagnostics, workspaceUri);
     return {
       error: '',
       problems
@@ -2253,15 +2322,18 @@ const getProblems = async (workspaceUri, activeUri) => {
 
 const refreshProblems = async (state, activeUri) => {
   const {
+    fileIconCache,
     workspaceUri
   } = state;
   const {
     error,
     problems
   } = await getProblems(workspaceUri, activeUri);
+  const newFileIconCache = await getFileIcons(problems, fileIconCache);
   return {
     ...state,
     activeUri,
+    fileIconCache: newFileIconCache,
     filteredProblems: problems,
     inputSource: Script,
     listItems: [],
@@ -2389,10 +2461,6 @@ const handleClickAt = (state, eventX, eventY) => {
   };
 };
 
-const handleClickButton = async (state, name) => {
-  return state;
-};
-
 const show2 = async (uid, menuId, x, y, args) => {
   await showContextMenu2(uid, menuId, x, y, args);
 };
@@ -2407,6 +2475,35 @@ const handleClickMoreFilters = async (state, eventX, eventY) => {
   return state;
 };
 
+const viewAsList = state => {
+  return {
+    ...state,
+    viewMode: List
+  };
+};
+
+const viewAsTable = state => {
+  return {
+    ...state,
+    viewMode: Table
+  };
+};
+
+const handleClickButton = async (state, name, eventX = 0, eventY = 0) => {
+  switch (name) {
+    case 'collapseAll':
+      return collapseAll$1(state);
+    case 'more filters':
+      return handleClickMoreFilters(state, eventX, eventY);
+    case 'viewAsList':
+      return viewAsList(state);
+    case 'viewAsTable':
+      return viewAsTable(state);
+    default:
+      return state;
+  }
+};
+
 const handleContextMenu = async (state, eventX, eventY) => {
   const {
     uid
@@ -2425,13 +2522,14 @@ const handleFilterInput = (state, value, inputSource = Script) => {
   };
 };
 
-const handleIconThemeChange = state => {
+const handleIconThemeChange = async state => {
   const {
     problems
   } = state;
+  const fileIconCache = await getFileIcons(problems, {});
   return {
     ...state,
-    problems: [...problems]
+    fileIconCache
   };
 };
 
@@ -2578,6 +2676,7 @@ const getSavedViewMode = savedState => {
 
 const loadContent = async (state, savedState) => {
   const {
+    fileIconCache: oldFileIconCache,
     workspaceUri
   } = state;
   const activeUri = await getActiveUri();
@@ -2595,6 +2694,7 @@ const loadContent = async (state, savedState) => {
     };
   }
   const message = getMessage(problems.length);
+  const fileIconCache = await getFileIcons(problems, oldFileIconCache);
   const viewMode = getSavedViewMode(savedState);
   const filterValue = getSavedFilterValue(savedState);
   const collapsedUris = getSavedCollapsedUris(savedState);
@@ -2602,6 +2702,7 @@ const loadContent = async (state, savedState) => {
     ...state,
     activeUri,
     collapsedUris,
+    fileIconCache,
     filteredProblems: problems,
     filterValue,
     inputSource: Script,
@@ -2640,18 +2741,14 @@ const getUniqueIndents = problems => {
   return uniqueIndents;
 };
 
-const getFileNameIcon = file => {
-  return '';
-};
-
-const getIcon = uri => {
+const getIcon = (uri, fileIconCache) => {
   if (!uri) {
     return '';
   }
-  return getFileNameIcon();
+  return fileIconCache[uri] || '';
 };
 
-const getVisibleProblems = (problems, collapsedUris, focusedIndex, filterValue, minLineY = 0, maxLineY = Infinity, viewMode = List) => {
+const getVisibleProblems = (problems, fileIconCache, collapsedUris, focusedIndex, filterValue, minLineY = 0, maxLineY = Infinity, viewMode = List) => {
   array(problems);
   array(collapsedUris);
   number(focusedIndex);
@@ -2666,7 +2763,7 @@ const getVisibleProblems = (problems, collapsedUris, focusedIndex, filterValue,
     visibleItems.push({
       ...problem,
       filterValueLength,
-      icon: getIcon(problem.uri),
+      icon: getIcon(problem.uri, fileIconCache),
       isActive: i === focusedIndex,
       isEven: i % 2 === 0
     });
@@ -2678,6 +2775,7 @@ const renderCss = (oldState, newState) => {
   const {
     collapsedUris,
     deltaY,
+    fileIconCache,
     filterValue,
     finalDeltaY,
     focusedIndex,
@@ -2692,7 +2790,7 @@ const renderCss = (oldState, newState) => {
     viewMode,
     width
   } = newState;
-  const visibleProblems = getVisibleProblems(problems, collapsedUris, focusedIndex, filterValue, minLineY, maxLineY, viewMode);
+  const visibleProblems = getVisibleProblems(problems, fileIconCache, collapsedUris, focusedIndex, filterValue, minLineY, maxLineY, viewMode);
   const uniqueIndents = getUniqueIndents(visibleProblems);
   const listHeight = getListHeight(height, width, smallWidthBreakPoint, viewMode);
   const scrollBarTop = getScrollBarTop(listHeight, finalDeltaY, deltaY, scrollBarHeight);
@@ -2738,8 +2836,15 @@ const renderCss = (oldState, newState) => {
 
 const Filter$2 = 'filter';
 
+const getFilterInputName = (inputSource, filterValue) => {
+  if (inputSource === Script && filterValue) {
+    return `${Filter$2}-${encodeURIComponent(filterValue)}`;
+  }
+  return Filter$2;
+};
+
 const renderFilterValue = (oldState, newState) => {
-  return ['Viewlet.setValueByName', Filter$2, newState.filterValue];
+  return ['Viewlet.setValueByName', getFilterInputName(newState.inputSource, newState.filterValue), newState.filterValue];
 };
 
 const Button = 1;
@@ -2791,6 +2896,10 @@ const HandleWheel = 7;
 const HandleScrollBarMove = 8;
 const HandleScrollBarPointerCaptureLost = 9;
 const HandleScrollBarPointerDown = 10;
+const HandleCollapseAll = 11;
+const HandleViewAsList = 12;
+const HandleViewAsTable = 13;
+const HandleClickButton = 14;
 
 const getIconVirtualDom = (icon, type = Div) => {
   return {
@@ -2801,6 +2910,20 @@ const getIconVirtualDom = (icon, type = Div) => {
   };
 };
 
+const getOnClick = command => {
+  switch (command) {
+    case 'collapseAll':
+      return HandleCollapseAll;
+    case 'more filters':
+      return HandleClickMoreFilters;
+    case 'viewAsList':
+      return HandleViewAsList;
+    case 'viewAsTable':
+      return HandleViewAsTable;
+    default:
+      return HandleClickButton;
+  }
+};
 const getActionButtonVirtualDom = action => {
   const {
     command,
@@ -2810,7 +2933,8 @@ const getActionButtonVirtualDom = action => {
   return [{
     childCount: 1,
     className: IconButton,
-    'data-command': command,
+    name: command,
+    onClick: getOnClick(command),
     title: id,
     type: Button$1
   }, getIconVirtualDom(icon)];
@@ -2865,10 +2989,11 @@ const getProblemsFilterVirtualDom = action => {
     childCount: getChildCount(action.badgeText),
     className: Filter$1,
     type: Div
-  }, getInputBoxVirtualDom(Filter$2, action.command, action.placeholder || '', action.value), ...getFilterBadgeDom(action.badgeText), ...getActionButtonVirtualDom({
+  }, getInputBoxVirtualDom(action.name || Filter$2, action.command, action.placeholder || '', action.value), ...getFilterBadgeDom(action.badgeText), ...getActionButtonVirtualDom({
     command: 'more filters',
     icon: Filter,
-    id: 'more filters'})];
+    id: 'more filters' // TODO use i18n string
+  })];
 };
 
 const messageNode$2 = {
@@ -3189,7 +3314,7 @@ const getScrollBarVirtualDom = (scrollBarHeight, scrollBarActive) => {
 
 const Focusable = 0;
 
-const getProblemsVirtualDom = (activeUri, viewMode, problems, filterValue, 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) => {
   const baseDom = {
     childCount: isSmall ? 2 : 1,
     className: mergeClassNames(Viewlet, Problems),
@@ -3204,6 +3329,7 @@ const getProblemsVirtualDom = (activeUri, viewMode, problems, filterValue, isSma
   const filterDom = isSmall ? getProblemsFilterVirtualDom({
     badgeText: '',
     command: HandleFilterInput,
+    name: getFilterInputName(inputSource, filterValue),
     placeholder: filter(),
     value: filterValue
   }) : [];
@@ -3222,8 +3348,10 @@ const renderItems = (oldState, newState) => {
   const {
     activeUri,
     collapsedUris,
+    fileIconCache,
     filterValue,
     focusedIndex,
+    inputSource,
     maxLineY,
     message,
     minLineY,
@@ -3235,9 +3363,9 @@ const renderItems = (oldState, newState) => {
     width
   } = newState;
   const problemCount = getVisibleProblemCount(problems, collapsedUris, filterValue, viewMode);
-  const visible = getVisibleProblems(problems, collapsedUris, focusedIndex, filterValue, minLineY, maxLineY, viewMode);
+  const visible = getVisibleProblems(problems, fileIconCache, collapsedUris, focusedIndex, filterValue, minLineY, maxLineY, viewMode);
   const isSmall = width <= smallWidthBreakPoint;
-  const dom = getProblemsVirtualDom(activeUri, viewMode, visible, filterValue, isSmall, message, scrollBarHeight, scrollBarActive, problemCount);
+  const dom = getProblemsVirtualDom(activeUri, viewMode, visible, filterValue, inputSource, isSmall, message, scrollBarHeight, scrollBarActive, problemCount);
   return ['Viewlet.setDom2', dom];
 };
 
@@ -3296,6 +3424,7 @@ const getActionsVirtualDom = actions => {
 const getActions = state => {
   const {
     collapsedUris,
+    fileIconCache,
     filterValue,
     focusedIndex,
     inputSource,
@@ -3304,7 +3433,7 @@ const getActions = state => {
     viewMode,
     width
   } = state;
-  const visibleCount = getVisibleProblems(problems, collapsedUris, focusedIndex, filterValue, 0, Infinity, viewMode).length;
+  const visibleCount = getVisibleProblems(problems, fileIconCache, collapsedUris, focusedIndex, filterValue, 0, Infinity, viewMode).length;
   const problemsCount = problems.length;
   const isSmall = width <= smallWidthBreakPoint;
   const actions = [];
@@ -3313,6 +3442,7 @@ const getActions = state => {
       badgeText: visibleCount === problemsCount ? '' : showingOf(visibleCount, problemsCount),
       command: HandleFilterInput,
       id: 'Filter',
+      name: getFilterInputName(inputSource, filterValue),
       placeholder: filter(),
       type: ProblemsFilter,
       value: inputSource === Script ? filterValue : ''
@@ -3370,7 +3500,19 @@ const renderEventListeners = () => {
     params: ['handleClickAt', 'event.clientX', 'event.clientY']
   }, {
     name: HandleClickMoreFilters,
-    params: ['handleClickMoreFilters']
+    params: ['handleClickMoreFilters', ClientX, ClientY]
+  }, {
+    name: HandleClickButton,
+    params: ['handleClickButton', TargetName, ClientX, ClientY]
+  }, {
+    name: HandleCollapseAll,
+    params: ['collapseAll']
+  }, {
+    name: HandleViewAsList,
+    params: ['viewAsList']
+  }, {
+    name: HandleViewAsTable,
+    params: ['viewAsTable']
   }, {
     name: HandleWheel,
     params: ['handleWheel', DeltaMode, DeltaY],
@@ -3409,21 +3551,8 @@ const saveState = state => {
   };
 };
 
-const viewAsList = state => {
-  return {
-    ...state,
-    viewMode: List
-  };
-};
-
-const viewAsTable = state => {
-  return {
-    ...state,
-    viewMode: Table
-  };
-};
-
 const commandMap = {
+  'Problems.collapseAll': wrapCommand(collapseAll$1),
   'Problems.copyMessage': wrapCommand(copyMessage),
   'Problems.create': create,
   'Problems.diff2': diff2,

package/package.json

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