@lvce-editor/editor-worker 19.77.6 → 19.77.8

package/dist/diff-sdk.js

@@ -7650,11 +7650,10 @@ const getLanguageId$1 = (uri, languages) => {
   return 'unknown';
 };
 
-const getLanguages = async (platform, assetDir) => {
+const getLanguages = async (platform, assetDir, applicationId) => {
   number(platform);
   string(assetDir);
-  const languages = await ExtensionManagementWorker.getLanguages(platform, assetDir);
-  return languages;
+  return invoke$9(applicationId, 'Extensions.getLanguages', platform, assetDir);
 };
 
 const cacheName = 'lvce-editor-character-widths-v1';
@@ -7749,7 +7748,7 @@ const createEditor = async ({
   string(content);
   // TODO support overwriting language id by setting it explicitly or via settings
   const charWidth = await measureCharacterWidth(fontWeight, fontSize, fontFamily, letterSpacing);
-  const languages = await getLanguages(platform, assetDir);
+  const languages = await getLanguages(platform, assetDir, applicationId);
   const computedlanguageId = getLanguageId$1(uri, languages);
   const editor = {
     ...(applicationId !== undefined && {
@@ -19030,7 +19029,7 @@ const loadContent = async (state, savedState, largeFile = false, focus = true, f
   } = await getEditorPreferences(state.applicationId);
   // TODO support overwriting language id by setting it explicitly or via settings
   const charWidth = await measureCharacterWidth(fontWeight, fontSize, fontFamily, letterSpacing);
-  const languages = await getLanguages(platform, assetDir);
+  const languages = await getLanguages(platform, assetDir, state.applicationId);
   setTokenizePaths(languages);
   const explicitLanguageId = getSavedLanguageId(savedState, languages);
   const computedLanguageId = explicitLanguageId || getLanguageId$1(uri, languages);
@@ -19688,8 +19687,23 @@ const getDiagnosticVirtualDom = diagnostic => {
   }];
 };
 
+const sortDiagnosticsBySeverity = diagnostics => {
+  return diagnostics.toSorted((left, right) => {
+    if (left.type === right.type) {
+      return 0;
+    }
+    if (left.type === 'warning') {
+      return -1;
+    }
+    if (right.type === 'warning') {
+      return 1;
+    }
+    return 0;
+  });
+};
+
 const getDiagnosticsVirtualDom = diagnostics => {
-  const dom = diagnostics.flatMap(getDiagnosticVirtualDom);
+  const dom = sortDiagnosticsBySeverity(diagnostics).flatMap(getDiagnosticVirtualDom);
   return dom;
 };
 
@@ -19984,7 +19998,7 @@ const getEditorScrollBarDiagnosticsVirtualDom = scrollBarDiagnostics => {
     childCount: scrollBarDiagnostics.length,
     className: 'ScrollBarDiagnostics',
     type: Div
-  }, ...scrollBarDiagnostics.map(({
+  }, ...scrollBarDiagnostics.toSorted((left, right) => left.top - right.top || (left.type === 'warning' && right.type !== 'warning' ? -1 : right.type === 'warning' && left.type !== 'warning' ? 1 : 0)).map(({
     height,
     top,
     type

package/dist/editorWorkerMain.js

@@ -1360,9 +1360,6 @@ const {
   invokeAndTransfer: invokeAndTransfer$2,
   set: set$g
 } = create$c(ExtensionManagementWorker);
-const getLanguages$1 = (platform, assetDir) => {
-  return invoke$h('Extensions.getLanguages', platform, assetDir);
-};
 
 const createLazyRpc = rpcId => {
   let activeRpc;
@@ -8078,11 +8075,10 @@ const getLanguageId$1 = (uri, languages) => {
   return 'unknown';
 };
 
-const getLanguages = async (platform, assetDir) => {
+const getLanguages = async (platform, assetDir, applicationId) => {
   number(platform);
   string(assetDir);
-  const languages = await getLanguages$1(platform, assetDir);
-  return languages;
+  return invoke$9(applicationId, 'Extensions.getLanguages', platform, assetDir);
 };
 
 const cacheName = 'lvce-editor-character-widths-v1';
@@ -8177,7 +8173,7 @@ const createEditor = async ({
   string(content);
   // TODO support overwriting language id by setting it explicitly or via settings
   const charWidth = await measureCharacterWidth(fontWeight, fontSize, fontFamily, letterSpacing);
-  const languages = await getLanguages(platform, assetDir);
+  const languages = await getLanguages(platform, assetDir, applicationId);
   const computedlanguageId = getLanguageId$1(uri, languages);
   const editor = {
     ...(applicationId !== undefined && {
@@ -19449,7 +19445,7 @@ const loadContent = async (state, savedState, largeFile = false, focus = true, f
   } = await getEditorPreferences(state.applicationId);
   // TODO support overwriting language id by setting it explicitly or via settings
   const charWidth = await measureCharacterWidth(fontWeight, fontSize, fontFamily, letterSpacing);
-  const languages = await getLanguages(platform, assetDir);
+  const languages = await getLanguages(platform, assetDir, state.applicationId);
   setTokenizePaths(languages);
   const explicitLanguageId = getSavedLanguageId(savedState, languages);
   const computedLanguageId = explicitLanguageId || getLanguageId$1(uri, languages);
@@ -20107,8 +20103,23 @@ const getDiagnosticVirtualDom = diagnostic => {
   }];
 };
 
+const sortDiagnosticsBySeverity = diagnostics => {
+  return diagnostics.toSorted((left, right) => {
+    if (left.type === right.type) {
+      return 0;
+    }
+    if (left.type === 'warning') {
+      return -1;
+    }
+    if (right.type === 'warning') {
+      return 1;
+    }
+    return 0;
+  });
+};
+
 const getDiagnosticsVirtualDom = diagnostics => {
-  const dom = diagnostics.flatMap(getDiagnosticVirtualDom);
+  const dom = sortDiagnosticsBySeverity(diagnostics).flatMap(getDiagnosticVirtualDom);
   return dom;
 };
 
@@ -20403,7 +20414,7 @@ const getEditorScrollBarDiagnosticsVirtualDom = scrollBarDiagnostics => {
     childCount: scrollBarDiagnostics.length,
     className: 'ScrollBarDiagnostics',
     type: Div
-  }, ...scrollBarDiagnostics.map(({
+  }, ...scrollBarDiagnostics.toSorted((left, right) => left.top - right.top || (left.type === 'warning' && right.type !== 'warning' ? -1 : right.type === 'warning' && left.type !== 'warning' ? 1 : 0)).map(({
     height,
     top,
     type

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "19.77.6",
+  "version": "19.77.8",
   "repository": {
     "type": "git",
     "url": "git@github.com:lvce-editor/editor-worker.git"