Skip to content

Commit 5a0276a

Browse files
jakebaileyjakebailey
committed
Remove a bunch of namespace uses
1 parent 171fb6e commit 5a0276a

35 files changed

+59
-69
lines changed

Diff for: ‎src/compiler/binder.ts

+1-2
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;

Diff for: ‎src/compiler/parser.ts

+10-10
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,
@@ -11,9 +10,10 @@ import { BaseNodeFactory } from "./factory/baseNodeFactory";
1110
import { createNodeFactory, NodeFactoryFlags } from "./factory/nodeFactory";
1211
import {
1312
isAsyncModifier, isExportAssignment, isExportDeclaration, isExportModifier, isExternalModuleReference,
14-
isFunctionTypeNode, isImportDeclaration, isImportEqualsDeclaration, isJSDocFunctionType, isJSDocNullableType,
15-
isJSDocReturnTag, isJSDocTypeTag, isJsxOpeningElement, isJsxOpeningFragment, isMetaProperty, isNonNullExpression,
16-
isPrivateIdentifier, isTaggedTemplateExpression, isTypeReferenceNode,
13+
isFunctionTypeNode, isIdentifier as isIdentifierNode, isImportDeclaration, isImportEqualsDeclaration,
14+
isJSDocFunctionType, isJSDocNullableType, isJSDocReturnTag, isJSDocTypeTag, isJsxOpeningElement,
15+
isJsxOpeningFragment, isMetaProperty, isNonNullExpression, isPrivateIdentifier, isTaggedTemplateExpression,
16+
isTypeReferenceNode,
1717
} from "./factory/nodeTests";
1818
import { setTextRange } from "./factory/utilitiesPublic";
1919
import { fileExtensionIsOneOf, normalizePath } from "./path";
@@ -1757,7 +1757,7 @@ namespace Parser {
17571757
}
17581758

17591759
// 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;
1760+
const expressionText = isIdentifierNode(node) ? idText(node) : undefined;
17611761
if (!expressionText || !isIdentifierText(expressionText, languageVersion)) {
17621762
parseErrorAtCurrentToken(Diagnostics._0_expected, tokenToString(SyntaxKind.SemicolonToken));
17631763
return;
@@ -6335,7 +6335,7 @@ namespace Parser {
63356335
let node: ExpressionStatement | LabeledStatement;
63366336
const hasParen = token() === SyntaxKind.OpenParenToken;
63376337
const expression = allowInAnd(parseExpression);
6338-
if (ts.isIdentifier(expression) && parseOptional(SyntaxKind.ColonToken)) {
6338+
if (isIdentifierNode(expression) && parseOptional(SyntaxKind.ColonToken)) {
63396339
node = factory.createLabeledStatement(expression, parseStatement());
63406340
}
63416341
else {
@@ -8393,7 +8393,7 @@ namespace Parser {
83938393
case SyntaxKind.ArrayType:
83948394
return isObjectOrObjectArrayTypeReference((node as ArrayTypeNode).elementType);
83958395
default:
8396-
return isTypeReferenceNode(node) && ts.isIdentifier(node.typeName) && node.typeName.escapedText === "Object" && !node.typeArguments;
8396+
return isTypeReferenceNode(node) && isIdentifierNode(node.typeName) && node.typeName.escapedText === "Object" && !node.typeArguments;
83978397
}
83988398
}
83998399

@@ -8664,8 +8664,8 @@ namespace Parser {
86648664
}
86658665

86668666
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) {
8667+
while (!isIdentifierNode(a) || !isIdentifierNode(b)) {
8668+
if (!isIdentifierNode(a) && !isIdentifierNode(b) && a.right.escapedText === b.right.escapedText) {
86698669
a = a.left;
86708670
b = b.left;
86718671
}
@@ -8690,7 +8690,7 @@ namespace Parser {
86908690
const child = tryParseChildTag(target, indent);
86918691
if (child && (child.kind === SyntaxKind.JSDocParameterTag || child.kind === SyntaxKind.JSDocPropertyTag) &&
86928692
target !== PropertyLikeParse.CallbackParameter &&
8693-
name && (ts.isIdentifier(child.name) || !escapedTextsEqual(name, child.name.left))) {
8693+
name && (isIdentifierNode(child.name) || !escapedTextsEqual(name, child.name.left))) {
86948694
return false;
86958695
}
86968696
return child;

Diff for: ‎src/compiler/resolutionCache.ts

+5-4
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,
@@ -9,7 +8,9 @@ import { Diagnostics } from "./diagnosticInformationMap.generated";
98
import {
109
CacheWithRedirects, createCacheWithRedirects, createModeAwareCache, createModuleResolutionCache,
1110
createTypeReferenceDirectiveResolutionCache, getEffectiveTypeRoots, isTraceEnabled, loadModuleFromGlobalCache,
12-
ModeAwareCache, ModuleResolutionCache, parseNodeModuleFromPath, pathContainsNodeModules, PerModuleNameCache, trace,
11+
ModeAwareCache, ModuleResolutionCache, parseNodeModuleFromPath, pathContainsNodeModules, PerModuleNameCache,
12+
resolveModuleName as internalResolveModuleName,
13+
resolveTypeReferenceDirective as internalResolveTypeReferenceDirective, trace,
1314
} from "./moduleNameResolver";
1415
import {
1516
directorySeparator, fileExtensionIs, fileExtensionIsOneOf, getDirectoryPath, getNormalizedAbsolutePath,
@@ -349,7 +350,7 @@ export function createResolutionCache(resolutionHost: ResolutionCacheHost, rootD
349350
}
350351

351352
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);
353+
const primaryResult = internalResolveModuleName(moduleName, containingFile, compilerOptions, host, moduleResolutionCache, redirectedReference, mode);
353354
// return result immediately only if global cache support is not enabled or if it is .ts, .tsx or .d.ts
354355
if (!resolutionHost.getGlobalCache) {
355356
return primaryResult;
@@ -381,7 +382,7 @@ export function createResolutionCache(resolutionHost: ResolutionCacheHost, rootD
381382
}
382383

383384
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);
385+
return internalResolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host, redirectedReference, typeReferenceDirectiveResolutionCache, resolutionMode);
385386
}
386387

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

Diff for: ‎src/compiler/transformers/declarations/diagnostics.ts

+2-3
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

Diff for: ‎src/compiler/tsbuildPublic.ts

+2-3
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 {

Diff for: ‎src/compiler/watch.ts

+4-3
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,9 @@ 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 {
45+
DirectoryStructureHost, getWatchFactory, WatchFactory as InternalWatchFactory, WatchFactoryHost, WatchLogLevel,
46+
} from "./watchUtilities";
4647

4748
const sysFormatDiagnosticsHost: FormatDiagnosticsHost | undefined = sys ? {
4849
getCurrentDirectory: () => sys.getCurrentDirectory(),
@@ -613,7 +614,7 @@ export interface WatchTypeRegistry {
613614
NodeModulesForModuleSpecifierCache: "node_modules for module specifier cache invalidation",
614615
}
615616

616-
interface WatchFactory<X, Y = undefined> extends ts.WatchFactory<X, Y> {
617+
interface WatchFactory<X, Y = undefined> extends InternalWatchFactory<X, Y> {
617618
writeLog: (s: string) => void;
618619
}
619620

Diff for: ‎src/debug/dbg.ts

-8
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-
}

Diff for: ‎src/harness/client.ts

+1-1
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";

Diff for: ‎src/harness/fourslashImpl.ts

+1-1
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";

Diff for: ‎src/harness/fourslashInterfaceImpl.ts

+1-1
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";

Diff for: ‎src/server/editorServices.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ import {
5151
PerformanceEvent, TextChange,
5252
} from "../services/types";
5353
import { getSnapshotText, isInsideNodeModules } from "../services/utilities";
54-
import { protocol } from "./_namespaces/ts.server";
5554
import { createPackageJsonCache, PackageJsonCache } from "./packageJsonCache";
5655
import {
5756
AutoImportProviderProject, ConfiguredProject, countEachFileTypes, ExternalProject, hasNoTypeScriptSource,
5857
InferredProject, isConfiguredProject, isInferredProject, Project, ProjectFilesWithTSDiagnostics, ProjectKind,
5958
} from "./project";
59+
import * as protocol from "./protocol";
6060
import { isDynamicFileName, ScriptInfo, ScriptInfoVersion } from "./scriptInfo";
6161
import { Session } from "./session";
6262
import { ServerHost } from "./types";

Diff for: ‎src/server/project.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ 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";
5857
import {
5958
FileStats, forEachResolvedProjectReferenceProject, projectContainsInfoDirectly, ProjectReferenceProjectLoadKind,
6059
ProjectService, updateProjectIfDirty,
6160
} from "./editorServices";
6261
import { createModuleSpecifierCache } from "./moduleSpecifierCache";
62+
import * as protocol from "./protocol";
6363
import { ScriptInfo } from "./scriptInfo";
6464
import { Session } from "./session";
6565
import { ServerHost } from "./types";

Diff for: ‎src/server/scriptInfo.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ import {
1818
emptyOptions, FormatCodeSettings, getDefaultFormatCodeSettings, IScriptSnapshot, ScriptSnapshot,
1919
} from "../services/types";
2020
import { getSnapshotText } from "../services/utilities";
21-
import { protocol } from "./_namespaces/ts.server";
2221
import { maxFileSize } from "./editorServices";
2322
import {
2423
ConfiguredProject, ExternalProject, InferredProject, isConfiguredProject, isExternalProject, isInferredProject,
2524
Project, ProjectKind,
2625
} from "./project";
26+
import * as protocol from "./protocol";
2727
import { AbsolutePositionAndLineText, ScriptVersionCache } from "./scriptVersionCache";
2828
import { ServerHost } from "./types";
2929
import { Errors, NormalizedPath } from "./utilitiesPublic";

Diff for: ‎src/server/scriptVersionCache.ts

+1-1
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;

Diff for: ‎src/server/session.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ import {
5050
import {
5151
documentSpansEqual, getSnapshotText, getTouchingPropertyName, mapOneOrMany, PossibleProgramFileInfo,
5252
} from "../services/utilities";
53-
import { protocol } from "./_namespaces/ts.server";
5453
import {
5554
ConfigFileDiagEvent, convertFormatOptions, convertScriptKindName, convertUserPreferences, isConfigFile,
5655
LargeFileReferencedEvent, ProjectInfoTelemetryEvent, ProjectLanguageServiceStateEvent, ProjectLoadingFinishEvent,
@@ -60,6 +59,7 @@ import {
6059
import {
6160
ConfiguredProject, EmitResult, isConfiguredProject, isExternalProject, isInferredProject, Project, ProjectKind,
6261
} from "./project";
62+
import * as protocol from "./protocol";
6363
import { ScriptInfo } from "./scriptInfo";
6464
import { ServerHost } from "./types";
6565
import { ITypingsInstaller } from "./typingsCache";

Diff for: ‎src/services/documentRegistry.ts

+2-3
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
}

0 commit comments

Comments
 (0)