@spyglassmc/core 0.4.5 → 0.4.7

package/lib/service/Downloader.js

@@ -13,9 +13,12 @@ export class Downloader {
     async download(job, out = {}) {
         const { id, cache, uri, options, transformer, ttl } = job;
         if (ttl && this.#memoryCache.has(uri)) {
-            const { buffer, time } = this.#memoryCache.get(uri);
-            if (time <= performance.now() + ttl) {
+            const memoryCacheEntry = this.#memoryCache.get(uri);
+            const { buffer, time, cacheUri, checksum } = memoryCacheEntry;
+            if (performance.now() <= time + ttl) {
                 this.logger.info(`[Downloader] [${id}] Skipped thanks to valid cache in memory`);
+                out.cacheUri = cacheUri;
+                out.checksum = checksum;
                 return await transformer(buffer);
             }
             else {
@@ -28,7 +31,8 @@ export class Downloader {
         if (cache) {
             const { checksumJob, checksumExtension } = cache;
             out.cacheUri = cacheUri = new Uri(`downloader/${id}`, this.cacheRoot).toString();
-            cacheChecksumUri = new Uri(`downloader/${id}${checksumExtension}`, this.cacheRoot).toString();
+            cacheChecksumUri = new Uri(`downloader/${id}${checksumExtension}`, this.cacheRoot)
+                .toString();
             try {
                 out.checksum = checksum = await this.download({
                     ...checksumJob,
@@ -42,6 +46,8 @@ export class Downloader {
                             if (ttl) {
                                 this.#memoryCache.set(uri, {
                                     buffer: cachedBuffer,
+                                    cacheUri,
+                                    checksum,
                                     time: performance.now(),
                                 });
                             }

package/lib/service/ErrorReporter.js

@@ -7,6 +7,9 @@ export class ErrorReporter {
      * Reports a new error.
      */
     report(message, range, severity = 3 /* ErrorSeverity.Error */, info) {
+        if (message.trim() === '') {
+            throw new Error('Tried to report an error with no message');
+        }
         this.errors.push(LanguageError.create(message, Range.get(range), severity, info));
     }
     /**

package/lib/service/FileService.js

@@ -77,8 +77,7 @@ export class FileServiceImpl {
         try {
             let mappedUri = this.map.getKey(virtualUri);
             if (mappedUri === undefined) {
-                mappedUri = `${this.virtualUrisRoot}${await this.externals.crypto
-                    .getSha1(virtualUri)}/${fileUtil.basename(virtualUri)}`;
+                mappedUri = `${this.virtualUrisRoot}${await this.externals.crypto.getSha1(virtualUri)}/${fileUtil.basename(virtualUri)}`;
                 // Delete old mapped file if it exists. This makes sure the
                 // readonly permission on the file is not removed by it being
                 // overwritten.
@@ -140,8 +139,7 @@ export class FileUriSupporter {
         const files = new Map();
         for (let { uri } of dependencies) {
             try {
-                if (fileUtil.isFileUri(uri) &&
-                    (await externals.fs.stat(uri)).isDirectory()) {
+                if (fileUtil.isFileUri(uri) && (await externals.fs.stat(uri)).isDirectory()) {
                     uri = fileUtil.ensureEndingSlash(uri);
                     roots.push(uri);
                     files.set(uri, await externals.fs.getAllFiles(uri));
@@ -154,21 +152,11 @@ export class FileUriSupporter {
         return new FileUriSupporter(externals, roots, files);
     }
 }
-// namespace ArchiveUri {
-// export function is(uri: Uri): boolean {
-// 	return uri.protocol === Protocol && uri.hostname === Hostname
-// }
-// }
 export class ArchiveUriSupporter {
     externals;
     entries;
     static Protocol = 'archive:';
-    static SupportedArchiveExtnames = [
-        '.tar',
-        '.tar.bz2',
-        '.tar.gz',
-        '.zip',
-    ];
+    static SupportedArchiveExtnames = ['.tar', '.tar.bz2', '.tar.gz', '.zip'];
     protocol = ArchiveUriSupporter.Protocol;
     /**
      * @param entries A map from archive names to unzipped entries.
@@ -202,10 +190,10 @@ export class ArchiveUriSupporter {
         }
         const entry = entries.get(pathInArchive);
         if (!entry) {
-            throw new Error(`Path “${pathInArchive}” does not exist in archive “${archiveName}”`);
+            throw this.externals.error.createKind('ENOENT', `Path “${pathInArchive}” does not exist in archive “${archiveName}”`);
         }
         if (entry.type !== 'file') {
-            throw new Error(`Path “${pathInArchive}” in archive “${archiveName}” is not a file`);
+            throw this.externals.error.createKind('EISDIR', `Path “${pathInArchive}” in archive “${archiveName}” is not a file`);
         }
         return entry.data;
     }
@@ -235,27 +223,20 @@ export class ArchiveUriSupporter {
         if (!path) {
             throw new Error(`Missing path in archive uri “${uri.toString()}”`);
         }
-        return {
-            archiveName: uri.host,
-            pathInArchive: path.charAt(0) === '/' ? path.slice(1) : path,
-        };
+        return { archiveName: uri.host, pathInArchive: path.charAt(0) === '/' ? path.slice(1) : path };
     }
     static async create(dependencies, externals, logger) {
         const entries = new Map();
         for (const { uri, info } of dependencies) {
             try {
-                if (uri.startsWith('file:') &&
-                    ArchiveUriSupporter.SupportedArchiveExtnames.some((ext) => uri.endsWith(ext)) &&
-                    (await externals.fs.stat(uri)).isFile()) {
+                if (uri.startsWith('file:')
+                    && ArchiveUriSupporter.SupportedArchiveExtnames.some((ext) => uri.endsWith(ext))
+                    && (await externals.fs.stat(uri)).isFile()) {
                     const archiveName = fileUtil.basename(uri);
                     if (entries.has(archiveName)) {
                         throw new Error(`A different URI with ${archiveName} already exists`);
                     }
-                    const files = await externals.archive.decompressBall(await externals.fs.readFile(uri), {
-                        stripLevel: typeof info?.startDepth === 'number'
-                            ? info.startDepth
-                            : 0,
-                    });
+                    const files = await externals.archive.decompressBall(await externals.fs.readFile(uri), { stripLevel: typeof info?.startDepth === 'number' ? info.startDepth : 0 });
                     entries.set(archiveName, new Map(files.map((f) => [f.path.replace(/\\/g, '/'), f])));
                 }
             }

package/lib/service/Hover.js

@@ -3,10 +3,7 @@ export var Hover;
 (function (Hover) {
     /* istanbul ignore next */
     function create(range, markdown) {
-        return {
-            range: Range.get(range),
-            markdown,
-        };
+        return { range: Range.get(range), markdown };
     }
     Hover.create = create;
 })(Hover || (Hover = {}));

package/lib/service/MetaRegistry.d.ts

@@ -16,7 +16,7 @@ export interface LanguageOptions {
      */
     extensions: FileExtension[];
     triggerCharacters?: string[];
-    parser: Parser<AstNode>;
+    parser?: Parser<AstNode>;
     completer?: Completer<any>;
 }
 interface LinterRegistration {
@@ -102,11 +102,13 @@ export declare class MetaRegistry {
      * @returns The corresponding `Parser` for the language ID.
      * @throws If there's no such language in the registry.
      */
-    getParserForLanguageId<N extends AstNode>(languageID: string): Parser<N>;
+    getParserForLanguageId<N extends AstNode>(languageID: string): Parser<N> | undefined;
     registerSignatureHelpProvider(provider: SignatureHelpProvider<any>): void;
     get signatureHelpProviders(): Set<SignatureHelpProvider<any>>;
     registerSymbolRegistrar(id: string, registrar: SymbolRegistrarRegistration): void;
     get symbolRegistrars(): Map<string, SymbolRegistrarRegistration>;
+    registerCustom<T>(group: string, id: string, object: T): void;
+    getCustom<T>(group: string): Map<string, T> | undefined;
     registerUriBinder(uriBinder: UriBinder): void;
     get uriBinders(): Set<UriBinder>;
     setUriSorter(uriSorter: UriSorterRegistration): void;

package/lib/service/MetaRegistry.js

@@ -1,5 +1,5 @@
 import { Lazy } from '../common/index.js';
-import { binder, checker, colorizer, completer, formatter, linter, } from '../processor/index.js';
+import { binder, checker, colorizer, completer, formatter, linter } from '../processor/index.js';
 /* istanbul ignore next */
 /**
  * The meta registry of Spyglass. You can register new parsers, processors, and languages here.
@@ -20,6 +20,7 @@ export class MetaRegistry {
     #parsers = new Map();
     #signatureHelpProviders = new Set();
     #symbolRegistrars = new Map();
+    #custom = new Map();
     #uriBinders = new Set();
     #uriSorter = () => 0;
     constructor() {
@@ -109,8 +110,7 @@ export class MetaRegistry {
     }
     shouldComplete(languageID, triggerCharacter) {
         const language = this.#languages.get(languageID);
-        return (!triggerCharacter ||
-            !!language?.triggerCharacters?.includes(triggerCharacter));
+        return (!triggerCharacter || !!language?.triggerCharacters?.includes(triggerCharacter));
     }
     getCompleterForLanguageID(languageID) {
         return this.#languages.get(languageID)?.completer ?? completer.fallback;
@@ -137,11 +137,8 @@ export class MetaRegistry {
         return this.#inlayHintProviders;
     }
     getLinter(ruleName) {
-        return (this.#linters.get(ruleName) ?? {
-            configValidator: () => false,
-            linter: linter.noop,
-            nodePredicate: () => false,
-        });
+        return (this.#linters.get(ruleName)
+            ?? { configValidator: () => false, linter: linter.noop, nodePredicate: () => false });
     }
     registerLinter(ruleName, options) {
         this.#linters.set(ruleName, options);
@@ -184,6 +181,17 @@ export class MetaRegistry {
     get symbolRegistrars() {
         return this.#symbolRegistrars;
     }
+    registerCustom(group, id, object) {
+        let groupRegistry = this.#custom.get(group);
+        if (!groupRegistry) {
+            groupRegistry = new Map();
+            this.#custom.set(group, groupRegistry);
+        }
+        groupRegistry.set(id, object);
+    }
+    getCustom(group) {
+        return this.#custom.get(group);
+    }
     registerUriBinder(uriBinder) {
         this.#uriBinders.add(uriBinder);
     }

package/lib/service/Project.d.ts

@@ -1,3 +1,4 @@
+import type { Ignore } from 'ignore';
 import type { TextDocumentContentChangeEvent } from 'vscode-languageserver-textdocument';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import type { ExternalEventEmitter, Externals } from '../common/index.js';
@@ -13,7 +14,7 @@ import { FileService } from './FileService.js';
 import type { RootUriString } from './fileUtil.js';
 import { MetaRegistry } from './MetaRegistry.js';
 import { ProfilerFactory } from './Profiler.js';
-export type ProjectInitializerContext = Pick<Project, 'cacheRoot' | 'config' | 'downloader' | 'externals' | 'logger' | 'meta' | 'projectRoot'>;
+export type ProjectInitializerContext = Pick<Project, 'cacheRoot' | 'config' | 'downloader' | 'externals' | 'isDebugging' | 'logger' | 'meta' | 'projectRoot'>;
 export type SyncProjectInitializer = (this: void, ctx: ProjectInitializerContext) => Record<string, string> | void;
 export type AsyncProjectInitializer = (this: void, ctx: ProjectInitializerContext) => PromiseLike<Record<string, string> | void>;
 export type ProjectInitializer = SyncProjectInitializer | AsyncProjectInitializer;
@@ -24,6 +25,7 @@ export interface ProjectOptions {
     externals: Externals;
     fs?: FileService;
     initializers?: readonly ProjectInitializer[];
+    isDebugging?: boolean;
     logger?: Logger;
     profilers?: ProfilerFactory;
     /**
@@ -55,7 +57,7 @@ interface SymbolRegistrarEvent {
     id: string;
     checksum: string | undefined;
 }
-export type ProjectData = Pick<Project, 'cacheRoot' | 'config' | 'downloader' | 'ensureBindingStarted' | 'externals' | 'fs' | 'logger' | 'meta' | 'profilers' | 'projectRoot' | 'roots' | 'symbols' | 'ctx'>;
+export type ProjectData = Pick<Project, 'cacheRoot' | 'config' | 'downloader' | 'ensureBindingStarted' | 'externals' | 'fs' | 'isDebugging' | 'logger' | 'meta' | 'profilers' | 'projectRoot' | 'roots' | 'symbols' | 'ctx'>;
 /**
  * Manage all tracked documents and errors.
  *
@@ -96,12 +98,15 @@ export type ProjectData = Pick<Project, 'cacheRoot' | 'config' | 'downloader' |
 export declare class Project implements ExternalEventEmitter {
     #private;
     private static readonly RootSuffix;
+    private static readonly GitIgnore;
     readonly cacheService: CacheService;
     get isReady(): boolean;
     config: Config;
+    ignore: Ignore;
     readonly downloader: Downloader;
     readonly externals: Externals;
     readonly fs: FileService;
+    readonly isDebugging: boolean;
     readonly logger: Logger;
     readonly meta: MetaRegistry;
     readonly profilers: ProfilerFactory;
@@ -154,8 +159,9 @@ export declare class Project implements ExternalEventEmitter {
      * are not loaded into the memory.
      */
     getTrackedFiles(): string[];
-    constructor({ cacheRoot, defaultConfig, downloader, externals, fs, initializers, logger, profilers, projectRoot, }: ProjectOptions);
+    constructor({ cacheRoot, defaultConfig, downloader, externals, fs, initializers, isDebugging, logger, profilers, projectRoot, }: ProjectOptions);
     private setInitPromise;
+    private readGitignore;
     private setReadyPromise;
     /**
      * Load the config file and initialize parsers and processors.

package/lib/service/Project.js

@@ -4,12 +4,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+import ignore from 'ignore';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import { bufferToString, Logger, normalizeUri, SingletonPromise, StateProxy, } from '../common/index.js';
 import { FileNode } from '../node/index.js';
 import { file } from '../parser/index.js';
 import { traversePreOrder } from '../processor/index.js';
-import { LanguageError, Source } from '../source/index.js';
+import { LanguageError, Range, Source } from '../source/index.js';
 import { SymbolUtil } from '../symbol/index.js';
 import { CacheService } from './CacheService.js';
 import { ConfigService, LinterConfigValue } from './Config.js';
@@ -17,7 +18,7 @@ import { BinderContext, CheckerContext, LinterContext, ParserContext, UriBinderC
 import { DependencyKey } from './Dependency.js';
 import { Downloader } from './Downloader.js';
 import { LinterErrorReporter } from './ErrorReporter.js';
-import { ArchiveUriSupporter, FileService, FileUriSupporter, } from './FileService.js';
+import { ArchiveUriSupporter, FileService, FileUriSupporter } from './FileService.js';
 import { fileUtil } from './fileUtil.js';
 import { MetaRegistry } from './MetaRegistry.js';
 import { ProfilerFactory } from './Profiler.js';
@@ -62,6 +63,7 @@ const CacheAutoSaveInterval = 600_000; // 10 Minutes.
  */
 export class Project {
     static RootSuffix = '/pack.mcmeta';
+    static GitIgnore = '.gitignore';
     /** Prevent circular binding. */
     #bindingInProgressUris = new Set();
     #cacheSaverIntervalId;
@@ -83,9 +85,11 @@ export class Project {
         return this.#isReady;
     }
     config;
+    ignore = ignore();
     downloader;
     externals;
     fs;
+    isDebugging;
     logger;
     meta = new MetaRegistry();
     profilers;
@@ -121,12 +125,11 @@ export class Project {
         return this.#cacheRoot;
     }
     updateRoots() {
-        const rawRoots = [...this.#dependencyRoots, this.projectRoot];
+        const rawRoots = [...this.#dependencyRoots ?? [], this.projectRoot];
         const ans = new Set(rawRoots);
         // Identify roots indicated by `pack.mcmeta`.
         for (const file of this.getTrackedFiles()) {
-            if (file.endsWith(Project.RootSuffix) &&
-                rawRoots.some((r) => file.startsWith(r))) {
+            if (file.endsWith(Project.RootSuffix) && rawRoots.some((r) => file.startsWith(r))) {
                 ans.add(file.slice(0, 1 - Project.RootSuffix.length));
             }
         }
@@ -152,30 +155,31 @@ export class Project {
      */
     getTrackedFiles() {
         const extensions = this.meta.getSupportedFileExtensions();
-        return [...this.#dependencyFiles, ...this.#watchedFiles].filter((file) => extensions.includes(fileUtil.extname(file) ?? ''));
+        const supportedFiles = [...this.#dependencyFiles ?? [], ...this.#watchedFiles]
+            .filter((file) => extensions.includes(fileUtil.extname(file) ?? ''));
+        const filteredFiles = this.ignore.filter(supportedFiles);
+        return filteredFiles;
     }
-    constructor({ cacheRoot, defaultConfig, downloader, externals, fs = FileService.create(externals, cacheRoot), initializers = [], logger = Logger.create(), profilers = ProfilerFactory.noop(), projectRoot, }) {
+    constructor({ cacheRoot, defaultConfig, downloader, externals, fs = FileService.create(externals, cacheRoot), initializers = [], isDebugging = false, logger = Logger.create(), profilers = ProfilerFactory.noop(), projectRoot, }) {
         this.#cacheRoot = cacheRoot;
         this.#eventEmitter = new externals.event.EventEmitter();
         this.externals = externals;
         this.fs = fs;
         this.#initializers = initializers;
+        this.isDebugging = isDebugging;
         this.logger = logger;
         this.profilers = profilers;
         this.projectRoot = projectRoot;
         this.cacheService = new CacheService(cacheRoot, this);
         this.#configService = new ConfigService(this, defaultConfig);
-        this.downloader = downloader ??
-            new Downloader(cacheRoot, externals, logger);
+        this.downloader = downloader ?? new Downloader(cacheRoot, externals, logger);
         this.symbols = new SymbolUtil({}, externals.event.EventEmitter);
         this.#ctx = {};
         this.logger.info(`[Project] [init] cacheRoot = “${cacheRoot}”`);
-        this.#configService
-            .on('changed', ({ config }) => {
+        this.#configService.on('changed', ({ config }) => {
             this.config = config;
             this.logger.info('[Project] [Config] Changed');
-        })
-            .on('error', ({ error, uri }) => this.logger.error(`[Project] [Config] Failed loading “${uri}”`, error));
+        }).on('error', ({ error, uri }) => this.logger.error(`[Project] [Config] Failed loading “${uri}”`, error));
         this.setInitPromise();
         this.setReadyPromise();
         this.#cacheSaverIntervalId = setInterval(() => this.cacheService.save(), CacheAutoSaveInterval);
@@ -188,32 +192,27 @@ export class Project {
                 uri: doc.uri,
                 version: doc.version,
             });
-        })
-            .on('documentRemoved', ({ uri }) => {
+        }).on('documentRemoved', ({ uri }) => {
             this.emit('documentErrored', { errors: [], uri });
-        })
-            .on('fileCreated', async ({ uri }) => {
+        }).on('fileCreated', async ({ uri }) => {
             if (uri.endsWith(Project.RootSuffix)) {
                 this.updateRoots();
             }
             this.bindUri(uri);
             return this.ensureBindingStarted(uri);
-        })
-            .on('fileModified', async ({ uri }) => {
+        }).on('fileModified', async ({ uri }) => {
             this.#symbolUpToDateUris.delete(uri);
             if (this.isOnlyWatched(uri)) {
                 await this.ensureBindingStarted(uri);
             }
-        })
-            .on('fileDeleted', ({ uri }) => {
+        }).on('fileDeleted', ({ uri }) => {
             if (uri.endsWith(Project.RootSuffix)) {
                 this.updateRoots();
             }
             this.#symbolUpToDateUris.delete(uri);
             this.symbols.clear({ uri });
             this.tryClearingCache(uri);
-        })
-            .on('ready', () => {
+        }).on('ready', () => {
             this.#isReady = true;
             // // Recheck client managed files after the READY process, as they may have incomplete results and are user-facing.
             // const promises: Promise<unknown>[] = []
@@ -226,6 +225,18 @@ export class Project {
     setInitPromise() {
         const loadConfig = async () => {
             this.config = await this.#configService.load();
+            this.ignore = ignore();
+            for (const pattern of this.config.env.exclude) {
+                if (pattern === '@gitignore') {
+                    const gitignore = await this.readGitignore();
+                    if (gitignore) {
+                        this.ignore.add(gitignore);
+                    }
+                }
+                else {
+                    this.ignore.add(pattern);
+                }
+            }
         };
         const callIntializers = async () => {
             const initCtx = {
@@ -233,6 +244,7 @@ export class Project {
                 config: this.config,
                 downloader: this.downloader,
                 externals: this.externals,
+                isDebugging: this.isDebugging,
                 logger: this.logger,
                 meta: this.meta,
                 projectRoot: this.projectRoot,
@@ -262,6 +274,19 @@ export class Project {
         };
         this.#initPromise = init();
     }
+    async readGitignore() {
+        try {
+            const uri = this.projectRoot + Project.GitIgnore;
+            const contents = await this.externals.fs.readFile(uri);
+            return bufferToString(contents);
+        }
+        catch (e) {
+            if (!this.externals.error.isKind(e, 'ENOENT')) {
+                this.logger.error(`[Project] [readGitignore]`, e);
+            }
+        }
+        return undefined;
+    }
     setReadyPromise() {
         const getDependencies = async () => {
             const ans = [];
@@ -297,30 +322,24 @@ export class Project {
         const listProjectFiles = () => new Promise((resolve) => {
             this.#watchedFiles.clear();
             this.#watcherReady = false;
-            this.#watcher = this.externals.fs
-                .watch(this.projectRoot)
-                .once('ready', () => {
+            this.#watcher = this.externals.fs.watch(this.projectRoot).once('ready', () => {
                 this.#watcherReady = true;
                 resolve();
-            })
-                .on('add', (uri) => {
+            }).on('add', (uri) => {
                 this.#watchedFiles.add(uri);
                 if (this.#watcherReady) {
                     this.emit('fileCreated', { uri });
                 }
-            })
-                .on('change', (uri) => {
+            }).on('change', (uri) => {
                 if (this.#watcherReady) {
                     this.emit('fileModified', { uri });
                 }
-            })
-                .on('unlink', (uri) => {
+            }).on('unlink', (uri) => {
                 this.#watchedFiles.delete(uri);
                 if (this.#watcherReady) {
                     this.emit('fileDeleted', { uri });
                 }
-            })
-                .on('error', (e) => {
+            }).on('error', (e) => {
                 this.logger.error('[Project] [chokidar]', e);
             });
         });
@@ -350,9 +369,7 @@ export class Project {
                 this.emit('documentErrored', { errors: values, uri });
             }
             __profiler.task('Pop Errors');
-            const { addedFiles, changedFiles, removedFiles } = await this
-                .cacheService
-                .validate();
+            const { addedFiles, changedFiles, removedFiles } = await this.cacheService.validate();
             for (const uri of removedFiles) {
                 this.emit('fileDeleted', { uri });
             }
@@ -506,9 +523,18 @@ export class Project {
     }
     parse(doc) {
         const ctx = ParserContext.create(this, { doc });
+        const parser = ctx.meta.getParserForLanguageId(ctx.doc.languageId);
+        if (!parser) {
+            return {
+                type: 'file',
+                range: Range.create(0),
+                children: [],
+                locals: Object.create(null),
+                parserErrors: [],
+            };
+        }
         const src = new Source(doc.getText());
-        const node = file()(src, ctx);
-        return node;
+        return file(parser)(src, ctx);
     }
     async bind(doc, node) {
         if (node.binderErrors) {
@@ -562,8 +588,7 @@ export class Project {
                     continue;
                 }
                 const { ruleSeverity, ruleValue } = result;
-                const { configValidator, linter, nodePredicate } = this.meta
-                    .getLinter(ruleName);
+                const { configValidator, linter, nodePredicate } = this.meta.getLinter(ruleName);
                 if (!configValidator(ruleName, ruleValue, this.logger)) {
                     // Config value is invalid.
                     continue;
@@ -590,8 +615,7 @@ export class Project {
     // @SingletonPromise()
     async ensureBindingStarted(uri) {
         uri = this.normalizeUri(uri);
-        if (this.#symbolUpToDateUris.has(uri) ||
-            this.#bindingInProgressUris.has(uri)) {
+        if (this.#symbolUpToDateUris.has(uri) || this.#bindingInProgressUris.has(uri)) {
             return;
         }
         this.#bindingInProgressUris.add(uri);
@@ -702,14 +726,14 @@ export class Project {
         }
     }
     shouldRemove(uri) {
-        return (!this.#clientManagedUris.has(uri) &&
-            !this.#dependencyFiles.has(uri) &&
-            !this.#watchedFiles.has(uri));
+        return (!this.#clientManagedUris.has(uri)
+            && !this.#dependencyFiles?.has(uri)
+            && !this.#watchedFiles.has(uri));
     }
     isOnlyWatched(uri) {
-        return (this.#watchedFiles.has(uri) &&
-            !this.#clientManagedUris.has(uri) &&
-            !this.#dependencyFiles.has(uri));
+        return (this.#watchedFiles.has(uri)
+            && !this.#clientManagedUris.has(uri)
+            && !this.#dependencyFiles?.has(uri));
     }
 }
 __decorate([

package/lib/service/Service.d.ts

@@ -22,7 +22,7 @@ export declare class Service {
     readonly logger: Logger;
     readonly profilers: ProfilerFactory;
     readonly project: Project;
-    constructor({ isDebugging, logger, profilers, project, }: Options);
+    constructor({ isDebugging, logger, profilers, project }: Options);
     private debug;
     colorize(node: FileNode<AstNode>, doc: TextDocument, range?: Range): readonly ColorToken[];
     getColorInfo(node: FileNode<AstNode>, doc: TextDocument): ColorInfo[];