@spyglassmc/core 0.3.0 → 0.4.1

package/lib/service/Project.d.ts

@@ -4,7 +4,7 @@ import type { ExternalEventEmitter, Externals } from '../common/index.js';
 import { Logger } from '../common/index.js';
 import type { AstNode } from '../node/index.js';
 import { FileNode } from '../node/index.js';
-import type { LanguageError } from '../source/index.js';
+import type { PosRangeLanguageError } from '../source/index.js';
 import { SymbolUtil } from '../symbol/index.js';
 import { CacheService } from './CacheService.js';
 import type { Config } from './Config.js';
@@ -38,8 +38,10 @@ export interface DocAndNode {
 }
 interface DocumentEvent extends DocAndNode {
 }
-interface DocumentErrorEvent extends DocumentEvent {
-    errors: LanguageError[];
+interface DocumentErrorEvent {
+    errors: readonly PosRangeLanguageError[];
+    uri: string;
+    version?: number;
 }
 interface FileEvent {
     uri: string;
@@ -124,21 +126,21 @@ export declare class Project implements ExternalEventEmitter {
      */
     get cacheRoot(): RootUriString;
     private updateRoots;
-    on(event: 'documentErrorred', callbackFn: (data: DocumentErrorEvent) => void): this;
+    on(event: 'documentErrored', callbackFn: (data: DocumentErrorEvent) => void): this;
     on(event: 'documentUpdated', callbackFn: (data: DocumentEvent) => void): this;
     on(event: 'documentRemoved', callbackFn: (data: FileEvent) => void): this;
     on(event: `file${'Created' | 'Modified' | 'Deleted'}`, callbackFn: (data: FileEvent) => void): this;
     on(event: 'ready', callbackFn: (data: EmptyEvent) => void): this;
     on(event: 'rootsUpdated', callbackFn: (data: RootsEvent) => void): this;
     on(event: 'symbolRegistrarExecuted', callbackFn: (data: SymbolRegistrarEvent) => void): this;
-    once(event: 'documentErrorred', callbackFn: (data: DocumentErrorEvent) => void): this;
+    once(event: 'documentErrored', callbackFn: (data: DocumentErrorEvent) => void): this;
     once(event: 'documentUpdated', callbackFn: (data: DocumentEvent) => void): this;
     once(event: 'documentRemoved', callbackFn: (data: FileEvent) => void): this;
     once(event: `file${'Created' | 'Modified' | 'Deleted'}`, callbackFn: (data: FileEvent) => void): this;
     once(event: 'ready', callbackFn: (data: EmptyEvent) => void): this;
     once(event: 'rootsUpdated', callbackFn: (data: RootsEvent) => void): this;
     once(event: 'symbolRegistrarExecuted', callbackFn: (data: SymbolRegistrarEvent) => void): this;
-    emit(event: 'documentErrorred', data: DocumentErrorEvent): boolean;
+    emit(event: 'documentErrored', data: DocumentErrorEvent): boolean;
     emit(event: 'documentUpdated', data: DocumentEvent): boolean;
     emit(event: 'documentRemoved', data: FileEvent): boolean;
     emit(event: `file${'Created' | 'Modified' | 'Deleted'}`, data: FileEvent): boolean;
@@ -168,7 +170,7 @@ export declare class Project implements ExternalEventEmitter {
      */
     close(): Promise<void>;
     restart(): Promise<void>;
-    resetCache(): void;
+    resetCache(): Promise<void>;
     normalizeUri(uri: string): string;
     private static readonly TextDocumentCacheMaxLength;
     private removeCachedTextDocument;

package/lib/service/Project.js

@@ -5,19 +5,19 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { TextDocument } from 'vscode-languageserver-textdocument';
-import { bufferToString, Logger, SingletonPromise, StateProxy } from '../common/index.js';
+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 { Source } from '../source/index.js';
+import { LanguageError, Source } from '../source/index.js';
 import { SymbolUtil } from '../symbol/index.js';
 import { CacheService } from './CacheService.js';
 import { ConfigService, LinterConfigValue } from './Config.js';
-import { BinderContext, CheckerContext, LinterContext, ParserContext, UriBinderContext } from './Context.js';
+import { BinderContext, CheckerContext, LinterContext, ParserContext, UriBinderContext, } from './Context.js';
 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';
@@ -125,7 +125,8 @@ export class Project {
         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));
             }
         }
@@ -151,8 +152,7 @@ export class Project {
      */
     getTrackedFiles() {
         const extensions = this.meta.getSupportedFileExtensions();
-        return [...this.#dependencyFiles, ...this.#watchedFiles]
-            .filter(file => extensions.includes(fileUtil.extname(file) ?? ''));
+        return [...this.#dependencyFiles, ...this.#watchedFiles].filter((file) => extensions.includes(fileUtil.extname(file) ?? ''));
     }
     constructor({ cacheRoot, defaultConfig, downloader, externals, fs = FileService.create(externals, cacheRoot), initializers = [], logger = Logger.create(), profilers = ProfilerFactory.noop(), projectRoot, }) {
         this.#cacheRoot = cacheRoot;
@@ -178,16 +178,18 @@ export class Project {
         this.setInitPromise();
         this.setReadyPromise();
         this.#cacheSaverIntervalId = setInterval(() => this.cacheService.save(), CacheAutoSaveInterval);
-        this
-            .on('documentUpdated', ({ doc, node }) => {
+        this.on('documentUpdated', ({ doc, node }) => {
             // if (!this.#isReady) {
             // 	return
             // }
-            this.emit('documentErrorred', {
-                doc,
-                errors: FileNode.getErrors(node),
-                node,
+            this.emit('documentErrored', {
+                errors: FileNode.getErrors(node).map((e) => LanguageError.withPosRange(e, doc)),
+                uri: doc.uri,
+                version: doc.version,
             });
+        })
+            .on('documentRemoved', ({ uri }) => {
+            this.emit('documentErrored', { errors: [], uri });
         })
             .on('fileCreated', async ({ uri }) => {
             if (uri.endsWith(Project.RootSuffix)) {
@@ -234,7 +236,7 @@ export class Project {
                 meta: this.meta,
                 projectRoot: this.projectRoot,
             };
-            const results = await Promise.allSettled(this.#initializers.map(init => init(initCtx)));
+            const results = await Promise.allSettled(this.#initializers.map((init) => init(initCtx)));
             let ctx = {};
             results.forEach(async (r, i) => {
                 if (r.status === 'rejected') {
@@ -291,7 +293,8 @@ export class Project {
             this.fs.register('file:', fileUriSupporter, true);
             this.fs.register(ArchiveUriSupporter.Protocol, archiveUriSupporter, true);
         };
-        const listProjectFiles = () => new Promise(resolve => {
+        const listProjectFiles = () => new Promise((resolve) => {
+            this.#watchedFiles.clear();
             this.#watcherReady = false;
             this.#watcher = this.externals.fs
                 .watch(this.projectRoot)
@@ -299,34 +302,31 @@ export class Project {
                 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);
             });
         });
         const ready = async () => {
             await this.init();
             const __profiler = this.profilers.get('project#ready');
-            await Promise.all([
-                listDependencyFiles(),
-                listProjectFiles(),
-            ]);
+            await Promise.all([listDependencyFiles(), listProjectFiles()]);
             this.#dependencyFiles = new Set(this.fs.listFiles());
             this.#dependencyRoots = new Set(this.fs.listRoots());
             this.updateRoots();
@@ -345,9 +345,13 @@ export class Project {
                 }
             }
             __profiler.task('Register Symbols');
+            for (const [uri, values] of Object.entries(this.cacheService.errors)) {
+                this.emit('documentErrored', { errors: values, uri });
+            }
+            __profiler.task('Pop Errors');
             const { addedFiles, changedFiles, removedFiles } = await this.cacheService.validate();
             for (const uri of removedFiles) {
-                this.symbols.clear({ uri });
+                this.emit('fileDeleted', { uri });
             }
             __profiler.task('Validate Cache');
             if (addedFiles.length > 0) {
@@ -366,6 +370,7 @@ export class Project {
             __profiler.finalize();
             this.emit('ready', {});
         };
+        this.#isReady = false;
         this.#readyPromise = ready();
     }
     /**
@@ -393,6 +398,8 @@ export class Project {
     async restart() {
         try {
             await this.#watcher.close();
+            this.#bindingInProgressUris.clear();
+            this.#symbolUpToDateUris.clear();
             this.setReadyPromise();
             await this.ready();
         }
@@ -401,10 +408,19 @@ export class Project {
         }
     }
     resetCache() {
-        return this.cacheService.reset();
+        this.logger.info('[Project#resetCache] Initiated...');
+        // Clear existing errors.
+        for (const uri of Object.keys(this.cacheService.errors)) {
+            this.emit('documentErrored', { errors: [], uri });
+        }
+        // Reset cache.
+        const { symbols } = this.cacheService.reset();
+        this.symbols = new SymbolUtil(symbols, this.externals.event.EventEmitter);
+        this.symbols.buildCache();
+        return this.restart();
     }
     normalizeUri(uri) {
-        return this.fs.mapFromDisk(this.externals.uri.normalize(uri));
+        return this.fs.mapFromDisk(normalizeUri(uri));
     }
     static TextDocumentCacheMaxLength = 268435456;
     #textDocumentCache = new Map();
@@ -554,7 +570,7 @@ export class Project {
                     ruleName,
                     ruleValue,
                 });
-                traversePreOrder(node, () => true, () => true, node => {
+                traversePreOrder(node, () => true, () => true, (node) => {
                     if (nodePredicate(node)) {
                         const proxy = StateProxy.create(node);
                         linter(proxy, ctx);
@@ -569,7 +585,9 @@ export class Project {
     }
     // @SingletonPromise()
     async ensureBindingStarted(uri) {
-        if (this.#symbolUpToDateUris.has(uri) || this.#bindingInProgressUris.has(uri)) {
+        uri = this.normalizeUri(uri);
+        if (this.#symbolUpToDateUris.has(uri) ||
+            this.#bindingInProgressUris.has(uri)) {
             return;
         }
         this.#bindingInProgressUris.add(uri);
@@ -615,8 +633,8 @@ export class Project {
      * @throws If there is no `TextDocument` corresponding to the URI.
      */
     async onDidChange(uri, changes, version) {
-        this.#symbolUpToDateUris.delete(uri);
         uri = this.normalizeUri(uri);
+        this.#symbolUpToDateUris.delete(uri);
         if (!fileUtil.isFileUri(uri)) {
             return; // We only accept `file:` scheme for client-managed URIs.
         }
@@ -645,17 +663,21 @@ export class Project {
         this.tryClearingCache(uri);
     }
     async ensureClientManagedChecked(uri) {
+        uri = this.normalizeUri(uri);
         const result = this.#clientManagedDocAndNodes.get(uri);
-        if (result && this.#isReady) {
+        if (result) {
             const { doc, node } = result;
-            await this.bind(doc, node);
-            await this.check(doc, node);
-            this.emit('documentUpdated', { doc, node });
-            return { doc, node };
+            if (this.#isReady) {
+                await this.bind(doc, node);
+                await this.check(doc, node);
+                this.emit('documentUpdated', result);
+            }
+            return result;
         }
         return undefined;
     }
     getClientManaged(uri) {
+        uri = this.normalizeUri(uri);
         return this.#clientManagedDocAndNodes.get(uri);
     }
     async showCacheRoot() {
@@ -676,10 +698,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.js

@@ -1,8 +1,8 @@
 import { AstNode } from '../node/index.js';
-import { ColorPresentation, completer, traversePreOrder } from '../processor/index.js';
+import { ColorPresentation, completer, traversePreOrder, } from '../processor/index.js';
 import { Range } from '../source/index.js';
 import { SymbolUsageTypes } from '../symbol/index.js';
-import { ColorizerContext, CompleterContext, FormatterContext, ProcessorContext, SignatureHelpProviderContext } from './Context.js';
+import { ColorizerContext, CompleterContext, FormatterContext, ProcessorContext, SignatureHelpProviderContext, } from './Context.js';
 import { fileUtil } from './fileUtil.js';
 import { Hover } from './Hover.js';
 import { ProfilerFactory } from './Profiler.js';
@@ -44,9 +44,11 @@ export class Service {
         try {
             this.debug(`Getting color info for '${doc.uri}' # ${doc.version}`);
             const ans = [];
-            traversePreOrder(node, _ => true, node => node.color, node => ans.push({
+            traversePreOrder(node, (_) => true, (node) => node.color, (node) => ans.push({
                 color: Array.isArray(node.color) ? node.color : node.color.value,
-                range: Array.isArray(node.color) ? node.range : (node.color.range ?? node.range),
+                range: Array.isArray(node.color)
+                    ? node.range
+                    : node.color.range ?? node.range,
             }));
             return ans;
         }
@@ -63,7 +65,7 @@ export class Service {
                 const nodeColor = node.color;
                 if (nodeColor && !Array.isArray(nodeColor)) {
                     const colorRange = nodeColor.range ?? node.range;
-                    return nodeColor.format.map(format => ColorPresentation.fromColorFormat(format, color, colorRange));
+                    return nodeColor.format.map((format) => ColorPresentation.fromColorFormat(format, color, colorRange));
                 }
                 node = node.parent;
             }
@@ -78,7 +80,11 @@ export class Service {
             this.debug(`Getting completion for '${doc.uri}' # ${doc.version} @ ${offset}`);
             const shouldComplete = this.project.meta.shouldComplete(doc.languageId, triggerCharacter);
             if (shouldComplete) {
-                return completer.file(node, CompleterContext.create(this.project, { doc, offset, triggerCharacter }));
+                return completer.file(node, CompleterContext.create(this.project, {
+                    doc,
+                    offset,
+                    triggerCharacter,
+                }));
             }
         }
         catch (e) {
@@ -121,7 +127,8 @@ export class Service {
             while (node) {
                 const symbol = this.project.symbols.resolveAlias(node.symbol);
                 if (symbol) {
-                    const hover = `\`\`\`typescript\n(${symbol.category}${symbol.subcategory ? `/${symbol.subcategory}` : ''}) ${symbol.identifier}\n\`\`\`` + (symbol.desc ? `\n******\n${symbol.desc}` : '');
+                    const hover = `\`\`\`typescript\n(${symbol.category}${symbol.subcategory ? `/${symbol.subcategory}` : ''}) ${symbol.identifier}\n\`\`\`` +
+                        (symbol.desc ? `\n******\n${symbol.desc}` : '');
                     return Hover.create(node.range, hover);
                 }
                 if (node.hover) {
@@ -154,7 +161,10 @@ export class Service {
     getSignatureHelp(node, doc, offset) {
         try {
             this.debug(`Getting signature help for '${doc.uri}' # ${doc.version} @ ${offset}`);
-            const ctx = SignatureHelpProviderContext.create(this.project, { doc, offset });
+            const ctx = SignatureHelpProviderContext.create(this.project, {
+                doc,
+                offset,
+            });
             for (const provider of this.project.meta.signatureHelpProviders) {
                 const result = provider(node, ctx);
                 if (result) {
@@ -184,7 +194,7 @@ export class Service {
                     for (const usage of searchedUsages) {
                         let locs = symbol[usage] ?? [];
                         if (currentFileOnly) {
-                            locs = locs.filter(l => l.uri === doc.uri);
+                            locs = locs.filter((l) => l.uri === doc.uri);
                         }
                         rawLocations.push(...locs);
                     }

package/lib/service/fileUtil.js

@@ -43,7 +43,8 @@ export var fileUtil;
     }
     fileUtil.ensureEndingSlash = ensureEndingSlash;
     function join(fromUri, toUri) {
-        return ensureEndingSlash(fromUri) + (toUri.startsWith('/') ? toUri.slice(1) : toUri);
+        return (ensureEndingSlash(fromUri) +
+            (toUri.startsWith('/') ? toUri.slice(1) : toUri));
     }
     fileUtil.join = join;
     /**

package/lib/source/IndexMap.js

@@ -33,7 +33,7 @@ export var IndexMap;
     }
     IndexMap.toOuterRange = toOuterRange;
     function merge(outerMap, innerMap) {
-        return innerMap.map(p => ({
+        return innerMap.map((p) => ({
             inner: p.inner,
             outer: toOuterRange(outerMap, p.outer),
         }));

package/lib/source/LanguageError.d.ts

@@ -1,14 +1,28 @@
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 import type { Location } from './Location.js';
+import { PositionRange } from './PositionRange.js';
 import type { Range } from './Range.js';
-export interface LanguageError {
+export interface LanguageErrorData {
     message: string;
-    range: Range;
     severity: ErrorSeverity;
     info?: LanguageErrorInfo;
 }
-export declare namespace LanguageError {
-    function create(message: string, range: Range, severity?: ErrorSeverity, info?: LanguageErrorInfo): LanguageError;
+export interface LanguageError extends LanguageErrorData {
+    range: Range;
+}
+/**
+ * A language error that uses {@link PositionRange} instead of {@link Range} to represent the span of the error.
+ */
+export interface PosRangeLanguageError extends LanguageErrorData {
+    posRange: PositionRange;
 }
+export declare const LanguageError: Readonly<{
+    create(message: string, range: Range, severity?: ErrorSeverity, info?: LanguageErrorInfo): LanguageError;
+    /**
+     * @returns A {@link PosRangeLanguageError}.
+     */
+    withPosRange(error: LanguageError, doc: TextDocument): PosRangeLanguageError;
+}>;
 export declare const enum ErrorSeverity {
     Hint = 0,
     Information = 1,

package/lib/source/LanguageError.js

@@ -1,12 +1,22 @@
-export var LanguageError;
-(function (LanguageError) {
-    function create(message, range, severity = 3 /* ErrorSeverity.Error */, info) {
+import { PositionRange } from './PositionRange.js';
+export const LanguageError = Object.freeze({
+    create(message, range, severity = 3 /* ErrorSeverity.Error */, info) {
         const ans = { range, message, severity };
         if (info) {
             ans.info = info;
         }
         return ans;
-    }
-    LanguageError.create = create;
-})(LanguageError || (LanguageError = {}));
+    },
+    /**
+     * @returns A {@link PosRangeLanguageError}.
+     */
+    withPosRange(error, doc) {
+        return {
+            posRange: PositionRange.from(error.range, doc),
+            message: error.message,
+            severity: error.severity,
+            ...(error.info && { info: error.info }),
+        };
+    },
+});
 //# sourceMappingURL=LanguageError.js.map

package/lib/source/Location.js

@@ -6,7 +6,10 @@ export var Location;
         return {
             uri: partial.uri ?? '',
             range: Range.get(partial.range ?? { start: 0, end: 0 }),
-            posRange: partial.posRange ?? { start: { line: 0, character: 0 }, end: { line: 0, character: 0 } },
+            posRange: partial.posRange ?? {
+                start: { line: 0, character: 0 },
+                end: { line: 0, character: 0 },
+            },
         };
     }
     Location.get = get;

package/lib/source/PositionRange.d.ts

@@ -12,7 +12,7 @@ export declare namespace PositionRange {
     /**
      * @returns A `PositionRange` converted from a `RangeLike`.
      */
-    function from(range: RangeLike, doc: TextDocument): PositionRange;
+    function from(rangeLike: RangeLike, doc: TextDocument): PositionRange;
     /**
      * ```typescript
      * {

package/lib/source/PositionRange.js

@@ -27,11 +27,11 @@ export var PositionRange;
     /**
      * @returns A `PositionRange` converted from a `RangeLike`.
      */
-    function from(range, doc) {
-        const _range = Range.get(range);
+    function from(rangeLike, doc) {
+        const range = Range.get(rangeLike);
         const ans = {
-            start: doc.positionAt(_range.start),
-            end: doc.positionAt(_range.end),
+            start: doc.positionAt(range.start),
+            end: doc.positionAt(range.end),
         };
         return ans;
     }

package/lib/source/Range.js

@@ -42,7 +42,8 @@ export var Range;
     }
     Range.span = span;
     function is(obj) {
-        return (!!obj && typeof obj === 'object' &&
+        return (!!obj &&
+            typeof obj === 'object' &&
             typeof obj.start === 'number' &&
             typeof obj.end === 'number');
     }
@@ -65,7 +66,8 @@ export var Range;
     Range.toString = toString;
     function contains(range, offset, endInclusive = false) {
         range = get(range);
-        return range.start <= offset && (endInclusive ? offset <= range.end : offset < range.end);
+        return (range.start <= offset &&
+            (endInclusive ? offset <= range.end : offset < range.end));
     }
     Range.contains = contains;
     function containsRange(a, b, endInclusive = false) {
@@ -144,7 +146,8 @@ export var Range;
 export var RangeContainer;
 (function (RangeContainer) {
     function is(obj) {
-        return (!!obj && typeof obj === 'object' &&
+        return (!!obj &&
+            typeof obj === 'object' &&
             Range.is(obj.range));
     }
     RangeContainer.is = is;

package/lib/source/Source.d.ts

@@ -43,6 +43,8 @@ export declare class ReadonlySource {
     tryPeekAfterWhitespace(expectedValue: string): boolean;
     peekUntil(...terminators: string[]): string;
     peekLine(): string;
+    peekRemaining(): string;
+    matchPattern(regex: RegExp): boolean;
     hasNonSpaceAheadInLine(): boolean;
     slice(start: number, end?: number): string;
     slice(rangeLike: Range | RangeContainer): string;

package/lib/source/Source.js

@@ -70,6 +70,12 @@ export class ReadonlySource {
     peekLine() {
         return this.peekUntil(CR, LF);
     }
+    peekRemaining() {
+        return this.string.slice(this.innerCursor);
+    }
+    matchPattern(regex) {
+        return regex.test(this.peekRemaining());
+    }
     hasNonSpaceAheadInLine() {
         for (let cursor = this.innerCursor; cursor < this.string.length; cursor++) {
             const c = this.string.charAt(cursor);
@@ -85,7 +91,9 @@ export class ReadonlySource {
     slice(param0, end) {
         if (typeof param0 === 'number') {
             const innerStart = IndexMap.toInnerOffset(this.indexMap, param0);
-            const innerEnd = end !== undefined ? IndexMap.toInnerOffset(this.indexMap, end) : undefined;
+            const innerEnd = end !== undefined
+                ? IndexMap.toInnerOffset(this.indexMap, end)
+                : undefined;
             return this.string.slice(innerStart, innerEnd);
         }
         const range = IndexMap.toInnerRange(this.indexMap, Range.get(param0));