Direct import Debug in critical areas

src/compiler/binder.ts

@@ -39,7 +39,6 @@ import {
     createFileDiagnostic,
     createQueue,
     createSymbolTable,
-    Debug,
     Declaration,
     declarationNameToString,
     DeleteExpression,
@@ -312,6 +311,7 @@ import {
     WithStatement,
 } from "./_namespaces/ts";
 import * as performance from "./_namespaces/ts.performance";
+import * as Debug from "./debug";
 
 /** @internal */
 export const enum ModuleInstanceState {

src/compiler/builder.ts

@@ -25,7 +25,6 @@ import {
     createGetCanonicalFileName,
     createProgram,
     CustomTransformers,
-    Debug,
     Diagnostic,
     DiagnosticCategory,
     DiagnosticMessageChain,
@@ -80,6 +79,7 @@ import {
     WriteFileCallback,
     WriteFileCallbackData,
 } from "./_namespaces/ts";
+import * as Debug from "./debug";
 
 /** @internal */
 export interface ReusableDiagnostic extends ReusableDiagnosticRelatedInformation {

src/compiler/builderState.ts

@@ -3,7 +3,6 @@ import {
     CancellationToken,
     computeSignatureWithDiagnostics,
     CustomTransformers,
-    Debug,
     EmitOutput,
     emptyArray,
     ExportedModulesFromDeclarationEmit,
@@ -33,6 +32,7 @@ import {
     toPath,
     TypeChecker,
 } from "./_namespaces/ts";
+import * as Debug from "./debug";
 
 /** @internal */
 export function getFileEmitOutput(program: Program, sourceFile: SourceFile, emitOnlyDtsFiles: boolean,

src/compiler/checker.ts

@@ -112,7 +112,6 @@ import {
     createSymbolTable,
     createTextWriter,
     createUnderscoreEscapedMultiMap,
-    Debug,
     Declaration,
     DeclarationName,
     declarationNameToString,
@@ -1040,6 +1039,7 @@ import {
 } from "./_namespaces/ts";
 import * as performance from "./_namespaces/ts.performance";
 import * as moduleSpecifiers from "./_namespaces/ts.moduleSpecifiers";
+import * as Debug from "./debug";
 
 const ambientModuleSymbolRegex = /^".+"$/;
 const anon = "(anonymous)" as __String & string;

src/compiler/commandLineParser.ts

@@ -20,7 +20,6 @@ import {
     createCompilerDiagnostic,
     createDiagnosticForNodeInSourceFile,
     createGetCanonicalFileName,
-    Debug,
     Diagnostic,
     DiagnosticMessage,
     Diagnostics,
@@ -120,6 +119,7 @@ import {
     WatchFileKind,
     WatchOptions,
 } from "./_namespaces/ts";
+import * as Debug from "./debug";
 
 /** @internal */
 export const compileOnSaveCommandLineOption: CommandLineOption = {

src/compiler/core.ts

@@ -3,7 +3,6 @@ import {
     CharacterCodes,
     Comparer,
     Comparison,
-    Debug,
     EqualityComparer,
     isWhiteSpaceLike,
     MapLike,
@@ -14,7 +13,7 @@ import {
     TextSpan,
     UnderscoreEscapedMap,
 } from "./_namespaces/ts";
-
+import * as Debug from "./debug";
 
 /** @internal */
 export const emptyArray: never[] = [] as never[];

src/compiler/emitter.ts

@@ -68,7 +68,6 @@ import {
     createSourceMapGenerator,
     createTextWriter,
     CustomTransformers,
-    Debug,
     DebuggerStatement,
     DeclarationName,
     Decorator,
@@ -449,6 +448,7 @@ import {
     YieldExpression,
 } from "./_namespaces/ts";
 import * as performance from "./_namespaces/ts.performance";
+import * as Debug from "./debug";
 
 const brackets = createBracketsMap();
 

src/compiler/factory/emitHelpers.ts

@@ -7,7 +7,6 @@ import {
     compareValues,
     Comparison,
     createExpressionFromEntityName,
-    Debug,
     EmitFlags,
     EmitHelper,
     EmitHelperUniqueNameCallback,
@@ -33,6 +32,7 @@ import {
     TransformationContext,
     UnscopedEmitHelper,
 } from "../_namespaces/ts";
+import * as Debug from "../debug";
 
 /** @internal */
 export interface EmitHelperFactory {

src/compiler/factory/emitNode.ts

@@ -3,7 +3,6 @@ import {
     append,
     appendIfUnique,
     AutoGenerateInfo,
-    Debug,
     EmitFlags,
     EmitHelper,
     EmitNode,
@@ -26,6 +25,7 @@ import {
     TypeNode,
     TypeParameterDeclaration,
 } from "../_namespaces/ts";
+import * as Debug from "../debug";
 
 /**
  * Associates a node with the current transformation, initializing

src/compiler/factory/nodeConverters.ts

@@ -7,7 +7,6 @@ import {
     Block,
     cast,
     ConciseBody,
-    Debug,
     Expression,
     FunctionDeclaration,
     getStartsOnNewLine,
@@ -32,6 +31,7 @@ import {
     setTextRange,
     SyntaxKind,
 } from "../_namespaces/ts";
+import * as Debug from "../debug";
 
 /** @internal */
 export function createNodeConverters(factory: NodeFactory): NodeConverters {

src/compiler/factory/nodeFactory.ts

@@ -63,7 +63,6 @@ import {
     createNodeConverters,
     createParenthesizerRules,
     createScanner,
-    Debug,
     DebuggerStatement,
     Declaration,
     DeclarationName,
@@ -471,6 +470,7 @@ import {
     WithStatement,
     YieldExpression,
 } from "../_namespaces/ts";
+import * as Debug from "../debug";
 
 let nextAutoGenerateId = 0;
 

src/compiler/factory/utilities.ts

@@ -20,7 +20,6 @@ import {
     CommaListExpression,
     compareStringsCaseSensitive,
     CompilerOptions,
-    Debug,
     Declaration,
     EmitFlags,
     EmitHelperFactory,
@@ -167,6 +166,7 @@ import {
     TypeNode,
     TypeParameterDeclaration,
 } from "../_namespaces/ts";
+import * as Debug from "../debug";
 
 // Compound nodes
 

src/compiler/moduleNameResolver.ts

@@ -14,7 +14,6 @@ import {
     contains,
     containsPath,
     createCompilerDiagnostic,
-    Debug,
     deduplicate,
     Diagnostic,
     DiagnosticMessage,
@@ -108,6 +107,7 @@ import {
     versionMajorMinor,
     VersionRange,
 } from "./_namespaces/ts";
+import * as Debug from "./debug";
 
 /** @internal */
 export function trace(host: ModuleResolutionHost, message: DiagnosticMessage, ...args: any[]): void;

src/compiler/moduleSpecifiers.ts

@@ -14,7 +14,6 @@ import {
     containsIgnoredPath,
     containsPath,
     createGetCanonicalFileName,
-    Debug,
     directorySeparator,
     emptyArray,
     endsWith,
@@ -107,6 +106,7 @@ import {
     TypeChecker,
     UserPreferences,
 } from "./_namespaces/ts";
+import * as Debug from "./debug";
 
 // Used by importFixes, getEditsForFileRename, and declaration emit to synthesize import module specifiers.
 

src/compiler/parser.ts

@@ -59,7 +59,6 @@ import {
     createScanner,
     createTextChangeRange,
     createTextSpanFromBounds,
-    Debug,
     Decorator,
     DefaultClause,
     DeleteExpression,
@@ -389,6 +388,7 @@ import {
     YieldExpression,
 } from "./_namespaces/ts";
 import * as performance from "./_namespaces/ts.performance";
+import * as Debug from "./debug";
 
 const enum SignatureFlags {
     None = 0,

src/compiler/path.ts

@@ -4,7 +4,6 @@ import {
     compareStringsCaseSensitive,
     compareValues,
     Comparison,
-    Debug,
     endsWith,
     equateStringsCaseInsensitive,
     equateStringsCaseSensitive,
@@ -17,6 +16,7 @@ import {
     startsWith,
     stringContains,
 } from "./_namespaces/ts";
+import * as Debug from "./debug";
 
 /**
  * Internally, we represent paths as strings with '/' as the directory separator.

src/compiler/performance.ts

@@ -1,5 +1,4 @@
 import {
-    Debug,
     noop,
     Performance,
     PerformanceHooks,
@@ -8,6 +7,7 @@ import {
     timestamp,
     tryGetNativePerformanceHooks,
 } from "./_namespaces/ts";
+import * as Debug from "./debug";
 
 /** Performance measurements for the compiler. */
 

src/compiler/program.ts

@@ -51,7 +51,6 @@ import {
     createTypeChecker,
     createTypeReferenceDirectiveResolutionCache,
     CustomTransformers,
-    Debug,
     DeclarationWithTypeParameterChildren,
     DeprecationVersion,
     Diagnostic,
@@ -316,6 +315,7 @@ import {
     zipToModeAwareCache,
 } from "./_namespaces/ts";
 import * as performance from "./_namespaces/ts.performance";
+import * as Debug from "./debug";
 
 export function findConfigFile(searchPath: string, fileExists: (fileName: string) => boolean, configName = "tsconfig.json"): string | undefined {
     return forEachAncestorDirectory(searchPath, ancestor => {

src/compiler/resolutionCache.ts

@@ -12,7 +12,6 @@ import {
     createMultiMap,
     createTypeReferenceDirectiveResolutionCache,
     createTypeReferenceResolutionLoader,
-    Debug,
     Diagnostics,
     directorySeparator,
     DirectoryWatcherCallback,
@@ -73,6 +72,7 @@ import {
     updateResolutionField,
     WatchDirectoryFlags,
 } from "./_namespaces/ts";
+import * as Debug from "./debug";
 
 /**
  * This is the cache of module/typedirectives resolution that can be retained across program

src/compiler/scanner.ts

@@ -8,7 +8,6 @@ import {
     CommentKind,
     CommentRange,
     compareValues,
-    Debug,
     DiagnosticMessage,
     Diagnostics,
     identity,
@@ -26,6 +25,7 @@ import {
     TokenFlags,
     trimStringStart,
 } from "./_namespaces/ts";
+import * as Debug from "./debug";
 
 export type ErrorCallback = (message: DiagnosticMessage, length: number) => void;
 

src/compiler/semver.ts

@@ -2,14 +2,14 @@ import {
     compareStringsCaseSensitive,
     compareValues,
     Comparison,
-    Debug,
     emptyArray,
     every,
     isArray,
     map,
     some,
     trimString,
 } from "./_namespaces/ts";
+import * as Debug from "./debug";
 
 // https://semver.org/#spec-item-2
 // > A normal version number MUST take the form X.Y.Z where X, Y, and Z are non-negative
@@ -427,4 +427,4 @@ function formatAlternative(comparators: readonly Comparator[]) {
 
 function formatComparator(comparator: Comparator) {
     return `${comparator.operator}${comparator.operand}`;
-}
+}

src/compiler/sourcemap.ts

@@ -4,7 +4,6 @@ import {
     CharacterCodes,
     combinePaths,
     compareValues,
-    Debug,
     DocumentPosition,
     DocumentPositionMapper,
     DocumentPositionMapperHost,
@@ -27,6 +26,7 @@ import {
     trimStringEnd,
 } from "./_namespaces/ts";
 import * as performance from "./_namespaces/ts.performance";
+import * as Debug from "./debug";
 
 /** @internal */
 export interface SourceMapGeneratorOptions {

src/compiler/sys.ts

@@ -8,7 +8,6 @@ import {
     containsPath,
     createGetCanonicalFileName,
     createMultiMap,
-    Debug,
     directorySeparator,
     emptyArray,
     emptyFileSystemEntries,
@@ -47,6 +46,7 @@ import {
     WatchOptions,
     writeFileEnsuringDirectories,
 } from "./_namespaces/ts";
+import * as Debug from "./debug";
 
 declare function setTimeout(handler: (...args: any[]) => void, timeout: number): any;
 declare function clearTimeout(handle: any): void;

src/compiler/tracing.ts

@@ -1,7 +1,6 @@
 import {
     combinePaths,
     ConditionalType,
-    Debug,
     EvolvingArrayType,
     getLineAndCharacterOfPosition,
     getSourceFileOfNode,
@@ -22,6 +21,7 @@ import {
     UnionType,
 } from "./_namespaces/ts";
 import * as performance from "./_namespaces/ts.performance";
+import * as Debug from "./debug";
 
 /* Tracing events for the compiler. */