@lvce-editor/status-bar-worker 3.31.3 → 3.31.5

package/dist/settings.json

@@ -5,7 +5,7 @@
     "heading": "Show Status Bar Items",
     "id": "statusBar.itemsVisible",
     "type": "boolean",
-    "value": "true"
+    "value": true
   },
   {
     "category": "workbench",
@@ -13,7 +13,7 @@
     "heading": "Show Notifications Status",
     "id": "statusBar.builtinNotificationsEnabled",
     "type": "boolean",
-    "value": "true"
+    "value": true
   },
   {
     "category": "workbench",
@@ -21,6 +21,6 @@
     "heading": "Show Problems Status",
     "id": "statusBar.builtinProblemsEnabled",
     "type": "boolean",
-    "value": "true"
+    "value": true
   }
 ]

package/dist/statusBarWorkerMain.js

@@ -641,18 +641,18 @@ const getMatchingItem = (itemsLeft, itemsRight, name) => {
   return getMatchingItemInternal(itemsLeft, name) ?? getMatchingItemInternal(itemsRight, name);
 };
 
-const EditorEncoding = 'EditorEncoding';
-const EditorEndOfLine = 'EditorEndOfLine';
+const EditorEncoding$1 = 'EditorEncoding';
+const EditorEndOfLine$1 = 'EditorEndOfLine';
 const EditorIndentation = 'EditorIndentation';
-const EditorLanguage = 'EditorLanguage';
-const EditorPosition = 'EditorPosition';
-const Notifications = 'Notifications';
-const Problems = 'Problems';
+const EditorLanguage$1 = 'EditorLanguage';
+const EditorPosition$1 = 'EditorPosition';
+const Notifications$1 = 'Notifications';
+const Problems$1 = 'Problems';
 const isEditorStatus = name => {
-  return [EditorEncoding, EditorEndOfLine, EditorIndentation, EditorLanguage, EditorPosition].includes(name);
+  return [EditorEncoding$1, EditorEndOfLine$1, EditorIndentation, EditorLanguage$1, EditorPosition$1].includes(name);
 };
 const isRight = name => {
-  return name === Notifications || isEditorStatus(name);
+  return name === Notifications$1 || isEditorStatus(name);
 };
 
 const state$1 = {
@@ -673,16 +673,16 @@ const handleClickEditorStatus = async (name, status) => {
     return;
   }
   switch (name) {
-    case EditorEndOfLine:
+    case EditorEndOfLine$1:
       await invoke$4('QuickPick.openStatusBarPicker', 'end-of-line');
       return;
     case EditorIndentation:
       await invoke$4('QuickPick.openStatusBarPicker', 'indentation');
       return;
-    case EditorLanguage:
+    case EditorLanguage$1:
       await invoke$4('QuickPick.openStatusBarPicker', 'language-mode');
       return;
-    case EditorPosition:
+    case EditorPosition$1:
       await invoke$4('QuickPick.openStatusBarPicker', 'go-to-line', status.line, status.column);
       return;
   }
@@ -1946,9 +1946,9 @@ const handleClick = async (state, name) => {
   if (!item) {
     return state;
   }
-  if (item.name === Notifications) {
+  if (item.name === Notifications$1) {
     await handleClickNotification();
-  } else if (item.name === Problems) {
+  } else if (item.name === Problems$1) {
     await handleClickProblems();
   } else if (isEditorStatus(item.name)) {
     await handleClickEditorStatus(item.name, editorStatus);
@@ -2011,6 +2011,125 @@ const setVisible = value => {
   visible = value;
 };
 
+const emptyObject = {};
+const i18nString = (key, placeholders = emptyObject) => {
+  if (placeholders === emptyObject) {
+    return key;
+  }
+  let result = key;
+  for (const [placeholder, replacement] of Object.entries(placeholders)) {
+    result = result.split(`{${placeholder}}`).join(String(replacement));
+  }
+  return result;
+};
+
+const EditorPosition = 'Ln {PH1}, Col {PH2}';
+const EditorPositionWithSelection = 'Ln {PH1}, Col {PH2} ({PH3} selected)';
+const EditorPositionAriaLabel = 'Line {PH1}, Column {PH2}';
+const EditorPositionWithSelectionAriaLabel = 'Line {PH1}, Column {PH2}, {PH3} selected';
+const EditorIndentationSpaces = 'Spaces: {PH1}';
+const EditorIndentationTabs = 'Tab Size: {PH1}';
+const EditorEncoding = 'Encoding: {PH1}';
+const EditorEndOfLine = 'End of Line: {PH1}';
+const EditorLanguage = 'Language: {PH1}';
+const GoToLineColumn = 'Go to Line/Column';
+const SelectIndentation = 'Select Indentation';
+const SelectEncoding = 'Select Encoding';
+const SelectEndOfLineSequence = 'Select End of Line Sequence';
+const SelectLanguageMode = 'Select Language Mode';
+const Problem = '{PH1} Problem';
+const Problems = '{PH1} Problems';
+const Warning = '{PH1} Warning';
+const Warnings = '{PH1} Warnings';
+const ProblemsAriaLabel = '{PH1}, {PH2}';
+const NoProblems = 'No Problems';
+const ProblemsTooltip = 'Problems';
+const Notification = '{PH1} Notification';
+const Notifications = '{PH1} Notifications';
+const NoNotifications = 'No Notifications';
+
+const editorPosition = (line, column) => {
+  return i18nString(EditorPosition, {
+    PH1: line,
+    PH2: column
+  });
+};
+const editorPositionWithSelection = (line, column, selectedChars) => {
+  return i18nString(EditorPositionWithSelection, {
+    PH1: line,
+    PH2: column,
+    PH3: selectedChars
+  });
+};
+const editorPositionAriaLabel = (line, column) => {
+  return i18nString(EditorPositionAriaLabel, {
+    PH1: line,
+    PH2: column
+  });
+};
+const editorPositionWithSelectionAriaLabel = (line, column, selectedChars) => {
+  return i18nString(EditorPositionWithSelectionAriaLabel, {
+    PH1: line,
+    PH2: column,
+    PH3: selectedChars
+  });
+};
+const editorIndentationSpaces = tabSize => {
+  return i18nString(EditorIndentationSpaces, {
+    PH1: tabSize
+  });
+};
+const editorIndentationTabs = tabSize => {
+  return i18nString(EditorIndentationTabs, {
+    PH1: tabSize
+  });
+};
+const editorEncoding = encoding => {
+  return i18nString(EditorEncoding, {
+    PH1: encoding
+  });
+};
+const editorEndOfLine = endOfLine => {
+  return i18nString(EditorEndOfLine, {
+    PH1: endOfLine
+  });
+};
+const editorLanguage = languageId => {
+  return i18nString(EditorLanguage, {
+    PH1: languageId
+  });
+};
+const goToLineColumn = () => i18nString(GoToLineColumn);
+const selectIndentation = () => i18nString(SelectIndentation);
+const selectEncoding = () => i18nString(SelectEncoding);
+const selectEndOfLineSequence = () => i18nString(SelectEndOfLineSequence);
+const selectLanguageMode = () => i18nString(SelectLanguageMode);
+const problem = count => i18nString(Problem, {
+  PH1: count
+});
+const problems = count => i18nString(Problems, {
+  PH1: count
+});
+const warning = count => i18nString(Warning, {
+  PH1: count
+});
+const warnings = count => i18nString(Warnings, {
+  PH1: count
+});
+const problemsAriaLabel = (problemLabel, warningLabel) => i18nString(ProblemsAriaLabel, {
+  PH1: problemLabel,
+  PH2: warningLabel
+});
+const noProblems = () => i18nString(NoProblems);
+const problemsTooltip = () => i18nString(ProblemsTooltip);
+const notification = count => i18nString(Notification, {
+  PH1: count
+});
+const notifications = count => i18nString(Notifications, {
+  PH1: count
+});
+const noNotifications = () => i18nString(NoNotifications);
+
 const textItem = (name, text, ariaLabel, tooltip) => ({
   ariaLabel,
   command: '',
@@ -2036,19 +2155,19 @@ const getEditorStatusBarItems = status => {
     tabSize
   } = status;
   const encodingLabel = encoding === 'utf8' ? ['UTF', '8'].join('-') : encoding;
-  const indentationLabel = insertSpaces ? `Spaces: ${tabSize}` : `Tab Size: ${tabSize}`;
+  const indentationLabel = insertSpaces ? editorIndentationSpaces(tabSize) : editorIndentationTabs(tabSize);
   const endOfLineLabel = endOfLine.toUpperCase();
-  const positionLabel = selectedChars > 0 ? `Ln ${line}, Col ${column} (${selectedChars} selected)` : `Ln ${line}, Col ${column}`;
-  const positionAriaLabel = selectedChars > 0 ? `Line ${line}, Column ${column}, ${selectedChars} selected` : `Line ${line}, Column ${column}`;
-  return [textItem(EditorPosition, positionLabel, positionAriaLabel, 'Go to Line/Column'), textItem(EditorIndentation, indentationLabel, indentationLabel, 'Select Indentation'), textItem(EditorEncoding, encodingLabel, `Encoding: ${encodingLabel}`, 'Select Encoding'), textItem(EditorEndOfLine, endOfLineLabel, `End of Line: ${endOfLineLabel}`, 'Select End of Line Sequence'), textItem(EditorLanguage, languageId, `Language: ${languageId}`, 'Select Language Mode')];
+  const positionLabel = selectedChars > 0 ? editorPositionWithSelection(line, column, selectedChars) : editorPosition(line, column);
+  const positionAriaLabel = selectedChars > 0 ? editorPositionWithSelectionAriaLabel(line, column, selectedChars) : editorPositionAriaLabel(line, column);
+  return [textItem(EditorPosition$1, positionLabel, positionAriaLabel, goToLineColumn()), textItem(EditorIndentation, indentationLabel, indentationLabel, selectIndentation()), textItem(EditorEncoding$1, encodingLabel, editorEncoding(encodingLabel), selectEncoding()), textItem(EditorEndOfLine$1, endOfLineLabel, editorEndOfLine(endOfLineLabel), selectEndOfLineSequence()), textItem(EditorLanguage$1, languageId, editorLanguage(languageId), selectLanguageMode())];
 };
 
 const dependencies = {
-  [EditorEncoding]: ['encoding'],
-  [EditorEndOfLine]: ['endOfLine'],
+  [EditorEncoding$1]: ['encoding'],
+  [EditorEndOfLine$1]: ['endOfLine'],
   [EditorIndentation]: ['insertSpaces', 'tabSize'],
-  [EditorLanguage]: ['languageId'],
-  [EditorPosition]: ['line', 'column', 'selectedChars']
+  [EditorLanguage$1]: ['languageId'],
+  [EditorPosition$1]: ['line', 'column', 'selectedChars']
 };
 const handleEditorStatusChanged = (state, editorStatus, previous = state) => {
   const {
@@ -2079,7 +2198,7 @@ const handleEditorStatusChanged = (state, editorStatus, previous = state) => {
     replacements.delete(item.name);
     return replacement || item;
   });
-  const notificationIndex = updatedItems.findIndex(item => item.name === Notifications);
+  const notificationIndex = updatedItems.findIndex(item => item.name === Notifications$1);
   updatedItems.splice(notificationIndex === -1 ? updatedItems.length : notificationIndex, 0, ...replacements.values());
   return {
     ...state,
@@ -2239,12 +2358,12 @@ const handleEditorStatusVisibilityChangedAll = async visible => {
 
 const getAriaLabel = count => {
   if (count === 0) {
-    return 'No Notifications';
+    return noNotifications();
   }
   if (count === 1) {
-    return '1 Notification';
+    return notification(count);
   }
-  return `${count} Notifications`;
+  return notifications(count);
 };
 const getNotificationsStatusBarItem = (enabled, count = 0) => {
   if (!enabled) {
@@ -2260,7 +2379,7 @@ const getNotificationsStatusBarItem = (enabled, count = 0) => {
       type: 'text',
       value: String(count)
     }] : [])],
-    name: Notifications,
+    name: Notifications$1,
     tooltip: getAriaLabel(count)
   }];
 };
@@ -2268,15 +2387,18 @@ const getNotificationsStatusBarItem = (enabled, count = 0) => {
 const getProblemsAriaLabel = (errorCount, warningCount) => {
   const parts = [];
   if (errorCount > 0) {
-    parts.push(`${errorCount} ${errorCount === 1 ? 'Problem' : 'Problems'}`);
+    parts.push(errorCount === 1 ? problem(errorCount) : problems(errorCount));
   }
   if (warningCount > 0) {
-    parts.push(`${warningCount} ${warningCount === 1 ? 'Warning' : 'Warnings'}`);
+    parts.push(warningCount === 1 ? warning(warningCount) : warnings(warningCount));
   }
   if (parts.length === 0) {
-    return 'No Problems';
+    return noProblems();
+  }
+  if (parts.length === 1) {
+    return parts[0];
   }
-  return parts.join(', ');
+  return problemsAriaLabel(parts[0], parts[1]);
 };
 
 const getProblemsStatusBarItem = (errorCount, warningCount, enabled) => {
@@ -2300,8 +2422,8 @@ const getProblemsStatusBarItem = (errorCount, warningCount, enabled) => {
       type: 'text',
       value: String(warningCount)
     }],
-    name: Problems,
-    tooltip: 'Problems'
+    name: Problems$1,
+    tooltip: problemsTooltip()
   }];
 };
 
@@ -2449,7 +2571,7 @@ const handleExtensionsChanged = async state => {
   if (refreshVersions[uid] !== refreshVersion) {
     return state;
   }
-  const builtinProblemsItem = statusBarItemsLeft.find(item => item.name === Problems);
+  const builtinProblemsItem = statusBarItemsLeft.find(item => item.name === Problems$1);
   return {
     ...state,
     statusBarItemsLeft: builtinProblemsItem ? [...statusBarItems, builtinProblemsItem] : [...statusBarItems]
@@ -2485,7 +2607,7 @@ const handleNotificationCountChanged = (state, count) => {
   const {
     statusBarItemsRight
   } = state;
-  const notificationsEnabled = statusBarItemsRight.some(item => item.name === Notifications);
+  const notificationsEnabled = statusBarItemsRight.some(item => item.name === Notifications$1);
   if (!notificationsEnabled) {
     return state;
   }
@@ -2495,7 +2617,7 @@ const handleNotificationCountChanged = (state, count) => {
   }
   return {
     ...state,
-    statusBarItemsRight: statusBarItemsRight.map(item => item.name === Notifications ? notificationItem : item)
+    statusBarItemsRight: statusBarItemsRight.map(item => item.name === Notifications$1 ? notificationItem : item)
   };
 };
 
@@ -2573,7 +2695,7 @@ const handleProblemsSummaryChange = (state, summary) => {
     return state;
   }
   const problemsItem = getProblemsStatusBarItem(errorCount, warningCount, true)[0];
-  const statusBarItemsLeft = oldStatusBarItemsLeft.map(item => item.name === Problems ? problemsItem : item);
+  const statusBarItemsLeft = oldStatusBarItemsLeft.map(item => item.name === Problems$1 ? problemsItem : item);
   return {
     ...state,
     errorCount,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/status-bar-worker",
-  "version": "3.31.3",
+  "version": "3.31.5",
   "description": "Status Bar Worker",
   "repository": {
     "type": "git",
@@ -9,5 +9,8 @@
   "license": "MIT",
   "author": "Lvce Editor",
   "type": "module",
-  "main": "dist/statusBarWorkerMain.js"
+  "main": "dist/statusBarWorkerMain.js",
+  "dependencies": {
+    "@lvce-editor/i18n": "^2.10.0"
+  }
 }