@lvce-editor/extension-host-worker 4.7.0 → 4.9.0

package/dist/extensionHostWorkerMain.js

@@ -90,8 +90,6 @@ const fn = value => {
 };
 
 const state$e = {
-  /** @type{any[]} */
-  onDidOpenEditorListeners: [],
   /** @type{any[]} */
   onWillChangeEditorListeners: [],
   /** @type{any[]} */
@@ -571,7 +569,7 @@ const registerMethod = ({
     }
   };
 };
-const create$a = ({
+const create$b = ({
   name,
   resultShape,
   executeKey = '',
@@ -621,9 +619,7 @@ const String$1 = 'string';
 
 const {
   registerBraceCompletionProvider,
-  executeBraceCompletionProvider,
-  reset: reset$9
-} = create$a({
+  executeBraceCompletionProvider} = create$b({
   name: 'BraceCompletion',
   resultShape: {
     type: Boolean$1
@@ -633,7 +629,7 @@ const {
 const {
   registerClosingTagProvider,
   executeClosingTagProvider
-} = create$a({
+} = create$b({
   name: 'ClosingTag',
   returnUndefinedWhenNoProviderFound: true,
   resultShape: {
@@ -645,7 +641,7 @@ const {
 const {
   registerCodeActionProvider,
   executeCodeActionProvider
-} = create$a({
+} = create$b({
   name: 'CodeAction',
   resultShape: {
     type: Array$1,
@@ -728,7 +724,7 @@ const {
   registerCompletionProvider,
   executeCompletionProvider,
   executeresolveCompletionItemProvider
-} = create$a({
+} = create$b({
   name: 'Completion',
   resultShape: {
     type: Array$1,
@@ -905,9 +901,7 @@ const setPauseOnExceptions = async (protocol, value) => {
 
 const {
   registerDefinitionProvider,
-  executeDefinitionProvider,
-  reset: reset$8
-} = create$a({
+  executeDefinitionProvider} = create$b({
   name: 'Definition',
   resultShape: {
     allowUndefined: true,
@@ -929,7 +923,7 @@ const {
 const {
   registerDiagnosticProvider,
   executeDiagnosticProvider
-} = create$a({
+} = create$b({
   name: 'Diagnostic',
   resultShape: {
     type: Array$1,
@@ -1028,9 +1022,7 @@ const getPathSeparator = protocol => {
 
 const {
   registerFormattingProvider,
-  executeFormattingProvider,
-  reset: reset$7
-} = create$a({
+  executeFormattingProvider} = create$b({
   name: 'Formatting',
   executeKey: 'format',
   resultShape: {
@@ -1092,9 +1084,7 @@ const getPosition = (textDocument, offset) => {
 
 const {
   registerHoverProvider,
-  executeHoverProvider,
-  reset: reset$6
-} = create$a({
+  executeHoverProvider} = create$b({
   name: 'Hover',
   resultShape: {
     allowUndefined: true,
@@ -1105,9 +1095,7 @@ const {
 
 const {
   registerImplementationProvider,
-  executeImplementationProvider,
-  reset: reset$5
-} = create$a({
+  executeImplementationProvider} = create$b({
   name: 'Implementation',
   resultShape: {
     type: Array$1,
@@ -1527,7 +1515,7 @@ const getFirstEvent = (eventEmitter, eventMap) => {
   return promise;
 };
 const Message$1 = 3;
-const create$5$2 = async ({
+const create$5$1 = async ({
   messagePort,
   isMessagePortOpen
 }) => {
@@ -1578,7 +1566,7 @@ const wrap$5 = messagePort => {
 };
 const IpcParentWithMessagePort$1 = {
   __proto__: null,
-  create: create$5$2,
+  create: create$5$1,
   signal: signal$1,
   wrap: wrap$5
 };
@@ -1602,7 +1590,7 @@ const waitForWebSocketToBeOpen = webSocket => {
     error: Error$3
   });
 };
-const create$9 = async ({
+const create$a = async ({
   webSocket
 }) => {
   const firstWebSocketEvent = await waitForWebSocketToBeOpen(webSocket);
@@ -1639,7 +1627,7 @@ const wrap$1 = webSocket => {
 };
 const IpcParentWithWebSocket$1$1 = {
   __proto__: null,
-  create: create$9,
+  create: create$a,
   wrap: wrap$1
 };
 
@@ -1880,7 +1868,7 @@ const getErrorResponse = (message, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$2(message, errorProperty);
 };
-const create$8 = (message, result) => {
+const create$9 = (message, result) => {
   return {
     jsonrpc: Two,
     id: message.id,
@@ -1889,7 +1877,7 @@ const create$8 = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$8(message, resultProperty);
+  return create$9(message, resultProperty);
 };
 const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
   try {
@@ -2053,7 +2041,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$6$1 = async ({
+const create$7 = async ({
   commandMap,
   messagePort
 }) => {
@@ -2068,9 +2056,9 @@ const create$6$1 = async ({
 };
 const MessagePortRpcClient = {
   __proto__: null,
-  create: create$6$1
+  create: create$7
 };
-const create$5$1 = async ({
+const create$6$1 = async ({
   commandMap,
   messagePort,
   isMessagePortOpen
@@ -2088,7 +2076,7 @@ const create$5$1 = async ({
 };
 const MessagePortRpcParent = {
   __proto__: null,
-  create: create$5$1
+  create: create$6$1
 };
 const create$1$1 = async ({
   commandMap,
@@ -2108,7 +2096,7 @@ const WebSocketRpcParent = {
   __proto__: null,
   create: create$1$1
 };
-const create$7 = async ({
+const create$8 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -2120,7 +2108,7 @@ const create$7 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$7
+  create: create$8
 };
 
 const getPortTuple = () => {
@@ -2357,9 +2345,7 @@ const showQuickPick = async ({
 const {
   registerReferenceProvider,
   executeReferenceProvider,
-  executefileReferenceProvider,
-  reset: reset$4
-} = create$a({
+  executefileReferenceProvider} = create$b({
   name: 'Reference',
   resultShape: {
     type: Array$1,
@@ -2384,9 +2370,7 @@ const {
 const {
   registerRenameProvider,
   executeRenameProvider,
-  executeprepareRenameProvider,
-  reset: reset$3
-} = create$a({
+  executeprepareRenameProvider} = create$b({
   name: 'Rename',
   resultShape: {
     type: Object$1,
@@ -2545,9 +2529,7 @@ const createRpc = ({
 
 const {
   registerSelectionProvider,
-  executeSelectionProvider,
-  reset: reset$2
-} = create$a({
+  executeSelectionProvider} = create$b({
   name: 'Selection',
   resultShape: {
     allowUndefined: true,
@@ -2653,9 +2635,7 @@ const getEnabledProviderIds = async (scheme, root) => {
 
 const {
   registerTabCompletionProvider,
-  executeTabCompletionProvider,
-  reset: reset$1
-} = create$a({
+  executeTabCompletionProvider} = create$b({
   name: 'TabCompletion',
   resultShape: {
     type: Object$1,
@@ -2694,9 +2674,7 @@ const executeTextSearchProvider = async (scheme, query) => {
 
 const {
   registerTypeDefinitionProvider,
-  executeTypeDefinitionProvider,
-  reset
-} = create$a({
+  executeTypeDefinitionProvider} = create$b({
   name: 'TypeDefinition',
   resultShape: {
     allowUndefined: true,
@@ -3525,7 +3503,6 @@ const storeId = 'lvce-keyvalue';
 // TODO high memory usage in idb because of transactionDoneMap
 
 const state$5 = {
-  databases: Object.create(null),
   dbVersion: 2,
   cachedDb: undefined
 };
@@ -3920,6 +3897,27 @@ const createWebView3 = async ({
   });
 };
 
+const createWebViewWorkerRpc2 = async (rpcInfo, port) => {
+  // TODO this function is called from the iframe worker to create a direct
+  // connection between a webview/iframe and it's webworker. For this to work
+  // the iframe worker creates a messagechannel and sends one messageport to the webview
+  // and the other messageport to the webworker. This enables direct communication via
+  // the two message ports
+
+  // TODO have a way so that the worker already includes the webview api and the extension
+  // host subworker doesn't need to import the other file
+  await invokeAndTransfer$1('IpcParent.create', {
+    method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
+    url: rpcInfo.url,
+    name: rpcInfo.name,
+    raw: true,
+    port
+  });
+};
+
+/**
+ * @deprecated use createWebViewWorkerRpc2 which passes the worker url as a parameter
+ */
 const createWebViewWorkerRpc = async (rpcInfo, port) => {
   // TODO this function is called from the iframe worker to create a direct
   // connection between a webview/iframe and it's webworker. For this to work
@@ -4930,8 +4928,6 @@ const hydrate = async () => {
 };
 
 const state = {
-  databases: Object.create(null),
-  eventId: 0,
   dbVersion: 1,
   /**
    * @type {any}
@@ -5251,30 +5247,43 @@ const getLineMatchRegex = (line, lineNumber, query, matchCase) => {
   return [];
 };
 
-const getLineMatchText = (line, lineNumber, query, queryLower, matchCase) => {
+const doesMatchWord = (line, index, wordBoundaries) => {
+  if (index === 0) {
+    return true;
+  }
+  const char = line.charAt(index - 1);
+  return wordBoundaries.includes(char);
+};
+const getLineMatchText = (line, lineNumber, query, queryLower, matchCase, matchWholeWord) => {
+  // TODO support multiple matches per line
   const lineToQuery = matchCase ? line : line.toLowerCase();
   const actualQuery = matchCase ? query : queryLower;
   const index = lineToQuery.indexOf(actualQuery);
-  if (index !== -1) {
-    return [{
-      type: Match,
-      text: line,
-      start: index,
-      end: index + query.length,
-      lineNumber
-    }];
+  if (index === -1) {
+    return [];
   }
-  return [];
+  const wordBoundaries = [' ', '\t', '-'];
+  if (matchWholeWord && !doesMatchWord(line, index, wordBoundaries)) {
+    return [];
+  }
+  return [{
+    type: Match,
+    text: line,
+    start: index,
+    end: index + query.length,
+    lineNumber
+  }];
 };
 
-const getLineMatch = (line, lineNumber, query, queryLower, useRegularExpression, matchCase) => {
+const getLineMatch = (line, lineNumber, query, queryLower, useRegularExpression, matchCase, matchWholeWord) => {
   if (useRegularExpression) {
     return getLineMatchRegex(line, lineNumber, query, matchCase);
   }
-  return getLineMatchText(line, lineNumber, query, queryLower, matchCase);
+  return getLineMatchText(line, lineNumber, query, queryLower, matchCase, matchWholeWord);
 };
 
 const UseRegularExpression = 1 << 1; // 2
+const MatchWholeWord = 1 << 3; // 8
 const MatchCase = 1 << 4; // 16
  // 128
 
@@ -5285,9 +5294,10 @@ const splitLines = lines => {
 const textSearchInText = (file, content, query, flags = 0) => {
   const matchCase = flags & MatchCase;
   const useRegularExpression = flags & UseRegularExpression;
+  const matchWholeWord = flags & MatchWholeWord;
   const lines = splitLines(content);
   const queryLower = query.toLowerCase();
-  const results = lines.flatMap((line, i) => getLineMatch(line, i, query, queryLower, useRegularExpression, matchCase));
+  const results = lines.flatMap((line, i) => getLineMatch(line, i, query, queryLower, useRegularExpression, matchCase, matchWholeWord));
   if (results.length > 0) {
     return [{
       type: File$3,
@@ -5406,6 +5416,7 @@ const matchesUri = (uri, relativeRoot, include, exclude) => {
   }
   return true;
 };
+
 const textSearch = async (scheme, root, query, options, assetDir) => {
   string(scheme);
   string(root);
@@ -5474,6 +5485,7 @@ const commandMap = {
   'TextSearchMemory.textSearch': textSearch,
   'WebView.create3': createWebView3,
   'WebView.createWebViewWorkerRpc': createWebViewWorkerRpc,
+  'WebView.createWebViewWorkerRpc2': createWebViewWorkerRpc2,
   'WebView.getRpcInfo': getRpcInfo,
   'WebViews.getWebViews': getWebViews,
   ['ExtensionHostDebug.evaluate']: evaluate,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-host-worker",
-  "version": "4.7.0",
+  "version": "4.9.0",
   "description": "Webworker for the extension host functionality in Lvce Editor.",
   "keywords": [
     "web-worker"