Skip to content

Commit c210b6a

Browse files
jakebaileyjakebailey
committed
Remove a bunch of namespace uses
1 parent 9ca16e2 commit c210b6a

35 files changed

+50
-66
lines changed

‎src/compiler/binder.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import * as ts from "./_namespaces/ts";
21
import { getNodeId } from "./checker";
32
import {
43
append, appendIfUnique, cast, concatenate, contains, every, forEach, getRangesWhere, isString, length, Pattern,
@@ -471,7 +470,7 @@ function createBinder(): (file: SourceFile, options: CompilerOptions) => void {
471470
case SyntaxKind.Parameter:
472471
// Parameters with names are handled at the top of this function. Parameters
473472
// without names can only come from JSDocFunctionTypes.
474-
Debug.assert(node.parent.kind === SyntaxKind.JSDocFunctionType, "Impossible parameter parent kind", () => `parent is: ${(ts as any).SyntaxKind ? (ts as any).SyntaxKind[node.parent.kind] : node.parent.kind}, expected JSDocFunctionType`);
473+
Debug.assert(node.parent.kind === SyntaxKind.JSDocFunctionType, "Impossible parameter parent kind", () => `parent is: ${Debug.formatSyntaxKind(node.parent.kind)}, expected JSDocFunctionType`);
475474
const functionType = node.parent as JSDocFunctionType;
476475
const index = functionType.parameters.indexOf(node as ParameterDeclaration);
477476
return "arg" + index as __String;

‎src/compiler/parser.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import * as ts from "./_namespaces/ts";
21
import { convertToObjectWorker } from "./commandLineParser";
32
import {
43
addRange, append, AssertionLevel, concatenate, emptyArray, emptyMap, findIndex, forEach, getSpellingSuggestion,
@@ -13,7 +12,7 @@ import {
1312
isAsyncModifier, isExportAssignment, isExportDeclaration, isExportModifier, isExternalModuleReference,
1413
isFunctionTypeNode, isImportDeclaration, isImportEqualsDeclaration, isJSDocFunctionType, isJSDocNullableType,
1514
isJSDocReturnTag, isJSDocTypeTag, isJsxOpeningElement, isJsxOpeningFragment, isMetaProperty, isNonNullExpression,
16-
isPrivateIdentifier, isTaggedTemplateExpression, isTypeReferenceNode,
15+
isPrivateIdentifier, isTaggedTemplateExpression, isTypeReferenceNode, isIdentifier as isIdentifierNode,
1716
} from "./factory/nodeTests";
1817
import { setTextRange } from "./factory/utilitiesPublic";
1918
import { fileExtensionIsOneOf, normalizePath } from "./path";
@@ -1757,7 +1756,7 @@ namespace Parser {
17571756
}
17581757

17591758
// Otherwise, if this isn't a well-known keyword-like identifier, give the generic fallback message.
1760-
const expressionText = ts.isIdentifier(node) ? idText(node) : undefined;
1759+
const expressionText = isIdentifierNode(node) ? idText(node) : undefined;
17611760
if (!expressionText || !isIdentifierText(expressionText, languageVersion)) {
17621761
parseErrorAtCurrentToken(Diagnostics._0_expected, tokenToString(SyntaxKind.SemicolonToken));
17631762
return;
@@ -6335,7 +6334,7 @@ namespace Parser {
63356334
let node: ExpressionStatement | LabeledStatement;
63366335
const hasParen = token() === SyntaxKind.OpenParenToken;
63376336
const expression = allowInAnd(parseExpression);
6338-
if (ts.isIdentifier(expression) && parseOptional(SyntaxKind.ColonToken)) {
6337+
if (isIdentifierNode(expression) && parseOptional(SyntaxKind.ColonToken)) {
63396338
node = factory.createLabeledStatement(expression, parseStatement());
63406339
}
63416340
else {
@@ -8393,7 +8392,7 @@ namespace Parser {
83938392
case SyntaxKind.ArrayType:
83948393
return isObjectOrObjectArrayTypeReference((node as ArrayTypeNode).elementType);
83958394
default:
8396-
return isTypeReferenceNode(node) && ts.isIdentifier(node.typeName) && node.typeName.escapedText === "Object" && !node.typeArguments;
8395+
return isTypeReferenceNode(node) && isIdentifierNode(node.typeName) && node.typeName.escapedText === "Object" && !node.typeArguments;
83978396
}
83988397
}
83998398

@@ -8664,8 +8663,8 @@ namespace Parser {
86648663
}
86658664

86668665
function escapedTextsEqual(a: EntityName, b: EntityName): boolean {
8667-
while (!ts.isIdentifier(a) || !ts.isIdentifier(b)) {
8668-
if (!ts.isIdentifier(a) && !ts.isIdentifier(b) && a.right.escapedText === b.right.escapedText) {
8666+
while (!isIdentifierNode(a) || !isIdentifierNode(b)) {
8667+
if (!isIdentifierNode(a) && !isIdentifierNode(b) && a.right.escapedText === b.right.escapedText) {
86698668
a = a.left;
86708669
b = b.left;
86718670
}
@@ -8690,7 +8689,7 @@ namespace Parser {
86908689
const child = tryParseChildTag(target, indent);
86918690
if (child && (child.kind === SyntaxKind.JSDocParameterTag || child.kind === SyntaxKind.JSDocPropertyTag) &&
86928691
target !== PropertyLikeParse.CallbackParameter &&
8693-
name && (ts.isIdentifier(child.name) || !escapedTextsEqual(name, child.name.left))) {
8692+
name && (isIdentifierNode(child.name) || !escapedTextsEqual(name, child.name.left))) {
86948693
return false;
86958694
}
86968695
return child;

‎src/compiler/resolutionCache.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import * as ts from "./_namespaces/ts";
21
import {
32
arrayToMap, contains, createMultiMap, emptyIterator, endsWith, firstDefinedIterator, GetCanonicalFileName, isString,
43
length, memoize, removeSuffix, returnTrue, some, startsWith, stringContains, unorderedRemoveItem,
@@ -10,6 +9,7 @@ import {
109
CacheWithRedirects, createCacheWithRedirects, createModeAwareCache, createModuleResolutionCache,
1110
createTypeReferenceDirectiveResolutionCache, getEffectiveTypeRoots, isTraceEnabled, loadModuleFromGlobalCache,
1211
ModeAwareCache, ModuleResolutionCache, parseNodeModuleFromPath, pathContainsNodeModules, PerModuleNameCache, trace,
12+
resolveTypeReferenceDirective as internalResolveTypeReferenceDirective, resolveModuleName as internalResolveModuleName,
1313
} from "./moduleNameResolver";
1414
import {
1515
directorySeparator, fileExtensionIs, fileExtensionIsOneOf, getDirectoryPath, getNormalizedAbsolutePath,
@@ -349,7 +349,7 @@ export function createResolutionCache(resolutionHost: ResolutionCacheHost, rootD
349349
}
350350

351351
function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, redirectedReference?: ResolvedProjectReference, _containingSourceFile?: never, mode?: ModuleKind.CommonJS | ModuleKind.ESNext | undefined): CachedResolvedModuleWithFailedLookupLocations {
352-
const primaryResult = ts.resolveModuleName(moduleName, containingFile, compilerOptions, host, moduleResolutionCache, redirectedReference, mode);
352+
const primaryResult = internalResolveModuleName(moduleName, containingFile, compilerOptions, host, moduleResolutionCache, redirectedReference, mode);
353353
// return result immediately only if global cache support is not enabled or if it is .ts, .tsx or .d.ts
354354
if (!resolutionHost.getGlobalCache) {
355355
return primaryResult;
@@ -381,7 +381,7 @@ export function createResolutionCache(resolutionHost: ResolutionCacheHost, rootD
381381
}
382382

383383
function resolveTypeReferenceDirective(typeReferenceDirectiveName: string, containingFile: string | undefined, options: CompilerOptions, host: ModuleResolutionHost, redirectedReference?: ResolvedProjectReference, _containingSourceFile?: SourceFile, resolutionMode?: SourceFile["impliedNodeFormat"] | undefined): CachedResolvedTypeReferenceDirectiveWithFailedLookupLocations {
384-
return ts.resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host, redirectedReference, typeReferenceDirectiveResolutionCache, resolutionMode);
384+
return internalResolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host, redirectedReference, typeReferenceDirectiveResolutionCache, resolutionMode);
385385
}
386386

387387
interface ResolveNamesWithLocalCacheInput<T extends ResolutionWithFailedLookupLocations, R extends ResolutionWithResolvedFileName> {

‎src/compiler/transformers/declarations/diagnostics.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import * as ts from "../../_namespaces/ts";
21
import { Debug } from "../../debug";
32
import { Diagnostics } from "../../diagnosticInformationMap.generated";
43
import {
@@ -185,7 +184,7 @@ export function createGetSymbolAccessibilityDiagnosticForNode(node: DeclarationD
185184
return getTypeAliasDeclarationVisibilityError;
186185
}
187186
else {
188-
return Debug.assertNever(node, `Attempted to set a declaration diagnostic context for unhandled node kind: ${(ts as any).SyntaxKind[(node as any).kind]}`);
187+
return Debug.assertNever(node, `Attempted to set a declaration diagnostic context for unhandled node kind: ${Debug.formatSyntaxKind((node as any).kind)}`);
189188
}
190189

191190
function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult: SymbolAccessibilityResult) {
@@ -414,7 +413,7 @@ export function createGetSymbolAccessibilityDiagnosticForNode(node: DeclarationD
414413
Diagnostics.Parameter_0_of_accessor_has_or_is_using_private_name_1;
415414

416415
default:
417-
return Debug.fail(`Unknown parent for parameter: ${(ts as any).SyntaxKind[node.parent.kind]}`);
416+
return Debug.fail(`Unknown parent for parameter: ${Debug.formatSyntaxKind(node.parent.kind)}`);
418417
}
419418
}
420419

‎src/compiler/tsbuildPublic.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import * as ts from "./_namespaces/ts";
21
import {
32
AffectedFileResult, BuilderProgram, EmitAndSemanticDiagnosticsBuilderProgram, SemanticDiagnosticsBuilderProgram,
43
} from "./builderPublic";
@@ -23,7 +22,7 @@ import {
2322
resolveTypeReferenceDirective, TypeReferenceDirectiveResolutionCache,
2423
} from "./moduleNameResolver";
2524
import { isDeclarationFileName } from "./parser";
26-
import { convertToRelativePath, getDirectoryPath, resolvePath } from "./path";
25+
import { convertToRelativePath, getDirectoryPath, resolvePath, toPath as internalToPath } from "./path";
2726
import {
2827
changeCompilerHostLikeToUseCache, flattenDiagnosticMessageText, ForegroundColorEscapeSequences, formatColorAndReset,
2928
getConfigFileParsingDiagnostics, loadWithModeAwareCache, loadWithTypeDirectiveCache,
@@ -408,7 +407,7 @@ function createSolutionBuilderState<T extends BuilderProgram>(watch: boolean, ho
408407
}
409408

410409
function toPath(state: SolutionBuilderState, fileName: string) {
411-
return ts.toPath(fileName, state.currentDirectory, state.getCanonicalFileName);
410+
return internalToPath(fileName, state.currentDirectory, state.getCanonicalFileName);
412411
}
413412

414413
function toResolvedConfigFilePath(state: SolutionBuilderState, fileName: ResolvedConfigFileName): ResolvedConfigFilePath {

‎src/compiler/watch.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import * as ts from "./_namespaces/ts";
21
import {
32
BuilderProgram, createEmitAndSemanticDiagnosticsBuilderProgram, EmitAndSemanticDiagnosticsBuilderProgram,
43
} from "./builderPublic";
@@ -42,7 +41,7 @@ import {
4241
createIncrementalCompilerHost, createIncrementalProgram, CreateProgram, ProgramHost, WatchCompilerHost,
4342
WatchCompilerHostOfConfigFile, WatchCompilerHostOfFilesAndCompilerOptions, WatchHost, WatchStatusReporter,
4443
} from "./watchPublic";
45-
import { DirectoryStructureHost, getWatchFactory, WatchFactoryHost, WatchLogLevel } from "./watchUtilities";
44+
import { DirectoryStructureHost, getWatchFactory, WatchFactoryHost, WatchLogLevel, WatchFactory as InternalWatchFactory } from "./watchUtilities";
4645

4746
const sysFormatDiagnosticsHost: FormatDiagnosticsHost | undefined = sys ? {
4847
getCurrentDirectory: () => sys.getCurrentDirectory(),
@@ -613,7 +612,7 @@ export interface WatchTypeRegistry {
613612
NodeModulesForModuleSpecifierCache: "node_modules for module specifier cache invalidation",
614613
}
615614

616-
interface WatchFactory<X, Y = undefined> extends ts.WatchFactory<X, Y> {
615+
interface WatchFactory<X, Y = undefined> extends InternalWatchFactory<X, Y> {
617616
writeLog: (s: string) => void;
618617
}
619618

‎src/debug/dbg.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import * as Debug from "./_namespaces/Debug";
2-
31
/// <reference lib="es2019" />
42

53
interface Node {
@@ -510,9 +508,3 @@ export function formatControlFlowGraph(flowNode: FlowNode) {
510508
return s;
511509
}
512510
}
513-
514-
// Export as a module. NOTE: Can't use module exports as this is built using --outFile
515-
declare const module: { exports: {} };
516-
if (typeof module !== "undefined" && module.exports) {
517-
module.exports = Debug;
518-
}

‎src/harness/client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
UserPreferences,
1111
} from "../compiler/types";
1212
import { createTextSpanFromBounds } from "../compiler/utilitiesPublic";
13-
import { protocol } from "../server/_namespaces/ts.server";
13+
import * as protocol from "../server/protocol";
1414
import { CommandNames } from "../server/session";
1515
import { DocumentHighlights } from "../services/documentHighlights";
1616
import { PatternMatchKind } from "../services/patternMatcher";

‎src/harness/fourslashImpl.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import {
3636
createTextSpan, textRangeContainsPositionInclusive, textSpanContainsPosition, textSpanEnd,
3737
textSpanIntersectsWithPosition,
3838
} from "../compiler/utilitiesPublic";
39-
import { protocol } from "../server/_namespaces/ts.server";
39+
import * as protocol from "../server/protocol";
4040
import { TokenEncodingConsts, TokenModifier, TokenType } from "../services/classifier2020";
4141
import { importFixName } from "../services/codefixes/importFixes";
4242
import { SortText } from "../services/completions";

‎src/harness/fourslashInterfaceImpl.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Comparison, ESMap, MapLike } from "../compiler/corePublic";
44
import { tokenToString } from "../compiler/scanner";
55
import { LineAndCharacter, Symbol, SyntaxKind, TextSpan, UserPreferences } from "../compiler/types";
66
import { createTextSpan } from "../compiler/utilitiesPublic";
7-
import { protocol } from "../server/_namespaces/ts.server";
7+
import * as protocol from "../server/protocol";
88
import { Completions } from "../services/_namespaces/ts";
99
import { SortText } from "../services/completions";
1010
import { PatternMatchKind } from "../services/patternMatcher";

‎src/server/editorServices.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ import {
5151
PerformanceEvent, TextChange,
5252
} from "../services/types";
5353
import { getSnapshotText, isInsideNodeModules } from "../services/utilities";
54-
import { protocol } from "./_namespaces/ts.server";
54+
import * as protocol from "./protocol";
5555
import { createPackageJsonCache, PackageJsonCache } from "./packageJsonCache";
5656
import {
5757
AutoImportProviderProject, ConfiguredProject, countEachFileTypes, ExternalProject, hasNoTypeScriptSource,

‎src/server/project.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ import {
5454
} from "../services/types";
5555
import { cloneCompilerOptions, isInsideNodeModules } from "../services/utilities";
5656
import * as ts from "./_namespaces/ts";
57-
import { protocol } from "./_namespaces/ts.server";
57+
import * as protocol from "./protocol";
5858
import {
5959
FileStats, forEachResolvedProjectReferenceProject, projectContainsInfoDirectly, ProjectReferenceProjectLoadKind,
6060
ProjectService, updateProjectIfDirty,

‎src/server/scriptInfo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
emptyOptions, FormatCodeSettings, getDefaultFormatCodeSettings, IScriptSnapshot, ScriptSnapshot,
1919
} from "../services/types";
2020
import { getSnapshotText } from "../services/utilities";
21-
import { protocol } from "./_namespaces/ts.server";
21+
import * as protocol from "./protocol";
2222
import { maxFileSize } from "./editorServices";
2323
import {
2424
ConfiguredProject, ExternalProject, InferredProject, isConfiguredProject, isExternalProject, isInferredProject,

‎src/server/scriptVersionCache.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
collapseTextChangeRangesAcrossMultipleVersions, createTextChangeRange, createTextSpan, unchangedTextChangeRange,
66
} from "../compiler/utilitiesPublic";
77
import { IScriptSnapshot } from "../services/types";
8-
import { protocol } from "./_namespaces/ts.server";
8+
import * as protocol from "./protocol";
99
import { emptyArray } from "./utilitiesPublic";
1010

1111
const lineCollectionCapacity = 4;

‎src/server/session.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ import {
5050
import {
5151
documentSpansEqual, getSnapshotText, getTouchingPropertyName, mapOneOrMany, PossibleProgramFileInfo,
5252
} from "../services/utilities";
53-
import { protocol } from "./_namespaces/ts.server";
53+
import * as protocol from "./protocol";
5454
import {
5555
ConfigFileDiagEvent, convertFormatOptions, convertScriptKindName, convertUserPreferences, isConfigFile,
5656
LargeFileReferencedEvent, ProjectInfoTelemetryEvent, ProjectLanguageServiceStateEvent, ProjectLoadingFinishEvent,

‎src/services/documentRegistry.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { sourceFileAffectingCompilerOptions } from "../compiler/commandLineParser";
22
import {
3-
arrayFrom, createGetCanonicalFileName, firstDefinedIterator, getOrUpdate, identity, isArray, map,
3+
arrayFrom, createGetCanonicalFileName, firstDefinedIterator, getOrUpdate, hasProperty, identity, isArray, map,
44
} from "../compiler/core";
55
import { ESMap, Map } from "../compiler/corePublic";
66
import { Debug } from "../compiler/debug";
@@ -14,7 +14,6 @@ import {
1414
import {
1515
ensureScriptKind, forEachEntry, getCompilerOptionValue, getEmitScriptTarget, getSetExternalModuleIndicator,
1616
} from "../compiler/utilities";
17-
import * as ts from "./_namespaces/ts";
1817
import { createLanguageServiceSourceFile, updateLanguageServiceSourceFile } from "./services";
1918
import { IScriptSnapshot } from "./types";
2019

@@ -385,7 +384,7 @@ function compilerOptionValueToString(value: unknown): string {
385384
}
386385
let str = "{";
387386
for (const key in value) {
388-
if (ts.hasOwnProperty.call(value, key)) { // eslint-disable-line @typescript-eslint/no-unnecessary-qualifier
387+
if (hasProperty.call(value, key)) { // eslint-disable-line @typescript-eslint/no-unnecessary-qualifier
389388
str += `${key}: ${compilerOptionValueToString((value as any)[key])}`;
390389
}
391390
}

‎src/testRunner/unittests/services/textChanges.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ import {
1212
import { getNewLineCharacter } from "../../../compiler/utilities";
1313
import { isDeclaration } from "../../../compiler/utilitiesPublic";
1414
import { Baseline } from "../../../harness/harnessIO";
15-
import { textChanges } from "../../../services/_namespaces/ts";
1615
import { FormatContext } from "../../../services/formatting/formatting";
1716
import { getFormatContext } from "../../../services/formatting/rulesMap";
18-
import { applyChanges, ChangeTracker, LeadingTriviaOption, TrailingTriviaOption } from "../../../services/textChanges";
17+
import { applyChanges, ChangeTracker, deleteNode, LeadingTriviaOption, TrailingTriviaOption } from "../../../services/textChanges";
1918
import { testFormatSettings } from "../../../services/types";
2019
import { notImplementedHost } from "./extract/helpers";
2120

2221
// Some tests have trailing whitespace
2322

23+
2424
describe("unittests:: services:: textChanges", () => {
2525
function findChild(name: string, n: Node) {
2626
return find(n)!;
@@ -145,7 +145,6 @@ function bar() {
145145
function findVariableDeclarationContaining(name: string, sourceFile: SourceFile): VariableDeclaration {
146146
return cast(findChild(name, sourceFile), isVariableDeclaration);
147147
}
148-
const { deleteNode } = textChanges;
149148
{
150149
const text = `
151150
var x = 1; // some comment - 1

‎src/testRunner/unittests/tsbuild/publicApi.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { createDiagnosticReporter, getErrorSummaryText } from "../../../compiler
1313
import { patchHostForBuildInfoReadWrite, System } from "../../../harness/fakesHosts";
1414
import { formatPatch } from "../../../harness/vfsUtil";
1515
import { commandLineCallbacks, TscCompileSystem, verifyTscBaseline } from "../tsc/helpers";
16-
import { baselinePrograms } from "../tscWatch/helpers";
16+
import { baselineAllPrograms } from "../tscWatch/helpers";
1717
import { loadProjectFromFiles, toPathWithSystem } from "./helpers";
1818

1919
describe("unittests:: tsbuild:: Public API with custom transformers when passed to build", () => {
@@ -78,7 +78,7 @@ export function f22() { } // trailing`,
7878
sys.exit(exitStatus);
7979
sys.write(`exitCode:: ExitStatus.${ExitStatus[sys.exitCode as ExitStatus]}\n`);
8080
const baseline: string[] = [];
81-
baselinePrograms(baseline, getPrograms, emptyArray, /*baselineDependencies*/ false);
81+
baselineAllPrograms(baseline, getPrograms, emptyArray, /*baselineDependencies*/ false);
8282
sys.write(baseline.join("\n"));
8383
fs.makeReadonly();
8484
sys.baseLine = () => {

0 commit comments

Comments
 (0)