@lvce-editor/problems-view 1.26.7 → 1.28.0

package/dist/problemsViewWorkerMain.js

@@ -1683,10 +1683,29 @@ const writeClipBoardText$1 = async text => {
 const getActiveEditorId$1 = () => {
   return invoke('GetActiveEditor.getActiveEditorId');
 };
+const getWorkspacePath$1 = () => {
+  return invoke('Workspace.getPath');
+};
+const openUri$1 = async (uri, focus, options) => {
+  await invoke('Main.openUri', {
+    ...options,
+    focus,
+    uri
+  });
+};
 
 const getActiveEditorId = () => {
   return getActiveEditorId$1();
 };
+const focusEditor = async () => {
+  await invoke('Main.focus');
+};
+const openUri = (uri, focus) => {
+  return openUri$1(uri, focus);
+};
+const setEditorCursor = async (rowIndex, columnIndex) => {
+  await invoke('Editor.cursorSet', rowIndex, columnIndex);
+};
 const sendMessagePortToEditorWorker = (port, rpcId) => {
   return sendMessagePortToEditorWorker$1(port, rpcId);
 };
@@ -2424,43 +2443,6 @@ const handleBlur = state => {
   };
 };
 
-const getListIndex = (eventX, eventY, x, y, deltaY, itemHeight) => {
-  const relativeY = eventY - y + deltaY;
-  const index = Math.floor(relativeY / itemHeight);
-  return index;
-};
-
-const handleClickAt = (state, eventX, eventY) => {
-  const {
-    collapsedUris,
-    deltaY,
-    filterValue,
-    itemHeight,
-    problems,
-    smallWidthBreakPoint,
-    viewMode,
-    width,
-    x,
-    y
-  } = state;
-
-  // TODO use functional focus rendering
-  // Focus.setFocus(FocusKey.Problems)
-  const problemCount = getVisibleProblemCount(problems, collapsedUris, filterValue, viewMode);
-  if (problemCount === 0) {
-    return focusIndex(state, -1);
-  }
-  const listTopOffset = getListTopOffset(width, smallWidthBreakPoint, viewMode);
-  const index = getListIndex(eventX, eventY, x, y + listTopOffset, deltaY, itemHeight);
-  if (index < 0 || index >= problemCount) {
-    return focusIndex(state, -1);
-  }
-  return {
-    ...state,
-    focusedIndex: index
-  };
-};
-
 const show2 = async (uid, menuId, x, y, args) => {
   await showContextMenu2(uid, menuId, x, y, args);
 };
@@ -2533,6 +2515,104 @@ const handleIconThemeChange = async state => {
   };
 };
 
+const getIcon = (uri, fileIconCache) => {
+  if (!uri) {
+    return '';
+  }
+  return fileIconCache[uri] || '';
+};
+
+const getVisibleProblems = (problems, fileIconCache, collapsedUris, focusedIndex, filterValue, minLineY = 0, maxLineY = Infinity, viewMode = List) => {
+  array(problems);
+  array(collapsedUris);
+  number(focusedIndex);
+  string(filterValue);
+  const visibleItems = [];
+  const filterValueLength = filterValue.length;
+  const filtered = filterProblems(problems, collapsedUris, filterValue);
+  const displayProblems = viewMode === Table ? filtered.filter(problem => problem.message) : filtered;
+  const finalLineY = Math.min(maxLineY, displayProblems.length);
+  for (let i = minLineY; i < finalLineY; i++) {
+    const problem = displayProblems[i];
+    visibleItems.push({
+      ...problem,
+      filterValueLength,
+      icon: getIcon(problem.uri, fileIconCache),
+      isActive: i === focusedIndex,
+      isEven: i % 2 === 0
+    });
+  }
+  return visibleItems;
+};
+
+const getListIndex = (eventX, eventY, x, y, deltaY, itemHeight) => {
+  const relativeY = eventY - y + deltaY;
+  const index = Math.floor(relativeY / itemHeight);
+  return index;
+};
+
+const handleClickAt = (state, eventX, eventY) => {
+  const {
+    collapsedUris,
+    deltaY,
+    filterValue,
+    itemHeight,
+    problems,
+    smallWidthBreakPoint,
+    viewMode,
+    width,
+    x,
+    y
+  } = state;
+
+  // TODO use functional focus rendering
+  // Focus.setFocus(FocusKey.Problems)
+  const problemCount = getVisibleProblemCount(problems, collapsedUris, filterValue, viewMode);
+  if (problemCount === 0) {
+    return focusIndex(state, -1);
+  }
+  const listTopOffset = getListTopOffset(width, smallWidthBreakPoint, viewMode);
+  const index = getListIndex(eventX, eventY, x, y + listTopOffset, deltaY, itemHeight);
+  if (index < 0 || index >= problemCount) {
+    return focusIndex(state, -1);
+  }
+  return {
+    ...state,
+    focusedIndex: index
+  };
+};
+
+const handleProblemClick = async (state, eventX, eventY) => {
+  const newState = handleClickAt(state, eventX, eventY);
+  const {
+    focusedIndex
+  } = newState;
+  if (focusedIndex < 0) {
+    return newState;
+  }
+  const {
+    collapsedUris,
+    fileIconCache,
+    filterValue,
+    problems,
+    viewMode
+  } = newState;
+  const visibleProblems = getVisibleProblems(problems, fileIconCache, collapsedUris, focusedIndex, filterValue, focusedIndex, focusedIndex + 1, viewMode);
+  const problem = visibleProblems[0];
+  if (!problem || problem.listItemType !== Item) {
+    return newState;
+  }
+  const {
+    columnIndex,
+    rowIndex,
+    uri
+  } = problem;
+  await openUri(uri, true);
+  await focusEditor();
+  await setEditorCursor(rowIndex, columnIndex);
+  return newState;
+};
+
 const handleScrollBarCaptureLost = state => {
   return {
     ...state,
@@ -2674,12 +2754,15 @@ const getSavedViewMode = savedState => {
   return List;
 };
 
+const getWorkspacePath = () => {
+  return getWorkspacePath$1();
+};
+
 const loadContent = async (state, savedState) => {
   const {
-    fileIconCache: oldFileIconCache,
-    workspaceUri
+    fileIconCache: oldFileIconCache
   } = state;
-  const activeUri = await getActiveUri();
+  const [activeUri, workspaceUri] = await Promise.all([getActiveUri(), getWorkspacePath()]);
   const {
     error,
     problems
@@ -2690,7 +2773,8 @@ const loadContent = async (state, savedState) => {
       activeUri,
       filteredProblems: [],
       message: error,
-      problems: []
+      problems: [],
+      workspaceUri
     };
   }
   const message = getMessage(problems.length);
@@ -2709,7 +2793,8 @@ const loadContent = async (state, savedState) => {
     listItems: [],
     message,
     problems,
-    viewMode
+    viewMode,
+    workspaceUri
   };
 };
 
@@ -2741,36 +2826,6 @@ const getUniqueIndents = problems => {
   return uniqueIndents;
 };
 
-const getIcon = (uri, fileIconCache) => {
-  if (!uri) {
-    return '';
-  }
-  return fileIconCache[uri] || '';
-};
-
-const getVisibleProblems = (problems, fileIconCache, collapsedUris, focusedIndex, filterValue, minLineY = 0, maxLineY = Infinity, viewMode = List) => {
-  array(problems);
-  array(collapsedUris);
-  number(focusedIndex);
-  string(filterValue);
-  const visibleItems = [];
-  const filterValueLength = filterValue.length;
-  const filtered = filterProblems(problems, collapsedUris, filterValue);
-  const displayProblems = viewMode === Table ? filtered.filter(problem => problem.message) : filtered;
-  const finalLineY = Math.min(maxLineY, displayProblems.length);
-  for (let i = minLineY; i < finalLineY; i++) {
-    const problem = displayProblems[i];
-    visibleItems.push({
-      ...problem,
-      filterValueLength,
-      icon: getIcon(problem.uri, fileIconCache),
-      isActive: i === focusedIndex,
-      isEven: i % 2 === 0
-    });
-  }
-  return visibleItems;
-};
-
 const renderCss = (oldState, newState) => {
   const {
     collapsedUris,
@@ -3530,6 +3585,7 @@ const renderEventListeners = () => {
     name: HandleScrollBarPointerDown,
     params: ['handleScrollBarClick', ClientY],
     preventDefault: true,
+    stopPropagation: true,
     trackPointerEvents: [HandleScrollBarMove, HandleScrollBarPointerCaptureLost]
   }, {
     name: HandleScrollBarMove,
@@ -3585,7 +3641,7 @@ const commandMap = {
   'Problems.handleArrowLeft': wrapCommand(handleArrowLeft),
   'Problems.handleArrowRight': wrapCommand(handleArrowRight),
   'Problems.handleBlur': wrapCommand(handleBlur),
-  'Problems.handleClickAt': wrapCommand(handleClickAt),
+  'Problems.handleClickAt': wrapCommand(handleProblemClick),
   'Problems.handleClickButton': wrapCommand(handleClickButton),
   'Problems.handleClickMoreFilters': wrapCommand(handleClickMoreFilters),
   'Problems.handleContextMenu': wrapCommand(handleContextMenu),

package/package.json

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