@lvce-editor/problems-view 1.25.0 → 1.25.2

package/dist/problemsViewWorkerMain.js

@@ -1284,6 +1284,10 @@ const {
   invoke: invoke$1,
   set: set$3
 } = create$1(EditorWorker$1);
+const getUri$1 = async editorUid => {
+  // @ts-ignore
+  return invoke$1('Editor.getUri', editorUid);
+};
 const getProblems$2 = async () => {
   // @ts-ignore
   return invoke$1('Editor.getProblems');
@@ -1292,6 +1296,7 @@ const getProblems$2 = async () => {
 const EditorWorker = {
   __proto__: null,
   getProblems: getProblems$2,
+  getUri: getUri$1,
   invoke: invoke$1,
   set: set$3
 };
@@ -1315,9 +1320,13 @@ const sendMessagePortToEditorWorker$1 = async (port, rpcId) => {
 const writeClipBoardText$1 = async text => {
   await invoke('ClipBoard.writeText', /* text */text);
 };
+const getActiveEditorId$1 = () => {
+  return invoke('GetActiveEditor.getActiveEditorId');
+};
 
 const RendererWorker = {
   __proto__: null,
+  getActiveEditorId: getActiveEditorId$1,
   invoke,
   invokeAndTransfer,
   sendMessagePortToEditorWorker: sendMessagePortToEditorWorker$1,
@@ -1327,6 +1336,7 @@ const RendererWorker = {
 };
 
 const {
+  getActiveEditorId,
   sendMessagePortToEditorWorker,
   set: set$1,
   writeClipBoardText
@@ -1364,6 +1374,7 @@ const List = 2;
 
 const create = (id, uri, x, y, width, height, workspaceUri) => {
   const state = {
+    activeUri: '',
     collapsedUris: [],
     filteredProblems: [],
     filterValue: '',
@@ -1395,7 +1406,7 @@ const isEqual$1 = (oldState, newState) => {
 };
 
 const isEqual = (oldState, newState) => {
-  return oldState.problems === newState.problems && oldState.filterValue === newState.filterValue && oldState.message === newState.message && oldState.viewMode === newState.viewMode;
+  return oldState.activeUri === newState.activeUri && oldState.problems === newState.problems && oldState.filterValue === newState.filterValue && oldState.message === newState.message && oldState.viewMode === newState.viewMode;
 };
 
 const RenderItems = 1;
@@ -1584,22 +1595,29 @@ const showInfos = () => {
   return i18nString(ShowInfos);
 };
 
-const getMenuEntriesFilter = state => [{
-  command: '-1',
-  flags: state.showErrors ? Checked : Unchecked,
-  id: 'show-errors',
-  label: showErrors()
-}, {
-  command: '-1',
-  flags: state.showWarnings ? Checked : Unchecked,
-  id: 'show-warnings',
-  label: showWarnings()
-}, {
-  command: '-1',
-  flags: state.showInfos ? Checked : Unchecked,
-  id: 'show-infos',
-  label: showInfos()
-}];
+const getMenuEntriesFilter = state => {
+  const {
+    showErrors: showErrors$1,
+    showInfos: showInfos$1,
+    showWarnings: showWarnings$1
+  } = state;
+  return [{
+    command: '-1',
+    flags: showErrors$1 ? Checked : Unchecked,
+    id: 'show-errors',
+    label: showErrors()
+  }, {
+    command: '-1',
+    flags: showWarnings$1 ? Checked : Unchecked,
+    id: 'show-warnings',
+    label: showWarnings()
+  }, {
+    command: '-1',
+    flags: showInfos$1 ? Checked : Unchecked,
+    id: 'show-infos',
+    label: showInfos()
+  }];
+};
 
 const getMenuEntries2 = (state, props) => {
   const {
@@ -1617,10 +1635,152 @@ const getMenuIds = () => {
   return [ProblemsFilter$1];
 };
 
+const {
+  getProblems: getProblems$1,
+  getUri} = EditorWorker;
+
 const Item = 0;
 const Expanded = 1;
 const Collapsed = 2;
 
+const toProblem = (diagnostic, index) => {
+  const {
+    code,
+    columnIndex,
+    message,
+    rowIndex,
+    source,
+    type,
+    uri
+  } = diagnostic;
+  return {
+    code: code || '',
+    columnIndex: columnIndex || 0,
+    count: 0,
+    fileName: '',
+    level: 2,
+    listItemType: Item,
+    message: message || '',
+    posInSet: index,
+    relativePath: '',
+    rowIndex: rowIndex || 0,
+    setSize: 1,
+    source: source || '',
+    type: type || 'error',
+    uri
+  };
+};
+const getRelativeParentUri = (uri, workspaceUri) => {
+  const slashIndex = uri.lastIndexOf('/');
+  return uri.slice(0, slashIndex).slice(workspaceUri.length);
+};
+const getFileName = uri => {
+  const slashIndex = uri.lastIndexOf('/');
+  return uri.slice(slashIndex + 1);
+};
+const toProblems = (diagnostics, workspaceUri = '') => {
+  const problems = [];
+  let problem = {
+    code: '',
+    columnIndex: 0,
+    count: 0,
+    fileName: '',
+    level: 0,
+    listItemType: 0,
+    message: '',
+    posInSet: 0,
+    relativePath: '',
+    rowIndex: 0,
+    setSize: 0,
+    source: '',
+    type: '',
+    uri: ''
+  };
+  let relativeIndex = 0;
+  for (const diagnostic of diagnostics) {
+    if (diagnostic.uri === problem.uri) {
+      relativeIndex++;
+      problem.count++;
+    } else {
+      relativeIndex = 1;
+      problem = {
+        code: '',
+        columnIndex: 0,
+        count: 1,
+        fileName: '',
+        level: 1,
+        listItemType: Expanded,
+        message: '',
+        posInSet: relativeIndex,
+        relativePath: '',
+        rowIndex: 0,
+        setSize: 123,
+        source: '',
+        type: '',
+        uri: diagnostic.uri
+      };
+      problems.push(problem);
+    }
+    problems.push(toProblem(diagnostic, relativeIndex));
+  }
+  for (const problem of problems) {
+    // TODO maybe rename property, this should be the relative path of the parent folder of the file
+    // @ts-ignore
+    problem.relativePath = getRelativeParentUri(problem.uri, workspaceUri);
+    // @ts-ignore
+    problem.fileName = getFileName(problem.uri);
+    // problem.uri = problem.uri // TODO
+  }
+  return problems;
+};
+
+const getProblems = async (workspaceUri, activeUri) => {
+  if (!activeUri) {
+    return {
+      error: '',
+      problems: []
+    };
+  }
+  try {
+    const diagnostics = await getProblems$1();
+    const activeDiagnostics = diagnostics.filter(diagnostic => diagnostic.uri === activeUri);
+    // @ts-ignore
+    const problems = toProblems(activeDiagnostics, workspaceUri);
+    return {
+      error: '',
+      problems
+    };
+  } catch (error) {
+    return {
+      error: `${error}`,
+      problems: []
+    };
+  }
+};
+
+const handleActiveEditorChange = async (state, activeUri) => {
+  const {
+    activeUri: oldActiveUri,
+    workspaceUri
+  } = state;
+  if (activeUri === oldActiveUri) {
+    return state;
+  }
+  const {
+    error,
+    problems
+  } = await getProblems(workspaceUri, activeUri);
+  return {
+    ...state,
+    activeUri,
+    filteredProblems: problems,
+    inputSource: Script,
+    listItems: [],
+    message: error || getMessage(problems.length),
+    problems
+  };
+};
+
 const getArrowLeftNewFocusedIndex = (problems, collapsedUris, focusedIndex) => {
   for (let i = focusedIndex; i >= 0; i--) {
     const problem = problems[i];
@@ -1759,9 +1919,12 @@ const handleFilterInput = (state, value, inputSource = Script) => {
 };
 
 const handleIconThemeChange = state => {
+  const {
+    problems
+  } = state;
   return {
     ...state,
-    problems: [...state.problems]
+    problems: [...problems]
   };
 };
 
@@ -1769,117 +1932,12 @@ const initialize = async () => {
   // function is not needed anymore
 };
 
-const {
-  getProblems: getProblems$1} = EditorWorker;
-
-const toProblem = (diagnostic, index) => {
-  const {
-    code,
-    columnIndex,
-    message,
-    rowIndex,
-    source,
-    type,
-    uri
-  } = diagnostic;
-  return {
-    code: code || '',
-    columnIndex: columnIndex || 0,
-    count: 0,
-    fileName: '',
-    level: 2,
-    listItemType: Item,
-    message: message || '',
-    posInSet: index,
-    relativePath: '',
-    rowIndex: rowIndex || 0,
-    setSize: 1,
-    source: source || '',
-    type: type || 'error',
-    uri
-  };
-};
-const getRelativeParentUri = (uri, workspaceUri) => {
-  const slashIndex = uri.lastIndexOf('/');
-  return uri.slice(0, slashIndex).slice(workspaceUri.length);
-};
-const getFileName = uri => {
-  const slashIndex = uri.lastIndexOf('/');
-  return uri.slice(slashIndex + 1);
-};
-const toProblems = (diagnostics, workspaceUri = '') => {
-  const problems = [];
-  let problem = {
-    code: '',
-    columnIndex: 0,
-    count: 0,
-    fileName: '',
-    level: 0,
-    listItemType: 0,
-    message: '',
-    posInSet: 0,
-    relativePath: '',
-    rowIndex: 0,
-    setSize: 0,
-    source: '',
-    type: '',
-    uri: ''
-  };
-  let relativeIndex = 0;
-  for (const diagnostic of diagnostics) {
-    if (diagnostic.uri === problem.uri) {
-      relativeIndex++;
-      problem.count++;
-    } else {
-      relativeIndex = 1;
-      problem = {
-        code: '',
-        columnIndex: 0,
-        count: 1,
-        fileName: '',
-        level: 1,
-        listItemType: Expanded,
-        message: '',
-        posInSet: relativeIndex,
-        relativePath: '',
-        rowIndex: 0,
-        setSize: 123,
-        source: '',
-        type: '',
-        uri: diagnostic.uri
-      };
-      problems.push(problem);
-    }
-    problems.push(toProblem(diagnostic, relativeIndex));
-  }
-  for (const problem of problems) {
-    // TODO maybe rename property, this should be the relative path of the parent folder of the file
-    // @ts-ignore
-    problem.relativePath = getRelativeParentUri(problem.uri, workspaceUri);
-    // @ts-ignore
-    problem.fileName = getFileName(problem.uri);
-    // problem.uri = problem.uri // TODO
-  }
-  return problems;
-};
-
-// TODO send event listener to editor, asking to send problem updates to this worker
-
-const getProblems = async workspaceUri => {
-  try {
-    const diagnostics = await getProblems$1();
-    // @ts-ignore
-    const problems = toProblems(diagnostics, workspaceUri);
-    return {
-      error: '',
-      problems
-    };
-  } catch (error) {
-    return {
-      error: `${error}`,
-      problems: []
-    };
+const getActiveUri = async () => {
+  const editorId = await getActiveEditorId();
+  if (editorId === -1) {
+    return '';
   }
+  return getUri(editorId);
 };
 
 const getSavedViewMode = savedState => {
@@ -1904,14 +1962,21 @@ const getSavedCollapsedUris = savedState => {
   return [];
 };
 const loadContent = async (state, savedState) => {
+  const {
+    workspaceUri
+  } = state;
+  const activeUri = await getActiveUri();
   const {
     error,
     problems
-  } = await getProblems(state.workspaceUri);
+  } = await getProblems(workspaceUri, activeUri);
   if (error) {
     return {
       ...state,
-      message: error
+      activeUri,
+      filteredProblems: [],
+      message: error,
+      problems: []
     };
   }
   const message = getMessage(problems.length);
@@ -1920,6 +1985,7 @@ const loadContent = async (state, savedState) => {
   const collapsedUris = getSavedCollapsedUris(savedState);
   return {
     ...state,
+    activeUri,
     collapsedUris,
     filteredProblems: problems,
     filterValue,
@@ -2000,15 +2066,16 @@ const getActionButtonVirtualDom = action => {
   }, getIconVirtualDom(icon)];
 };
 
+const filterBadgeNode = {
+  childCount: 1,
+  className: FilterBadge,
+  type: Div
+};
 const getFilterBadgeDom = badgeText => {
   if (!badgeText) {
     return [];
   }
-  return [{
-    childCount: 1,
-    className: FilterBadge,
-    type: Div
-  }, text(badgeText)];
+  return [filterBadgeNode, text(badgeText)];
 };
 
 const getInputBoxVirtualDom = (name, onInput, placeholder) => {
@@ -2049,20 +2116,23 @@ const getProblemsFilterVirtualDom = action => {
     id: 'more filters'})];
 };
 
+const messageNode$2 = {
+  childCount: 3,
+  className: Message,
+  type: Div
+};
+const spanNode = {
+  childCount: 1,
+  type: Span
+};
+const clearFilterNode = {
+  childCount: 1,
+  className: MessageAction,
+  onClick: HandleClearFilterClick,
+  type: A
+};
 const getNoResultsWithFilterVirtualDom = () => {
-  return [{
-    childCount: 3,
-    className: Message,
-    type: Div
-  }, {
-    childCount: 1,
-    type: Span
-  }, text(noResultsFoundWithProvidedFilterCriteria()), {
-    childCount: 1,
-    className: MessageAction,
-    onClick: HandleClearFilterClick,
-    type: A
-  }, text(clearFilter()), text('.')];
+  return [messageNode$2, spanNode, text(noResultsFoundWithProvidedFilterCriteria()), clearFilterNode, text(clearFilter()), text('.')];
 };
 
 const getBadgeVirtualDom = (className, count) => {
@@ -2133,6 +2203,26 @@ const getTreeItemIndent = depth => {
   return `${depth * defaultIndent}rem`;
 };
 
+const labelNode = {
+  childCount: 1,
+  className: Label,
+  type: Span
+};
+const labelDetailNode = {
+  childCount: 1,
+  className: LabelDetail,
+  type: Div
+};
+const highlightNode = {
+  childCount: 1,
+  className: Highlight,
+  type: Div
+};
+const problemAtNode = {
+  childCount: 2,
+  className: ProblemAt,
+  type: Span
+};
 const getProblemVirtualDom = problem => {
   const {
     code,
@@ -2155,7 +2245,7 @@ const getProblemVirtualDom = problem => {
   } = problem;
   let className = Problem;
   if (isActive) {
-    className += ' ' + ProblemSelected;
+    className = mergeClassNames(className, ProblemSelected);
   }
   if (listItemType === Expanded || listItemType === Collapsed) {
     return [{
@@ -2169,15 +2259,7 @@ const getProblemVirtualDom = problem => {
       paddingLeft: getTreeItemIndent(1),
       role: TreeItem,
       type: Div
-    }, listItemType === Collapsed ? getChevronRightVirtualDom() : getChevronDownVirtualDom(), getFileIconVirtualDom(icon), {
-      childCount: 1,
-      className: Label,
-      type: Span
-    }, text(fileName), {
-      childCount: 1,
-      className: LabelDetail,
-      type: Div
-    }, text(relativePath), ...getBadgeVirtualDom(ProblemBadge, problem.count)];
+    }, listItemType === Collapsed ? getChevronRightVirtualDom() : getChevronDownVirtualDom(), getFileIconVirtualDom(icon), labelNode, text(fileName), labelDetailNode, text(relativePath), ...getBadgeVirtualDom(ProblemBadge, problem.count)];
   }
   const lineColumn = atLineColumn(rowIndex, columnIndex);
   const label = {
@@ -2204,19 +2286,11 @@ const getProblemVirtualDom = problem => {
     const middle = message.slice(messageMatchIndex, messageMatchIndex + filterValueLength);
     const after = message.slice(messageMatchIndex + filterValueLength);
     label.childCount += 2;
-    dom.push(text(before), {
-      childCount: 1,
-      className: Highlight,
-      type: Div
-    }, text(middle), text(after));
+    dom.push(text(before), highlightNode, text(middle), text(after));
   } else {
     dom.push(text(message));
   }
-  dom.push({
-    childCount: 2,
-    className: ProblemAt,
-    type: Span
-  }, text(getProblemSourceDetail(source, code)), text(lineColumn));
+  dom.push(problemAtNode, text(getProblemSourceDetail(source, code)), text(lineColumn));
   return dom;
 };
 
@@ -2232,14 +2306,20 @@ const getProblemsListVirtualDom = problems => {
   return dom;
 };
 
+const messageNode$1 = {
+  childCount: 1,
+  className: Message,
+  type: Div
+};
 const getProblemsNoProblemsFoundVirtualDom = () => {
-  return [{
-    childCount: 1,
-    className: Message,
-    type: Div
-  }, text(noProblemsDetected())];
+  return [messageNode$1, text(noProblemsDetected())];
 };
 
+const rowItemNode$1 = {
+  childCount: 1,
+  className: ProblemsTableRowItem,
+  type: Div
+};
 const getClassName = isEven => {
   if (isEven) {
     return ProblemsTableRow;
@@ -2264,27 +2344,7 @@ const getProblemsTableRowVirtualDom = problem => {
     childCount: 5,
     className: getClassName(isEven),
     type: Div
-  }, {
-    childCount: 1,
-    className: ProblemsTableRowItem,
-    type: Div
-  }, getProblemsIconVirtualDom(type), {
-    childCount: 1,
-    className: ProblemsTableRowItem,
-    type: Div
-  }, text(getProblemSourceDetail(source, code)), {
-    childCount: 1,
-    className: ProblemsTableRowItem,
-    type: Div
-  }, text(message), {
-    childCount: 1,
-    className: ProblemsTableRowItem,
-    type: Div
-  }, text(uri), {
-    childCount: 1,
-    className: ProblemsTableRowItem,
-    type: Div
-  }, text(source)];
+  }, rowItemNode$1, getProblemsIconVirtualDom(type), rowItemNode$1, text(getProblemSourceDetail(source, code)), rowItemNode$1, text(message), rowItemNode$1, text(uri), rowItemNode$1, text(source)];
   return dom;
 };
 
@@ -2297,59 +2357,53 @@ const getProblemsTableBodyVirtualDom = problems => {
   return dom;
 };
 
+const tableHeaderNode = {
+  childCount: 1,
+  className: ProblemsTableHeader,
+  type: Div
+};
+const tableRowNode = {
+  childCount: 5,
+  className: ProblemsTableRow,
+  type: Div
+};
+const emptyRowItemNode = {
+  childCount: 0,
+  className: ProblemsTableRowItem,
+  type: Div
+};
+const rowItemNode = {
+  childCount: 1,
+  className: ProblemsTableRowItem,
+  type: Div
+};
 const getProblemsTableHeaderVirtualDom = () => {
   const textCode = code();
   const textSource = source();
   const textMessage = message();
   const textFile = file();
-  const dom = [{
-    childCount: 1,
-    className: ProblemsTableHeader,
-    type: Div
-  }, {
-    childCount: 5,
-    className: ProblemsTableRow,
-    type: Div
-  }, {
-    childCount: 0,
-    className: ProblemsTableRowItem,
-    type: Div
-  }, {
-    childCount: 1,
-    className: ProblemsTableRowItem,
-    type: Div
-  }, text(textCode), {
-    childCount: 1,
-    className: ProblemsTableRowItem,
-    type: Div
-  }, text(textMessage), {
-    childCount: 1,
-    className: ProblemsTableRowItem,
-    type: Div
-  }, text(textFile), {
-    childCount: 1,
-    className: ProblemsTableRowItem,
-    type: Div
-  }, text(textSource)];
+  const dom = [tableHeaderNode, tableRowNode, emptyRowItemNode, rowItemNode, text(textCode), rowItemNode, text(textMessage), rowItemNode, text(textFile), rowItemNode, text(textSource)];
   return dom;
 };
 
+const tableNode = {
+  childCount: 2,
+  className: ProblemsTable,
+  type: Div
+};
 const getProblemsTableVirtualDom = problems => {
-  const dom = [{
-    childCount: 2,
-    className: ProblemsTable,
-    type: Div
-  }, ...getProblemsTableHeaderVirtualDom(), ...getProblemsTableBodyVirtualDom(problems)];
+  const dom = [tableNode, ...getProblemsTableHeaderVirtualDom(), ...getProblemsTableBodyVirtualDom(problems)];
   return dom;
 };
 
+const messageNode = {
+  childCount: 1,
+  className: Message,
+  type: Div
+};
 const getProblemsVirtualDom$1 = (viewMode, problems, filterValue, message) => {
   if (problems.length === 0 && message) {
-    return [{
-      childCount: 1,
-      className: Message,
-      type: Div
-    }, text(message)];
+    return [messageNode, text(message)];
   }
   if (problems.length === 0 && filterValue) {
     return getNoResultsWithFilterVirtualDom();
@@ -2363,14 +2417,17 @@ const getProblemsVirtualDom$1 = (viewMode, problems, filterValue, message) => {
   return getProblemsListVirtualDom(problems);
 };
 
-const getProblemsVirtualDom = (viewMode, problems, filterValue, isSmall, message) => {
+const Focusable = 0;
+
+const getProblemsVirtualDom = (activeUri, viewMode, problems, filterValue, isSmall, message) => {
   const baseDom = {
     childCount: isSmall ? 2 : 1,
     className: mergeClassNames(Viewlet, Problems),
+    'data-activeUri': activeUri,
     onBlur: HandleBlur,
     onContextMenu: HandleContextMenu,
     onPointerDown: HandlePointerDown,
-    tabIndex: 0,
+    tabIndex: Focusable,
     type: Div
   };
   const filterDom = isSmall ? getProblemsFilterVirtualDom({
@@ -2457,6 +2514,7 @@ const getVisibleProblems = (problems, collapsedUris, focusedIndex, filterValue)
 
 const renderItems = (oldState, newState) => {
   const {
+    activeUri,
     collapsedUris,
     filterValue,
     focusedIndex,
@@ -2468,7 +2526,7 @@ const renderItems = (oldState, newState) => {
   } = newState;
   const visible = getVisibleProblems(problems, collapsedUris, focusedIndex, filterValue);
   const isSmall = width <= smallWidthBreakPoint;
-  const dom = getProblemsVirtualDom(viewMode, visible, filterValue, isSmall, message);
+  const dom = getProblemsVirtualDom(activeUri, viewMode, visible, filterValue, isSmall, message);
   return ['Viewlet.setDom2', dom];
 };
 
@@ -2646,6 +2704,7 @@ const commandMap = {
   'Problems.getKeyBindings': getKeyBindings,
   'Problems.getMenuEntries2': wrapGetter(getMenuEntries2),
   'Problems.getMenuIds': getMenuIds,
+  'Problems.handleActiveEditorChange': wrapCommand(handleActiveEditorChange),
   'Problems.handleArrowLeft': wrapCommand(handleArrowLeft),
   'Problems.handleArrowRight': wrapCommand(handleArrowRight),
   'Problems.handleBlur': wrapCommand(handleBlur),

package/package.json

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