@lvce-editor/problems-view 1.29.1 → 1.31.0

package/dist/problemsViewWorkerMain.js

@@ -1390,7 +1390,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$4 = (id, rpc) => {
+const set$6 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -1423,7 +1423,7 @@ const create$1 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$4(rpcId, mockRpc);
+      set$6(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -1432,7 +1432,7 @@ const create$1 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$4(rpcId, rpc);
+      set$6(rpcId, rpc);
     }
   };
 };
@@ -1633,61 +1633,68 @@ const Checked = 2;
 const Unchecked = 3;
 
 const EditorWorker$1 = 99;
+const RendererProcess = 1670;
 const RendererWorker = 1;
 
 const SetCss = 'Viewlet.setCss';
+const SetFocusContext = 'Viewlet.setFocusContext';
 
 const {
-  invoke: invoke$1,
-  set: set$3
+  invoke: invoke$3,
+  set: set$5
 } = create$1(EditorWorker$1);
 const getUri$1 = async editorUid => {
   // @ts-ignore
-  return invoke$1('Editor.getUri', editorUid);
+  return invoke$3('Editor.getUri', editorUid);
 };
 const getProblems$2 = async () => {
   // @ts-ignore
-  return invoke$1('Editor.getProblems');
+  return invoke$3('Editor.getProblems');
 };
 
 const EditorWorker = {
   __proto__: null,
   getProblems: getProblems$2,
   getUri: getUri$1,
-  invoke: invoke$1,
-  set: set$3
+  invoke: invoke$3,
+  set: set$5
 };
 
 const {
-  invoke,
+  invoke: invoke$2,
+  set: set$4
+} = create$1(RendererProcess);
+
+const {
+  invoke: invoke$1,
   invokeAndTransfer,
-  set: set$2
+  set: set$3
 } = create$1(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
   number(menuId);
   number(x);
   number(y);
-  await invoke('ContextMenu.show2', uid, menuId, x, y, args);
+  await invoke$1('ContextMenu.show2', uid, menuId, x, y, args);
 };
 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);
+  return invoke$1('IconTheme.getFileIcon', options);
 };
 const writeClipBoardText$1 = async text => {
-  await invoke('ClipBoard.writeText', /* text */text);
+  await invoke$1('ClipBoard.writeText', /* text */text);
 };
 const getActiveEditorId$1 = () => {
-  return invoke('GetActiveEditor.getActiveEditorId');
+  return invoke$1('GetActiveEditor.getActiveEditorId');
 };
 const getWorkspacePath$1 = () => {
-  return invoke('Workspace.getPath');
+  return invoke$1('Workspace.getPath');
 };
 const openUri$1 = async (uri, focus, options) => {
-  await invoke('Main.openUri', {
+  await invoke$1('Main.openUri', {
     ...options,
     focus,
     uri
@@ -1698,19 +1705,19 @@ const getActiveEditorId = () => {
   return getActiveEditorId$1();
 };
 const focusEditor = async () => {
-  await invoke('Main.focus');
+  await invoke$1('Main.focus');
 };
 const openUri = (uri, focus) => {
   return openUri$1(uri, focus);
 };
 const setEditorCursor = async (rowIndex, columnIndex) => {
-  await invoke('Editor.cursorSet', rowIndex, columnIndex);
+  await invoke$1('Editor.cursorSet', rowIndex, columnIndex);
 };
 const sendMessagePortToEditorWorker = (port, rpcId) => {
   return sendMessagePortToEditorWorker$1(port, rpcId);
 };
-const set$1 = rpc => {
-  set$2(rpc);
+const set$2 = rpc => {
+  set$3(rpc);
 };
 const writeClipBoardText = text => {
   return writeClipBoardText$1(text);
@@ -1737,7 +1744,7 @@ const {
   get,
   getCommandIds,
   registerCommands,
-  set,
+  set: set$1,
   wrapCommand,
   wrapGetter
 } = create$a();
@@ -1779,7 +1786,7 @@ const create = (id, uri, x, y, width, height, workspaceUri) => {
     x,
     y
   };
-  set(id, state, state);
+  set$1(id, state, state);
 };
 
 const isEqual$2 = (oldState, newState) => {
@@ -1970,7 +1977,7 @@ const diff2 = uid => {
     oldState
   } = get(uid);
   const updatedState = updateVirtualList(newState);
-  set(uid, oldState, updatedState);
+  set$1(uid, oldState, updatedState);
   const diffResult = diff(oldState, updatedState);
   return diffResult;
 };
@@ -2177,51 +2184,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$3('Editor.getDiagnostics', editorId);
+};
 
 const leadingSlashesRegex = /^\/+/;
 const trailingSlashRegex = /\/$/;
@@ -2364,6 +2332,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,
@@ -2540,6 +2574,31 @@ const handleIconThemeChange = async state => {
   };
 };
 
+const state = {
+  connected: false
+};
+const isConnected = () => {
+  const {
+    connected
+  } = state;
+  return connected;
+};
+const invoke = (method, ...params) => {
+  return invoke$2(method, ...params);
+};
+const set = rpc => {
+  set$4(rpc);
+  state.connected = true;
+};
+
+const handleMessagePort = async port => {
+  const rpc = await create$5({
+    commandMap: {},
+    messagePort: port
+  });
+  set(rpc);
+};
+
 const getIcon = (uri, fileIconCache) => {
   if (!uri) {
     return '';
@@ -3487,14 +3546,23 @@ const applyRender = (oldState, newState, diffResult) => {
   return commands;
 };
 
+const renderDirect = async (uid, commands) => {
+  const rendererWorkerCommands = commands.filter(command => command[0] === SetFocusContext);
+  const rendererProcessCommands = commands.filter(command => command[0] !== SetFocusContext);
+  const transactionId = await invoke('Viewlet.queueCommands', uid, rendererProcessCommands);
+  return [...rendererWorkerCommands, ['Viewlet.commitPending', uid, transactionId]];
+};
 const render2 = (uid, diffResult) => {
   const {
     newState,
     oldState
   } = get(uid);
-  set(uid, newState, newState);
+  set$1(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
-  return commands;
+  if (!isConnected()) {
+    return commands;
+  }
+  return renderDirect(uid, commands);
 };
 
 const getActionVirtualDom = action => {
@@ -3705,6 +3773,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),
@@ -3716,6 +3785,7 @@ const commandMap = {
   'Problems.handleDiagnosticsChange': wrapCommand(handleDiagnosticsChange),
   'Problems.handleFilterInput': wrapCommand(handleFilterInput),
   'Problems.handleIconThemeChange': wrapCommand(handleIconThemeChange),
+  'Problems.handleMessagePort': handleMessagePort,
   'Problems.handleScrollBarCaptureLost': wrapCommand(handleScrollBarCaptureLost),
   'Problems.handleScrollBarClick': wrapCommand(handleScrollBarClick),
   'Problems.handleScrollBarMove': wrapCommand(handleScrollBarMove),
@@ -3747,7 +3817,7 @@ const initializeEditorWorkerRpc = async () => {
       commandMap: {},
       send
     });
-    set$3(rpc);
+    set$5(rpc);
     return rpc;
   } catch (error) {
     throw new VError(error, `Failed to create editor worker rpc`);
@@ -3758,7 +3828,7 @@ const initializeRendererWorker = async () => {
   const rpc = await create$2({
     commandMap: commandMapRef
   });
-  set$1(rpc);
+  set$2(rpc);
 };
 
 const listen = async () => {

package/package.json

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