Get tests working

Author: jakebailey

src/compiler/parser.ts

@@ -1325,17 +1325,18 @@ export function createSourceFile(fileName: string, sourceText: string, languageV
     const {
         languageVersion,
         setExternalModuleIndicator: overrideSetExternalModuleIndicator,
-        impliedNodeFormat: format
+        impliedNodeFormat: format,
+        skipJSDoc,
     } = typeof languageVersionOrOptions === "object" ? languageVersionOrOptions : ({ languageVersion: languageVersionOrOptions } as CreateSourceFileOptions);
     if (languageVersion === ScriptTarget.JSON) {
-        result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes, ScriptKind.JSON, noop);
+        result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes, ScriptKind.JSON, noop, skipJSDoc);
     }
     else {
         const setIndicator = format === undefined ? overrideSetExternalModuleIndicator : (file: SourceFile) => {
             file.impliedNodeFormat = format;
             return (overrideSetExternalModuleIndicator || setExternalModuleIndicator)(file);
         };
-        result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes, scriptKind, setIndicator);
+        result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes, scriptKind, setIndicator, skipJSDoc);
     }
     perfLogger.logStopParseSourceFile();
 
@@ -1698,7 +1699,7 @@ namespace Parser {
         scanner.setOnError(scanError);
         scanner.setScriptTarget(languageVersion);
         scanner.setLanguageVariant(languageVariant);
-        scanner.setSkipJSDoc(_skipJSDoc && !!(contextFlags & NodeFlags.JavaScriptFile));
+        scanner.setSkipJSDoc(_skipJSDoc && !(contextFlags & NodeFlags.JavaScriptFile));
     }
 
     function clearState() {

src/harness/fakesHosts.ts

@@ -238,6 +238,7 @@ export class CompilerHost implements ts.CompilerHost {
     private _sourceFiles: collections.SortedMap<string, ts.SourceFile>;
     private _parseConfigHost: ParseConfigHost | undefined;
     private _newLine: string;
+    // private _skipJSDocParsing: boolean | undefined;
 
     constructor(sys: System | vfs.FileSystem, options = ts.getDefaultCompilerOptions(), setParentNodes = false) {
         if (sys instanceof vfs.FileSystem) sys = new System(sys);
@@ -247,6 +248,7 @@ export class CompilerHost implements ts.CompilerHost {
         this._sourceFiles = new collections.SortedMap<string, ts.SourceFile>({ comparer: sys.vfs.stringComparer, sort: "insertion" });
         this._setParentNodes = setParentNodes;
         this._outputsMap = new collections.SortedMap(this.vfs.stringComparer);
+        // this._skipJSDocParsing = options.skipJSDocParsing;
     }
 
     public get vfs() {
@@ -335,7 +337,7 @@ export class CompilerHost implements ts.CompilerHost {
         return vpath.resolve(this.getDefaultLibLocation(), ts.getDefaultLibFileName(options));
     }
 
-    public getSourceFile(fileName: string, languageVersion: number): ts.SourceFile | undefined {
+    public getSourceFile(fileName: string, languageVersionOrOptions: ts.ScriptTarget | ts.CreateSourceFileOptions): ts.SourceFile | undefined {
         const canonicalFileName = this.getCanonicalFileName(vpath.resolve(this.getCurrentDirectory(), fileName));
         const existing = this._sourceFiles.get(canonicalFileName);
         if (existing) return existing;
@@ -349,7 +351,7 @@ export class CompilerHost implements ts.CompilerHost {
         // reused across multiple tests. In that case, we cache the SourceFile we parse
         // so that it can be reused across multiple tests to avoid the cost of
         // repeatedly parsing the same file over and over (such as lib.d.ts).
-        const cacheKey = this.vfs.shadowRoot && `SourceFile[languageVersion=${languageVersion},setParentNodes=${this._setParentNodes}]`;
+        const cacheKey = this.vfs.shadowRoot && `SourceFile[languageVersionOrOptions=${languageVersionOrOptions !== undefined ? JSON.stringify(languageVersionOrOptions) : undefined},setParentNodes=${this._setParentNodes}]`;
         if (cacheKey) {
             const meta = this.vfs.filemeta(canonicalFileName);
             const sourceFileFromMetadata = meta.get(cacheKey) as ts.SourceFile | undefined;
@@ -359,7 +361,7 @@ export class CompilerHost implements ts.CompilerHost {
             }
         }
 
-        const parsed = ts.createSourceFile(fileName, content, languageVersion, this._setParentNodes || this.shouldAssertInvariants);
+        const parsed = ts.createSourceFile(fileName, content, languageVersionOrOptions, this._setParentNodes || this.shouldAssertInvariants);
         if (this.shouldAssertInvariants) {
             Utils.assertInvariants(parsed, /*parent*/ undefined);
         }

src/harness/fourslashImpl.ts

@@ -331,10 +331,10 @@ export class TestState {
             // Check if no-default-lib flag is false and if so add default library
             if (!resolvedResult.isLibFile) {
                 this.languageServiceAdapterHost.addScript(Harness.Compiler.defaultLibFileName,
-                    Harness.Compiler.getDefaultLibrarySourceFile()!.text, /*isRootFile*/ false);
+                    Harness.Compiler.getDefaultLibrarySourceFile(compilationOptions)!.text, /*isRootFile*/ false);
 
                 compilationOptions.lib?.forEach(fileName => {
-                    const libFile = Harness.Compiler.getDefaultLibrarySourceFile(fileName);
+                    const libFile = Harness.Compiler.getDefaultLibrarySourceFile(compilationOptions, fileName);
                     ts.Debug.assertIsDefined(libFile, `Could not find lib file '${fileName}'`);
                     if (libFile) {
                         this.languageServiceAdapterHost.addScript(fileName, libFile.text, /*isRootFile*/ false);
@@ -359,7 +359,7 @@ export class TestState {
                 const addSourceFile = (fileName: string) => {
                     if (seen.has(fileName)) return;
                     seen.add(fileName);
-                    const libFile = Harness.Compiler.getDefaultLibrarySourceFile(fileName);
+                    const libFile = Harness.Compiler.getDefaultLibrarySourceFile(compilationOptions, fileName);
                     ts.Debug.assertIsDefined(libFile, `Could not find lib file '${fileName}'`);
                     this.languageServiceAdapterHost.addScript(fileName, libFile.text, /*isRootFile*/ false);
                     if (!ts.some(libFile.libReferenceDirectives)) return;

src/harness/harnessIO.ts

@@ -243,7 +243,7 @@ export namespace Compiler {
     export function createSourceFileAndAssertInvariants(
         fileName: string,
         sourceText: string,
-        languageVersion: ts.ScriptTarget) {
+        languageVersion: ts.CreateSourceFileOptions) {
         // We'll only assert invariants outside of light mode.
         const shouldAssertInvariants = !lightMode;
 
@@ -263,20 +263,20 @@ export namespace Compiler {
     // Cache of lib files from "built/local"
     let libFileNameSourceFileMap: Map<string, ts.SourceFile> | undefined;
 
-    export function getDefaultLibrarySourceFile(fileName = defaultLibFileName): ts.SourceFile | undefined {
+    export function getDefaultLibrarySourceFile(compilerOptions: ts.CompilerOptions, fileName = defaultLibFileName): ts.SourceFile | undefined {
         if (!isDefaultLibraryFile(fileName)) {
             return undefined;
         }
 
         if (!libFileNameSourceFileMap) {
             libFileNameSourceFileMap = new Map(Object.entries({
-                [defaultLibFileName]: createSourceFileAndAssertInvariants(defaultLibFileName, IO.readFile(libFolder + "lib.es5.d.ts")!, /*languageVersion*/ ts.ScriptTarget.Latest)
+                [defaultLibFileName]: createSourceFileAndAssertInvariants(defaultLibFileName, IO.readFile(libFolder + "lib.es5.d.ts")!, { languageVersion: ts.ScriptTarget.Latest, skipJSDoc: compilerOptions.skipJSDocParsing })
             }));
         }
 
         let sourceFile = libFileNameSourceFileMap.get(fileName);
         if (!sourceFile) {
-            libFileNameSourceFileMap.set(fileName, sourceFile = createSourceFileAndAssertInvariants(fileName, IO.readFile(libFolder + fileName)!, ts.ScriptTarget.Latest));
+            libFileNameSourceFileMap.set(fileName, sourceFile = createSourceFileAndAssertInvariants(fileName, IO.readFile(libFolder + fileName)!, { languageVersion: ts.ScriptTarget.Latest, skipJSDoc: compilerOptions.skipJSDocParsing }));
         }
         return sourceFile;
     }

src/services/documentRegistry.ts

@@ -266,7 +266,8 @@ export function createDocumentRegistryInternal(useCaseSensitiveFileNames?: boole
             {
                 languageVersion: scriptTarget,
                 impliedNodeFormat: host && getImpliedNodeFormatForFile(path, host.getCompilerHost?.()?.getModuleResolutionCache?.()?.getPackageJsonInfoCache(), host, compilationSettings),
-                setExternalModuleIndicator: getSetExternalModuleIndicator(compilationSettings)
+                setExternalModuleIndicator: getSetExternalModuleIndicator(compilationSettings),
+                skipJSDoc: compilationSettings.skipJSDocParsing,
             };
         sourceFileOptions.languageVersion = scriptTarget;
         const oldBucketCount = buckets.size;

tests/cases/fourslash/jsdocDeprecated_suggestion_skipJSDoc.ts

@@ -0,0 +1,14 @@
+/// <reference path="fourslash.ts" />
+
+// Although services should never actually have this option set, the harness
+// allows us to pass it, enabling tests which can verify that certain info
+// is not present in the tree.
+
+// @skipJSDocParsing: true
+
+/////** @deprecated */
+////function imDeprecated() {}
+////[|imDeprecated|]()
+
+const [range] = test.ranges();
+verify.getSuggestionDiagnostics([]);