More fixups

microsoft · Nov 14, 2022 · 89722f1 · 89722f1
1 parent e71b7ce
commit 89722f1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/src/compiler/debug.ts b/src/compiler/debug.ts
@@ -14,7 +14,7 @@ import {
     ObjectFlags, ObjectType, RelationComparisonResult, Signature, SignatureCheckMode,
     SignatureFlags, SnippetKind, SortedReadonlyArray, stableSort, Symbol, SymbolFlags, symbolName, SyntaxKind,
     TransformFlags, Type, TypeFacts, TypeFlags, TypeMapKind, TypeMapper, unescapeLeadingUnderscores, VarianceFlags,
-    version, Version, zipWith,
+    zipWith,
 } from "./_namespaces/ts";
 
 /** @internal */
@@ -33,20 +33,14 @@ export interface LoggingHost {
 
 /** @internal */
 export namespace Debug {
-    let typeScriptVersion: Version | undefined;
-
     /* eslint-disable prefer-const */
     let currentAssertionLevel = AssertionLevel.None;
     export let currentLogLevel = LogLevel.Warning;
     export let isDebugging = false;
     export let loggingHost: LoggingHost | undefined;
-    export let enableDeprecationWarnings = true;
     /* eslint-enable prefer-const */
 
     type AssertionKeys = MatchingKeys<typeof Debug, AnyFunction>;
-    export function getTypeScriptVersion() {
-        return typeScriptVersion ?? (typeScriptVersion = new Version(version));
-    }
 
     export function shouldLog(level: LogLevel): boolean {
         return currentLogLevel <= level;

diff --git a/src/deprecatedCompat/deprecate.ts b/src/deprecatedCompat/deprecate.ts
@@ -8,7 +8,7 @@ export function setEnableDeprecationWarnings(value: boolean) {
 
 let typeScriptVersion: Version | undefined;
 
-export function getTypeScriptVersion() {
+function getTypeScriptVersion() {
     return typeScriptVersion ?? (typeScriptVersion = new Version(version));
 }
 

diff --git a/src/testRunner/unittests/factory.ts b/src/testRunner/unittests/factory.ts
@@ -1,4 +1,5 @@
 import * as ts from "../_namespaces/ts";
+import { setEnableDeprecationWarnings } from "../../deprecatedCompat/deprecate";
 
 describe("unittests:: FactoryAPI", () => {
     function assertSyntaxKind(node: ts.Node, expected: ts.SyntaxKind) {
@@ -85,11 +86,11 @@ describe("unittests:: FactoryAPI", () => {
 
     describe("deprecations", () => {
         beforeEach(() => {
-            ts.Debug.enableDeprecationWarnings = false;
+            setEnableDeprecationWarnings(false);
         });
 
         afterEach(() => {
-            ts.Debug.enableDeprecationWarnings = true;
+            setEnableDeprecationWarnings(true);
         });
 
         // https://github.com/microsoft/TypeScript/issues/50259