28911 - change Diagnostic.code to 'string | number'

src/compiler/core.ts

@@ -1685,9 +1685,10 @@ namespace ts {
         return equateValues(a, b);
     }
 
-    function compareComparableValues(a: string | undefined, b: string | undefined): Comparison;
-    function compareComparableValues(a: number | undefined, b: number | undefined): Comparison;
-    function compareComparableValues(a: string | number | undefined, b: string | number | undefined) {
+    /**
+     * Compare two values for their order relative to each other.
+     */
+    export function compareComparableValues(a: string | number | undefined, b: string | number | undefined) {
         return a === b ? Comparison.EqualTo :
             a === undefined ? Comparison.LessThan :
             b === undefined ? Comparison.GreaterThan :

src/compiler/types.ts

@@ -4427,7 +4427,7 @@ namespace ts {
     }
     export interface DiagnosticRelatedInformation {
         category: DiagnosticCategory;
-        code: number;
+        code: number | string;
         file: SourceFile | undefined;
         start: number | undefined;
         length: number | undefined;

src/compiler/utilities.ts

@@ -7103,7 +7103,7 @@ namespace ts {
         return compareStringsCaseSensitive(getDiagnosticFilePath(d1), getDiagnosticFilePath(d2)) ||
             compareValues(d1.start, d2.start) ||
             compareValues(d1.length, d2.length) ||
-            compareValues(d1.code, d2.code) ||
+            compareComparableValues(d1.code, d2.code) ||
             compareMessageText(d1.messageText, d2.messageText) ||
             Comparison.EqualTo;
     }

src/server/protocol.ts

@@ -473,7 +473,7 @@ namespace ts.server.protocol {
         startLocation: Location;
         endLocation: Location;
         category: string;
-        code: number;
+        code: number | string;
         /** May store more in future. For now, this will simply be `true` to indicate when a diagnostic is an unused-identifier diagnostic. */
         reportsUnnecessary?: {};
         relatedInformation?: DiagnosticRelatedInformation[];
@@ -2349,7 +2349,7 @@ namespace ts.server.protocol {
         /**
          * The error code of the diagnostic message.
          */
-        code?: number;
+        code?: number | string;
 
         /**
          * The name of the plugin reporting the message.
@@ -2375,7 +2375,7 @@ namespace ts.server.protocol {
         /**
          * The code used ot identify the related information
          */
-        code: number;
+        code: number | string;
         /**
          * Text of related or additional information.
          */

src/services/codefixes/fixCannotFindModule.ts

@@ -147,7 +147,7 @@ namespace ts.codefix {
         return isExternalModuleNameRelative(packageName) ? undefined : packageName;
     }
 
-    function getTypesPackageNameToInstall(packageName: string, host: LanguageServiceHost, diagCode: number): string | undefined {
+    function getTypesPackageNameToInstall(packageName: string, host: LanguageServiceHost, diagCode: number | string): string | undefined {
         return diagCode === errorCodeCannotFindModule
             ? (JsTyping.nodeCoreModules.has(packageName) ? "@types/node" : undefined)
             : (host.isKnownTypesPackageName!(packageName) ? getTypesPackageName(packageName) : undefined); // TODO: GH#18217

src/services/codefixes/fixForgottenThisPropertyAccess.ts

@@ -25,7 +25,7 @@ namespace ts.codefix {
     });
 
     interface Info { readonly node: Identifier; readonly className: string | undefined; }
-    function getInfo(sourceFile: SourceFile, pos: number, diagCode: number): Info | undefined {
+    function getInfo(sourceFile: SourceFile, pos: number, diagCode: number | string): Info | undefined {
         const node = getTokenAtPosition(sourceFile, pos);
         if (!isIdentifier(node)) return undefined;
         return { node, className: diagCode === didYouMeanStaticMemberCode ? getContainingClass(node)!.name!.text : undefined };

src/services/codefixes/fixUnusedIdentifier.ts

@@ -146,7 +146,7 @@ namespace ts.codefix {
         return false;
     }
 
-    function tryPrefixDeclaration(changes: textChanges.ChangeTracker, errorCode: number, sourceFile: SourceFile, token: Node): void {
+    function tryPrefixDeclaration(changes: textChanges.ChangeTracker, errorCode: number | string, sourceFile: SourceFile, token: Node): void {
         // Don't offer to prefix a property.
         if (errorCode === Diagnostics.Property_0_is_declared_but_its_value_is_never_read.code) return;
         if (token.kind === SyntaxKind.InferKeyword) {

src/services/codefixes/importFixes.ts

@@ -315,7 +315,7 @@ namespace ts.codefix {
     }
 
     interface FixesInfo { readonly fixes: ReadonlyArray<ImportFix>; readonly symbolName: string; }
-    function getFixesInfo(context: CodeFixContextBase, errorCode: number, pos: number): FixesInfo | undefined {
+    function getFixesInfo(context: CodeFixContextBase, errorCode: number | string, pos: number): FixesInfo | undefined {
         const symbolToken = getTokenAtPosition(context.sourceFile, pos);
         const info = errorCode === Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead.code
             ? getFixesInfoForUMDImport(context, symbolToken)

src/services/codefixes/inferFromUsage.ts

@@ -79,7 +79,7 @@ namespace ts.codefix {
     }
 
     /** Map suggestion code to error code */
-    function mapSuggestionDiagnostic(errorCode: number) {
+    function mapSuggestionDiagnostic(errorCode: number | string) {
         switch (errorCode) {
             case Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_but_a_better_type_may_be_inferred_from_usage.code:
                 return Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code;
@@ -101,7 +101,7 @@ namespace ts.codefix {
         return errorCode;
     }
 
-    function doChange(changes: textChanges.ChangeTracker, sourceFile: SourceFile, token: Node, errorCode: number, program: Program, cancellationToken: CancellationToken, markSeen: NodeSeenTracker, host: LanguageServiceHost): Declaration | undefined {
+    function doChange(changes: textChanges.ChangeTracker, sourceFile: SourceFile, token: Node, errorCode: number | string, program: Program, cancellationToken: CancellationToken, markSeen: NodeSeenTracker, host: LanguageServiceHost): Declaration | undefined {
         if (!isParameterPropertyModifier(token.kind) && token.kind !== SyntaxKind.Identifier && token.kind !== SyntaxKind.DotDotDotToken && token.kind !== SyntaxKind.ThisKeyword) {
             return undefined;
         }

src/services/shims.ts

@@ -590,7 +590,7 @@ namespace ts {
         start: number;
         length: number;
         category: string;
-        code: number;
+        code: number | string;
         reportsUnnecessary?: {};
     }
     export function realizeDiagnostics(diagnostics: ReadonlyArray<Diagnostic>, newLine: string): RealizedDiagnostic[] {

src/services/types.ts

@@ -333,7 +333,7 @@ namespace ts {
         /** @internal */
         getSourceMapper(): SourceMapper;
 
-        getCodeFixesAtPosition(fileName: string, start: number, end: number, errorCodes: ReadonlyArray<number>, formatOptions: FormatCodeSettings, preferences: UserPreferences): ReadonlyArray<CodeFixAction>;
+        getCodeFixesAtPosition(fileName: string, start: number, end: number, errorCodes: ReadonlyArray<number | string>, formatOptions: FormatCodeSettings, preferences: UserPreferences): ReadonlyArray<CodeFixAction>;
         getCombinedCodeFix(scope: CombinedCodeFixScope, fixId: {}, formatOptions: FormatCodeSettings, preferences: UserPreferences): CombinedCodeActions;
         applyCodeActionCommand(action: CodeActionCommand, formatSettings?: FormatCodeSettings): Promise<ApplyCodeActionCommandResult>;
         applyCodeActionCommand(action: CodeActionCommand[], formatSettings?: FormatCodeSettings): Promise<ApplyCodeActionCommandResult[]>;

src/testRunner/unittests/tsserverProjectSystem.ts

@@ -192,7 +192,7 @@ namespace ts.projectSystem {
         length: number | undefined;
         messageText: string;
         category: DiagnosticCategory;
-        code: number;
+        code: number | string;
         reportsUnnecessary?: {};
         source?: string;
         relatedInformation?: DiagnosticRelatedInformation[];

tests/baselines/reference/api/tsserverlibrary.d.ts

@@ -2399,7 +2399,7 @@ declare namespace ts {
     }
     interface DiagnosticRelatedInformation {
         category: DiagnosticCategory;
-        code: number;
+        code: number | string;
         file: SourceFile | undefined;
         start: number | undefined;
         length: number | undefined;
@@ -4736,7 +4736,7 @@ declare namespace ts {
         getJsxClosingTagAtPosition(fileName: string, position: number): JsxClosingTagInfo | undefined;
         getSpanOfEnclosingComment(fileName: string, position: number, onlyMultiLine: boolean): TextSpan | undefined;
         toLineColumnOffset?(fileName: string, position: number): LineAndCharacter;
-        getCodeFixesAtPosition(fileName: string, start: number, end: number, errorCodes: ReadonlyArray<number>, formatOptions: FormatCodeSettings, preferences: UserPreferences): ReadonlyArray<CodeFixAction>;
+        getCodeFixesAtPosition(fileName: string, start: number, end: number, errorCodes: ReadonlyArray<number | string>, formatOptions: FormatCodeSettings, preferences: UserPreferences): ReadonlyArray<CodeFixAction>;
         getCombinedCodeFix(scope: CombinedCodeFixScope, fixId: {}, formatOptions: FormatCodeSettings, preferences: UserPreferences): CombinedCodeActions;
         applyCodeActionCommand(action: CodeActionCommand, formatSettings?: FormatCodeSettings): Promise<ApplyCodeActionCommandResult>;
         applyCodeActionCommand(action: CodeActionCommand[], formatSettings?: FormatCodeSettings): Promise<ApplyCodeActionCommandResult[]>;
@@ -5984,7 +5984,7 @@ declare namespace ts.server.protocol {
         startLocation: Location;
         endLocation: Location;
         category: string;
-        code: number;
+        code: number | string;
         /** May store more in future. For now, this will simply be `true` to indicate when a diagnostic is an unused-identifier diagnostic. */
         reportsUnnecessary?: {};
         relatedInformation?: DiagnosticRelatedInformation[];
@@ -7454,7 +7454,7 @@ declare namespace ts.server.protocol {
         /**
          * The error code of the diagnostic message.
          */
-        code?: number;
+        code?: number | string;
         /**
          * The name of the plugin reporting the message.
          */
@@ -7477,7 +7477,7 @@ declare namespace ts.server.protocol {
         /**
          * The code used ot identify the related information
          */
-        code: number;
+        code: number | string;
         /**
          * Text of related or additional information.
          */

tests/baselines/reference/api/typescript.d.ts

@@ -2399,7 +2399,7 @@ declare namespace ts {
     }
     interface DiagnosticRelatedInformation {
         category: DiagnosticCategory;
-        code: number;
+        code: number | string;
         file: SourceFile | undefined;
         start: number | undefined;
         length: number | undefined;
@@ -4736,7 +4736,7 @@ declare namespace ts {
         getJsxClosingTagAtPosition(fileName: string, position: number): JsxClosingTagInfo | undefined;
         getSpanOfEnclosingComment(fileName: string, position: number, onlyMultiLine: boolean): TextSpan | undefined;
         toLineColumnOffset?(fileName: string, position: number): LineAndCharacter;
-        getCodeFixesAtPosition(fileName: string, start: number, end: number, errorCodes: ReadonlyArray<number>, formatOptions: FormatCodeSettings, preferences: UserPreferences): ReadonlyArray<CodeFixAction>;
+        getCodeFixesAtPosition(fileName: string, start: number, end: number, errorCodes: ReadonlyArray<number | string>, formatOptions: FormatCodeSettings, preferences: UserPreferences): ReadonlyArray<CodeFixAction>;
         getCombinedCodeFix(scope: CombinedCodeFixScope, fixId: {}, formatOptions: FormatCodeSettings, preferences: UserPreferences): CombinedCodeActions;
         applyCodeActionCommand(action: CodeActionCommand, formatSettings?: FormatCodeSettings): Promise<ApplyCodeActionCommandResult>;
         applyCodeActionCommand(action: CodeActionCommand[], formatSettings?: FormatCodeSettings): Promise<ApplyCodeActionCommandResult[]>;