@lvce-editor/test-worker 15.10.0 → 16.1.0

package/dist/api.d.ts

@@ -145,9 +145,35 @@ export interface Diagnostic {
 	readonly endRowIndex: number;
 	readonly message: string;
 	readonly rowIndex: number;
+	readonly source?: string;
 	readonly type: "error" | "warning";
 }
 
+export interface FormattingTextDocument {
+	readonly documentId?: number;
+	readonly languageId: string;
+	readonly text?: string;
+	readonly uri?: string;
+}
+
+export interface CompletionTextDocument {
+	readonly documentId?: number;
+	readonly languageId: string;
+	readonly text?: string;
+	readonly uri?: string;
+}
+
+export interface FormattingEdit {
+	readonly endOffset: number;
+	readonly inserted: string;
+	readonly startOffset: number;
+}
+
+export interface CompletionItem {
+	readonly label: string;
+	readonly [key: string]: unknown;
+}
+
 export interface FileSystemTmpDirOptions {
 	readonly scheme?: string;
 }
@@ -183,6 +209,10 @@ export interface LayoutExpectation extends LayoutExpectationObject {
 	readonly groups?: readonly LayoutExpectationObject[];
 }
 
+export interface SelectItemOptions {
+	readonly waitUntil?: SelectItemWaitUntil;
+}
+
 export interface SelectItem2Options {
 	readonly callbackCommand: string;
 	readonly label: string;
@@ -233,6 +263,8 @@ export type SavedState = {
 	readonly layout?: LayoutState;
 };
 
+export type SelectItemWaitUntil = "done" | "quickPick" | "none";
+
 export type SearchInputType = "SearchValue" | "ReplaceValue" | "IncludeValue" | "ExcludeValue";
 
 interface Workspace {
@@ -400,6 +432,7 @@ interface ColorPicker {
 
 interface Command {
   readonly execute: (id: string, ...args: readonly any[]) => Promise<any>;
+  readonly executeExtensionCommand: (commandId: string, ...args: readonly any[]) => Promise<unknown>;
 }
 
 interface ContextMenu {
@@ -505,6 +538,7 @@ interface Editor {
   readonly setDeltaY: (deltaY: number) => Promise<void>;
   readonly setSelections: (selections: any) => Promise<void>;
   readonly setText: (text: string) => Promise<void>;
+  readonly shouldHaveDiagnosticProviderResult: (expectedDiagnostics: readonly Diagnostic[], editorId?: number) => Promise<void>;
   readonly shouldHaveDiagnostics: (expectedDiagnostics: readonly Diagnostic[]) => Promise<void>;
   readonly shouldHaveSelections: (expectedSelections: Uint32Array) => Promise<void>;
   readonly shouldHaveText: (expectedText: string) => Promise<void>;
@@ -591,6 +625,8 @@ interface Explorer {
 interface Extension {
   readonly addNodeExtension: (relativePath: string) => Promise<void>;
   readonly addWebExtension: (relativePath: string) => Promise<void>;
+  readonly executeCompletionProvider: (textDocument: CompletionTextDocument, ...args: readonly unknown[]) => Promise<readonly CompletionItem[]>;
+  readonly executeFormattingProvider: (textDocument: FormattingTextDocument, ...args: readonly unknown[]) => Promise<readonly FormattingEdit[]>;
 }
 
 interface ExtensionDetail {
@@ -862,7 +898,7 @@ interface QuickPick {
   readonly open: () => Promise<void>;
   readonly selectCurrentIndex: () => Promise<void>;
   readonly selectIndex: (index: number) => Promise<void>;
-  readonly selectItem: (label: string) => Promise<void>;
+  readonly selectItem: (label: string, { waitUntil }?: SelectItemOptions) => Promise<void>;
   readonly selectItem2: ({ callbackCommand, label }: SelectItem2Options) => Promise<void>;
   readonly setValue: (value: string) => Promise<void>;
 }

package/dist/testWorkerMain.js

@@ -1091,7 +1091,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$7 = (id, rpc) => {
+const set$8 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$2 = id => {
@@ -1124,7 +1124,7 @@ const create = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$7(rpcId, mockRpc);
+      set$8(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove$1(rpcId);
@@ -1133,7 +1133,7 @@ const create = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$7(rpcId, rpc);
+      set$8(rpcId, rpc);
     }
   };
 };
@@ -1147,16 +1147,22 @@ const Web = 1;
 const Remote = 3;
 
 const EditorWorker = 99;
+const ErrorWorker = 3308;
 const ExtensionHostWorker = 44;
 const ExtensionManagementWorker = 9006;
 const OpenerWorker = 4561;
 const RendererWorker = 1;
 const TestWorker = 9001;
 
+const {
+  invoke: invoke$4,
+  set: set$7
+} = create(EditorWorker);
+
 const {
   invoke: invoke$3,
   set: set$6
-} = create(EditorWorker);
+} = create(ErrorWorker);
 
 const {
   set: set$5
@@ -1185,6 +1191,10 @@ const sendMessagePortToOpenerWorker = async (port, rpcId) => {
   const command = 'HandleMessagePort.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToOpenerWorker', port, command, rpcId);
 };
+const sendMessagePortToErrorWorker = async (port, rpcId) => {
+  const command = 'Errors.handleMessagePort';
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToErrorWorker', port, command, rpcId);
+};
 const readFile$1 = async uri => {
   return invoke('FileSystem.readFile', uri);
 };
@@ -1200,10 +1210,21 @@ const getPreference = async key => {
   return await invoke('Preferences.get', key);
 };
 
-const send$3 = async port => {
+const send$4 = async port => {
   await sendMessagePortToEditorWorker(port, TestWorker);
 };
 const initializeEditorWorker = async () => {
+  const rpc = await create$3({
+    commandMap: {},
+    send: send$4
+  });
+  set$7(rpc);
+};
+
+const send$3 = async port => {
+  await sendMessagePortToErrorWorker(port, TestWorker);
+};
+const initializeErrorWorker = async () => {
   const rpc = await create$3({
     commandMap: {},
     send: send$3
@@ -1900,9 +1921,13 @@ const ActivityBar = {
 const execute$1 = async (id, ...args) => {
   return invoke(id, ...args);
 };
+const executeExtensionCommand = async (commandId, ...args) => {
+  return invoke('ExtensionHost.executeCommand', commandId, ...args);
+};
 
 const Command = {
-  execute: execute$1
+  execute: execute$1,
+  executeExtensionCommand
 };
 
 const setReasoningPickerEnabled = async enabled => {
@@ -2778,7 +2803,7 @@ const DiffView = {
 };
 
 const isDiagnosticEqual = (actual, expected) => {
-  return actual.rowIndex === expected.rowIndex && actual.columnIndex === expected.columnIndex && actual.endRowIndex === expected.endRowIndex && actual.endColumnIndex === expected.endColumnIndex && actual.message === expected.message && actual.type === expected.type;
+  return actual.rowIndex === expected.rowIndex && actual.columnIndex === expected.columnIndex && actual.endRowIndex === expected.endRowIndex && actual.endColumnIndex === expected.endColumnIndex && actual.message === expected.message && actual.source === expected.source && actual.type === expected.type;
 };
 
 const areDiagnosticsEqual = (actual, expected) => {
@@ -2806,7 +2831,7 @@ const areSelectionsEqual = (a, b) => {
 };
 
 const getEditorKey = async () => {
-  const keys = await invoke$3('Editor.getKeys');
+  const keys = await invoke$4('Editor.getKeys');
   if (keys.length === 0) {
     throw new Error(`no editor found`);
   }
@@ -3072,11 +3097,11 @@ const growSelection = async () => {
 };
 const getSelections = async () => {
   const key = await getEditorKey();
-  return invoke$3('Editor.getSelections', key);
+  return invoke$4('Editor.getSelections', key);
 };
 const shouldHaveText = async expectedText => {
   const key = await getEditorKey();
-  const text = await invoke$3('Editor.getText', key);
+  const text = await invoke$4('Editor.getText', key);
   if (text !== expectedText) {
     throw new Error(`Expected editor to have text ${expectedText} but was ${text}`);
   }
@@ -3101,7 +3126,7 @@ const areTokensEqual = (actual, expected) => {
 };
 const shouldHaveTokens = async expectedTokens => {
   const key = await getEditorKey();
-  const text = await invoke$3('Editor.getTokens', key);
+  const text = await invoke$4('Editor.getTokens', key);
   if (!areTokensEqual(text, expectedTokens)) {
     const stringifiedActual = JSON.stringify(text);
     const stringifiedExpected = JSON.stringify(expectedTokens);
@@ -3110,26 +3135,34 @@ const shouldHaveTokens = async expectedTokens => {
 };
 const shouldHaveSelections = async expectedSelections => {
   const key = await getEditorKey();
-  const selections = await invoke$3('Editor.getSelections', key);
+  const selections = await invoke$4('Editor.getSelections', key);
   if (!areSelectionsEqual(selections, expectedSelections)) {
     throw new Error(`Expected editor to have selections ${expectedSelections} but was ${selections}`);
   }
 };
 const undo = async () => {
-  await invoke$3('Editor.undo');
+  await invoke$4('Editor.undo');
 };
 const redo = async () => {
-  await invoke$3('Editor.redo');
+  await invoke$4('Editor.redo');
 };
 const shouldHaveDiagnostics = async expectedDiagnostics => {
   const key = await getEditorKey();
-  const diagnostics = await invoke$3('Editor.getDiagnostics', key);
+  const diagnostics = await invoke$4('Editor.getDiagnostics', key);
   if (!areDiagnosticsEqual(diagnostics, expectedDiagnostics)) {
     const stringifiedActual = JSON.stringify(diagnostics);
     const stringifiedExpected = JSON.stringify(expectedDiagnostics);
     throw new Error(`Expected editor to have diagnostics ${stringifiedExpected} but was ${stringifiedActual}`);
   }
 };
+const shouldHaveDiagnosticProviderResult = async (expectedDiagnostics, editorId = 1) => {
+  const diagnostics = await invoke('ExtensionHost.executeDiagnosticProvider', editorId);
+  if (!areDiagnosticsEqual(diagnostics, expectedDiagnostics)) {
+    const stringifiedActual = JSON.stringify(diagnostics);
+    const stringifiedExpected = JSON.stringify(expectedDiagnostics);
+    throw new Error(`Expected diagnostic provider result ${stringifiedExpected} but was ${stringifiedActual}`);
+  }
+};
 const enableCompletionsOnType = async () => {
   await update$1({
     'editor.completionsOnType': true
@@ -3226,6 +3259,7 @@ const Editor = {
   setDeltaY: setDeltaY$1,
   setSelections,
   setText,
+  shouldHaveDiagnosticProviderResult,
   shouldHaveDiagnostics,
   shouldHaveSelections,
   shouldHaveText,
@@ -3479,6 +3513,12 @@ const addWebExtension = async relativePath => {
   await invoke$2('Extensions.addWebExtension', absolutePath);
   await invoke('ExtensionMeta.addWebExtension', absolutePath);
 };
+const executeFormattingProvider = async (textDocument, ...args) => {
+  return invoke$2('Extensions.executeFormattingProvider', textDocument, ...args);
+};
+const executeCompletionProvider = async (textDocument, ...args) => {
+  return invoke$2('Extensions.executeCompletionProvider', textDocument, ...args);
+};
 const addNodeExtension = async relativePath => {
   // TODO compute absolutePath
   const absolutePath = relativePath;
@@ -3487,7 +3527,9 @@ const addNodeExtension = async relativePath => {
 
 const Extension = {
   addNodeExtension,
-  addWebExtension
+  addWebExtension,
+  executeCompletionProvider,
+  executeFormattingProvider
 };
 
 const handleClickCategory = async categoryId => {
@@ -3963,10 +4005,6 @@ const FindWidget = {
   toggleUseRegularExpression: toggleUseRegularExpression$1
 };
 
-const executeExtensionCommand = async (commandId, ...args) => {
-  return invoke('ExtensionHost.executeCommand', commandId, ...args);
-};
-
 const init = async (options = {}) => {
   await executeExtensionCommand('git.init', options);
 };
@@ -4609,8 +4647,21 @@ const focusIndex$2 = async index => {
 const focusPrevious$2 = async () => {
   await invoke('QuickPick.focusPrevious');
 };
-const selectItem = async label => {
-  await invoke('QuickPick.selectItem', label);
+const selectItem = async (label, {
+  waitUntil = 'done'
+} = {}) => {
+  if (waitUntil === 'done') {
+    await invoke('QuickPick.selectItem', label);
+    return;
+  }
+  const visiblePromise = waitUntil === 'quickPick' ? invoke('QuickPick.waitUntilVisible') : undefined;
+  const promise = Promise.resolve(invoke('QuickPick.selectItem', label));
+  if (waitUntil === 'none') {
+    void promise.catch(() => undefined);
+    return;
+  }
+  void promise.catch(() => undefined);
+  await visiblePromise;
 };
 const selectIndex$3 = async index => {
   await invoke('QuickPick.selectIndex', index);
@@ -5302,9 +5353,18 @@ const printError = error => {
   }
 };
 
+const prepareError = 'Errors.prepare';
+const formatPreparedError = preparedError => {
+  const codeFrame = preparedError.codeframe || preparedError.codeFrame;
+  return [preparedError.message, codeFrame, preparedError.stack].filter(Boolean).join('\n');
+};
 const printTestError = async error => {
-  // TODO ask error worker to add codeframe
-  printError(error);
+  try {
+    const preparedError = await invoke$3(prepareError, error);
+    console.error(formatPreparedError(preparedError));
+  } catch {
+    printError(error);
+  }
 };
 
 const now = () => {
@@ -5863,7 +5923,7 @@ const initializeRendererWorker = async () => {
 };
 
 const listen = async () => {
-  await Promise.all([initializeRendererWorker(), initializeEditorWorker(), initializeOpenerWorker(), initializeExtensionManagementWorker(), initializeExtensionHostWorker()]);
+  await Promise.all([initializeEditorWorker(), initializeErrorWorker(), initializeExtensionHostWorker(), initializeExtensionManagementWorker(), initializeOpenerWorker(), initializeRendererWorker()]);
 };
 
 const main = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/test-worker",
-  "version": "15.10.0",
+  "version": "16.1.0",
   "description": "Test Worker",
   "repository": {
     "type": "git",