@lvce-editor/problems-view 1.26.5 → 1.26.7

package/dist/problemsViewWorkerMain.js

@@ -1674,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);
 };
@@ -1729,6 +1732,7 @@ const create = (id, uri, x, y, width, height, workspaceUri) => {
     activeUri: '',
     collapsedUris: [],
     deltaY: 0,
+    fileIconCache: {},
     filteredProblems: [],
     filterValue: '',
     finalDeltaY: 0,
@@ -1779,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;
@@ -2129,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;
@@ -2276,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: [],
@@ -2473,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
   };
 };
 
@@ -2626,6 +2676,7 @@ const getSavedViewMode = savedState => {
 
 const loadContent = async (state, savedState) => {
   const {
+    fileIconCache: oldFileIconCache,
     workspaceUri
   } = state;
   const activeUri = await getActiveUri();
@@ -2643,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);
@@ -2650,6 +2702,7 @@ const loadContent = async (state, savedState) => {
     ...state,
     activeUri,
     collapsedUris,
+    fileIconCache,
     filteredProblems: problems,
     filterValue,
     inputSource: Script,
@@ -2688,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);
@@ -2714,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
     });
@@ -2726,6 +2775,7 @@ const renderCss = (oldState, newState) => {
   const {
     collapsedUris,
     deltaY,
+    fileIconCache,
     filterValue,
     finalDeltaY,
     focusedIndex,
@@ -2740,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);
@@ -2850,6 +2900,7 @@ const HandleCollapseAll = 11;
 const HandleViewAsList = 12;
 const HandleViewAsTable = 13;
 const HandleClickButton = 14;
+const HandleFileNameClick = 15;
 
 const getIconVirtualDom = (icon, type = Div) => {
   return {
@@ -3069,7 +3120,8 @@ const getProblemVirtualDom = problem => {
     rowIndex,
     setSize,
     source,
-    type
+    type,
+    uri
   } = problem;
   let className = Problem;
   const indent = getProblemIndent(listItemType);
@@ -3088,7 +3140,11 @@ const getProblemVirtualDom = problem => {
       className,
       role: TreeItem,
       type: Div
-    }, listItemType === Collapsed ? getChevronRightVirtualDom() : getChevronDownVirtualDom(), getFileIconVirtualDom(icon), labelNode, text(fileName), labelDetailNode, text(relativePath), ...getBadgeVirtualDom(ProblemBadge, problem.count)];
+    }, listItemType === Collapsed ? getChevronRightVirtualDom() : getChevronDownVirtualDom(), getFileIconVirtualDom(icon), {
+      ...labelNode,
+      'data-uri': uri,
+      onClick: HandleFileNameClick
+    }, text(fileName), labelDetailNode, text(relativePath), ...getBadgeVirtualDom(ProblemBadge, problem.count)];
   }
   const lineColumn = atLineColumn(rowIndex + 1, columnIndex + 1);
   const label = {
@@ -3298,6 +3354,7 @@ const renderItems = (oldState, newState) => {
   const {
     activeUri,
     collapsedUris,
+    fileIconCache,
     filterValue,
     focusedIndex,
     inputSource,
@@ -3312,7 +3369,7 @@ 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, inputSource, isSmall, message, scrollBarHeight, scrollBarActive, problemCount);
   return ['Viewlet.setDom2', dom];
@@ -3373,6 +3430,7 @@ const getActionsVirtualDom = actions => {
 const getActions = state => {
   const {
     collapsedUris,
+    fileIconCache,
     filterValue,
     focusedIndex,
     inputSource,
@@ -3381,7 +3439,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 = [];
@@ -3446,6 +3504,9 @@ const renderEventListeners = () => {
   }, {
     name: HandlePointerDown,
     params: ['handleClickAt', 'event.clientX', 'event.clientY']
+  }, {
+    name: HandleFileNameClick,
+    params: ['toggleFileGroup', 'event.target.dataset.uri']
   }, {
     name: HandleClickMoreFilters,
     params: ['handleClickMoreFilters', ClientX, ClientY]
@@ -3499,6 +3560,17 @@ const saveState = state => {
   };
 };
 
+const toggleFileGroup = (state, uri) => {
+  const {
+    collapsedUris
+  } = state;
+  const newCollapsedUris = collapsedUris.includes(uri) ? collapsedUris.filter(collapsedUri => collapsedUri !== uri) : [...collapsedUris, uri];
+  return {
+    ...state,
+    collapsedUris: newCollapsedUris
+  };
+};
+
 const commandMap = {
   'Problems.collapseAll': wrapCommand(collapseAll$1),
   'Problems.copyMessage': wrapCommand(copyMessage),
@@ -3532,6 +3604,7 @@ const commandMap = {
   'Problems.resize': resize,
   'Problems.saveState': wrapGetter(saveState),
   'Problems.terminate': terminate,
+  'Problems.toggleFileGroup': wrapCommand(toggleFileGroup),
   'Problems.viewAsList': wrapCommand(viewAsList),
   'Problems.viewAsTable': wrapCommand(viewAsTable)
 };

package/package.json

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