Skip to content

Build your personal knowledge base with Trilium Notes

fix(codemirror): complete globals and keywords in script notes

Elian Doran99a1d83ace61
diff --git a/packages/codemirror/src/type_completion/codemirror-ts/autocomplete.ts b/packages/codemirror/src/type_completion/codemirror-ts/autocomplete.ts
index d975569114..5ed265fa9c 100644
--- a/packages/codemirror/src/type_completion/codemirror-ts/autocomplete.ts
+++ b/packages/codemirror/src/type_completion/codemirror-ts/autocomplete.ts
@@ -5,7 +5,6 @@ import type {
} from "@codemirror/autocomplete";
import ts from "typescript";
import { type VirtualTypeScriptEnvironment } from "@typescript/vfs";
-import { AUTOCOMPLETION_SYMBOLS } from "./symbols.js";
const TS_COMPLETE_BLOCKLIST: ts.ScriptElementKind[] = [
ts.ScriptElementKind.warning,
@@ -15,11 +14,9 @@ export async function getAutocompletion({
env,
path,
context,
- keepLegacyLimitationForAutocompletionSymbols = true,
}: {
env: VirtualTypeScriptEnvironment;
path: string;
- keepLegacyLimitationForAutocompletionSymbols?: boolean;
/**
* Allow this to be a subset of the full CompletionContext
* object, because the raw object isn't serializable.
@@ -56,8 +53,7 @@ export async function getAutocompletion({
(entry) =>
!TS_COMPLETE_BLOCKLIST.includes(entry.kind) &&
(entry.sortText < "15" ||
- (completionInfo.optionalReplacementSpan?.length &&
- (!keepLegacyLimitationForAutocompletionSymbols || AUTOCOMPLETION_SYMBOLS.includes(entry.name)))),
+ completionInfo.optionalReplacementSpan?.length),
)
.map((entry): Completion => {
const boost = -Number(entry.sortText) || 0;
diff --git a/packages/codemirror/src/type_completion/codemirror-ts/environment.ts b/packages/codemirror/src/type_completion/codemirror-ts/environment.ts
index 365a400185..84c4ed497f 100644
--- a/packages/codemirror/src/type_completion/codemirror-ts/environment.ts
+++ b/packages/codemirror/src/type_completion/codemirror-ts/environment.ts
@@ -14,12 +14,10 @@ export const tsFacet = Facet.define<
{
path: string;
env: ts.VirtualTypeScriptEnvironment;
- keepLegacyLimitationForAutocompletionSymbols?: boolean;
},
{
path: string;
env: ts.VirtualTypeScriptEnvironment;
- keepLegacyLimitationForAutocompletionSymbols?: boolean;
} | null
>({
combine(configs) {
diff --git a/packages/codemirror/src/type_completion/codemirror-ts/symbols.ts b/packages/codemirror/src/type_completion/codemirror-ts/symbols.ts
deleted file mode 100644
index ac86e32f33..0000000000
--- a/packages/codemirror/src/type_completion/codemirror-ts/symbols.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * TODO: honestly I don't know why this is here.
- */
-export const AUTOCOMPLETION_SYMBOLS = [
- "Object",
- "Function",
- "Array",
- "Number",
- "parseFloat",
- "parseInt",
- "Infinity",
- "NaN",
- "undefined",
- "Boolean",
- "String",
- "Symbol",
- "Date",
- "Promise",
- "RegExp",
- "Error",
- "JSON",
- "Math",
- "Intl",
- "ArrayBuffer",
- "Atomics",
- "Uint8Array",
- "Int8Array",
- "Uint16Array",
- "Int16Array",
- "Uint32Array",
- "Int32Array",
- "Float32Array",
- "Float64Array",
- "Uint8ClampedArray",
- "BigUint64Array",
- "BigInt64Array",
- "DataView",
- "Map",
- "BigInt",
- "Set",
- "WeakMap",
- "WeakSet",
- "decodeURI",
- "decodeURIComponent",
- "encodeURI",
- "encodeURIComponent",
- "escape",
- "unescape",
- "isFinite",
- "isNaN",
- "Deno",
- "Blob",
- "FormData",
- "Request",
- "Response",
- "TextDecoder",
- "TextEncoder",
- "URL",
- "URLPattern",
- "URLSearchParams",
- "atob",
- "btoa",
- "crypto",
- "fetch",
- "clearInterval",
- "clearTimeout",
- "performance",
- "setInterval",
- "setTimeout",
-];
diff --git a/packages/codemirror/src/type_completion/index.spec.ts b/packages/codemirror/src/type_completion/index.spec.ts
index 2cdc0d478c..2f88b063af 100644
--- a/packages/codemirror/src/type_completion/index.spec.ts
+++ b/packages/codemirror/src/type_completion/index.spec.ts
@@ -1,5 +1,7 @@
+import { EditorState } from "@codemirror/state";
import { describe, expect, it } from "vitest";
+import { createOrUpdateFile, tsFacet } from "./codemirror-ts/environment.js";
import {
buildTypeCompletion,
getScriptCompletions,
@@ -494,6 +496,17 @@ describe("buildTypeCompletion", () => {
const handler = await buildTypeCompletion(SCRIPT_MIME_BACKEND, { customRequestHandler: true });
expect(handler.complete).toBeTruthy();
}, TIMEOUT);
+
+ it("completes globals and keywords at the start of a word", async () => {
+ const { extensions, complete } = await buildTypeCompletion(SCRIPT_MIME_FRONTEND);
+ // No editor view syncs the document here, so the test writes it into the environment.
+ const config = EditorState.create({ extensions }).facet(tsFacet);
+ expect(config).toBeTruthy();
+ if (config) createOrUpdateFile(config.env, config.path, "x");
+
+ const labels = (await complete?.(1, false))?.map((entry) => entry.label);
+ expect(labels).toEqual(expect.arrayContaining([ "api", "console", "glob", "const", "return" ]));
+ }, TIMEOUT);
});
describe("renderHoverTooltip", () => {