@lvce-editor/completion-worker 1.1.0 → 1.2.0

package/dist/completionWorkerMain.js

@@ -1020,7 +1020,7 @@ const {
   wrapCommand
 } = create$2();
 
-const create$1 = (uid, x, y, width, height, parentUid) => {
+const create$1 = (uid, x, y, width, height, editorUid, editorLanguageId) => {
   const state = {
     uid,
     items: [],
@@ -1039,7 +1039,9 @@ const create$1 = (uid, x, y, width, height, parentUid) => {
     headerHeight: 0,
     leadingWord: '',
     unfilteredItems: [],
-    version: 0
+    version: 0,
+    editorUid,
+    editorLanguageId
   };
   set$2(uid, state, state);
 };
@@ -1189,22 +1191,24 @@ const activateByEvent = async event => {
 };
 
 const execute = async ({
-  editor,
+  editorLanguageId,
+  editorUid,
   args,
   event,
   method,
   noProviderFoundMessage,
   noProviderFoundResult = undefined
 }) => {
-  const fullEvent = `${event}:${editor.languageId}`;
+  const fullEvent = `${event}:${editorLanguageId}`;
   await activateByEvent(fullEvent);
-  const result = await invoke(method, editor.uid, ...args);
+  const result = await invoke(method, editorUid, ...args);
   return result;
 };
 
-const executeCompletionProvider = async (editor, offset) => {
+const executeCompletionProvider = async (editorUid, editorLanguageId, offset) => {
   return execute({
-    editor,
+    editorUid,
+    editorLanguageId,
     event: OnCompletion,
     method: CompletionExecute,
     args: [offset],
@@ -1212,15 +1216,15 @@ const executeCompletionProvider = async (editor, offset) => {
     noProviderFoundResult: []});
 };
 
-const getOffsetAtCursor = editor => {
-  // TODO
+const getOffsetAtCursor = editorUid => {
+  // TODO ask editor worker
   return 0;
 };
 
 // TODO possible to do this with events/state machine instead of promises -> enables canceling operations / concurrent calls
-const getCompletions = async editor => {
+const getCompletions = async (editorUid, editorLanguageId) => {
   const offset = getOffsetAtCursor();
-  const completions = await executeCompletionProvider(editor, offset);
+  const completions = await executeCompletionProvider(editorUid, editorLanguageId, offset);
   return completions;
 };
 
@@ -1442,41 +1446,28 @@ const getPositionAtCursor = async parentUid => {
   return position;
 };
 
-const RE_WORD = /[\w\-]+$/;
-const getWordAtOffset = editor => {
-  const {
-    lines,
-    selections
-  } = editor;
-  const rowIndex = selections[0];
-  const columnIndex = selections[1];
-  const line = lines[rowIndex];
-  const part = line.slice(0, columnIndex);
-  const wordMatch = part.match(RE_WORD);
-  if (wordMatch) {
-    return wordMatch[0];
-  }
+const getWordAtOffset = async editorUid => {
+  // TODO ask editor worker
   return '';
 };
 
 const loadContent = async state => {
-  const editor = {}; // TODO
   const {
     itemHeight,
-    maxHeight
+    maxHeight,
+    editorUid,
+    editorLanguageId
   } = state;
-  const unfilteredItems = await getCompletions(editor);
-  const wordAtOffset = getWordAtOffset(editor);
+  const unfilteredItems = await getCompletions(editorUid, editorLanguageId);
+  const wordAtOffset = await getWordAtOffset();
   const items = filterCompletionItems(unfilteredItems, wordAtOffset);
   const {
     rowIndex,
     columnIndex,
     x,
     y
-  } = await getPositionAtCursor(editor);
+  } = await getPositionAtCursor(editorUid);
   const newMaxLineY = Math.min(items.length, 8);
-  editor.widgets = editor.widgets || [];
-  // editor.widgets.push(ViewletModuleId.EditorCompletion)
   const itemsLength = items.length;
   const newFocusedIndex = itemsLength === 0 ? -1 : 0;
   const total = items.length;
@@ -1496,7 +1487,6 @@ const loadContent = async state => {
     // @ts-ignore
     rowIndex,
     columnIndex,
-    // editorUid,
     width: 200
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/completion-worker",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Web Worker for the find widget in Lvce Editor",
   "repository": {
     "type": "git",