microsoft
diff --git a/‎scripts/processDiagnosticMessages.ts
Copy file name to clipboard
+7-4Lines changed: 7 additions & 4 deletions b/‎scripts/processDiagnosticMessages.ts
Copy file name to clipboard
+7-4Lines changed: 7 additions & 4 deletions
diff --git a/‎src/compiler/binder.ts
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions b/‎src/compiler/binder.ts
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎src/compiler/builder.ts
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions b/‎src/compiler/builder.ts
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎src/compiler/checker.ts
Copy file name to clipboard
+55-29Lines changed: 55 additions & 29 deletions b/‎src/compiler/checker.ts
Copy file name to clipboard
+55-29Lines changed: 55 additions & 29 deletions
diff --git a/‎src/compiler/diagnosticMessages.json
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions b/‎src/compiler/diagnosticMessages.json
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎src/compiler/factory/nodeFactory.ts
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions b/‎src/compiler/factory/nodeFactory.ts
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎src/compiler/factory/nodeTests.ts
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions b/‎src/compiler/factory/nodeTests.ts
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎src/compiler/parser.ts
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions b/‎src/compiler/parser.ts
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions
@@ -5,6 +5,7 @@ interface DiagnosticDetails {
     category: string;
     code: number;
     reportsUnnecessary?: {};
+    reportsDeprecated?: {};
     isEarly?: boolean;
     elidedInCompatabilityPyramid?: boolean;
 }
@@ -64,15 +65,17 @@ function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, inputFil
         "// generated from '" + inputFilePathRel + "' by '" + thisFilePathRel.replace(/\\/g, "/") + "'\r\n" +
         "/* @internal */\r\n" +
         "namespace ts {\r\n" +
-        "    function diag(code: number, category: DiagnosticCategory, key: string, message: string, reportsUnnecessary?: {}, elidedInCompatabilityPyramid?: boolean): DiagnosticMessage {\r\n" +
-        "        return { code, category, key, message, reportsUnnecessary, elidedInCompatabilityPyramid };\r\n" +
+        "    function diag(code: number, category: DiagnosticCategory, key: string, message: string, reportsUnnecessary?: {}, elidedInCompatabilityPyramid?: boolean, reportsDeprecated?: {}): DiagnosticMessage {\r\n" +
+        "        return { code, category, key, message, reportsUnnecessary, elidedInCompatabilityPyramid, reportsDeprecated };\r\n" +
         "    }\r\n" +
         "    export const Diagnostics = {\r\n";
-    messageTable.forEach(({ code, category, reportsUnnecessary, elidedInCompatabilityPyramid }, name) => {
+    messageTable.forEach(({ code, category, reportsUnnecessary, elidedInCompatabilityPyramid, reportsDeprecated }, name) => {
         const propName = convertPropertyName(name);
         const argReportsUnnecessary = reportsUnnecessary ? `, /*reportsUnnecessary*/ ${reportsUnnecessary}` : "";
         const argElidedInCompatabilityPyramid = elidedInCompatabilityPyramid ? `${!reportsUnnecessary ? ", /*reportsUnnecessary*/ undefined" : ""}, /*elidedInCompatabilityPyramid*/ ${elidedInCompatabilityPyramid}` : "";
-        result += `        ${propName}: diag(${code}, DiagnosticCategory.${category}, "${createKey(propName, code)}", ${JSON.stringify(name)}${argReportsUnnecessary}${argElidedInCompatabilityPyramid}),\r\n`;
+        const argReportsDeprecated = reportsDeprecated ? `${!argElidedInCompatabilityPyramid ? ", /*reportsUnnecessary*/ undefined, /*elidedInCompatabilityPyramid*/ undefined" : ""}, /*reportsDeprecated*/ ${reportsDeprecated}` : "";
+
+        result += `        ${propName}: diag(${code}, DiagnosticCategory.${category}, "${createKey(propName, code)}", ${JSON.stringify(name)}${argReportsUnnecessary}${argElidedInCompatabilityPyramid}${argReportsDeprecated}),\r\n`;
     });
 
     result += "    };\r\n}";
 
@@ -537,6 +537,10 @@ namespace ts {
                 symbol.parent = parent;
             }
 
+            if (node.flags & NodeFlags.Deprecated) {
+                symbol.flags |= SymbolFlags.Deprecated;
+            }
+
             return symbol;
         }
 
 
@@ -3,6 +3,7 @@ namespace ts {
     export interface ReusableDiagnostic extends ReusableDiagnosticRelatedInformation {
         /** May store more in future. For now, this will simply be `true` to indicate when a diagnostic is an unused-identifier diagnostic. */
         reportsUnnecessary?: {};
+        reportDeprecated?: {}
         source?: string;
         relatedInformation?: ReusableDiagnosticRelatedInformation[];
         skippedOn?: keyof CompilerOptions;
@@ -268,6 +269,7 @@ namespace ts {
         return diagnostics.map(diagnostic => {
             const result: Diagnostic = convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath);
             result.reportsUnnecessary = diagnostic.reportsUnnecessary;
+            result.reportsDeprecated = diagnostic.reportDeprecated;
             result.source = diagnostic.source;
             result.skippedOn = diagnostic.skippedOn;
             const { relatedInformation } = diagnostic;
@@ -817,6 +819,7 @@ namespace ts {
         return diagnostics.map(diagnostic => {
             const result: ReusableDiagnostic = convertToReusableDiagnosticRelatedInformation(diagnostic, relativeToBuildInfo);
             result.reportsUnnecessary = diagnostic.reportsUnnecessary;
+            result.reportDeprecated = diagnostic.reportsDeprecated;
             result.source = diagnostic.source;
             result.skippedOn = diagnostic.skippedOn;
             const { relatedInformation } = diagnostic;
 
@@ -13168,6 +13168,10 @@ namespace ts {
             if (propName !== undefined) {
                 const prop = getPropertyOfType(objectType, propName);
                 if (prop) {
+                    if (accessNode && prop.flags & SymbolFlags.Deprecated) {
+                        const deprecatedNode = accessExpression?.argumentExpression ?? (isIndexedAccessTypeNode(accessNode) ? accessNode.indexType : accessNode);
+                        errorOrSuggestion(/* isError */ false, deprecatedNode, Diagnostics._0_is_deprecated, propName as string);
+                    }
                     if (accessExpression) {
                         markPropertyAsReferenced(prop, accessExpression, /*isThisAccess*/ accessExpression.expression.kind === SyntaxKind.ThisKeyword);
                         if (isAssignmentToReadonlyEntity(accessExpression, prop, getAssignmentTargetKind(accessExpression))) {
@@ -21698,6 +21702,10 @@ namespace ts {
             const localOrExportSymbol = getExportSymbolOfValueSymbolIfExported(symbol);
             let declaration: Declaration | undefined = localOrExportSymbol.valueDeclaration;
 
+            const target = (symbol.flags & SymbolFlags.Alias ? resolveAlias(symbol) : symbol);
+            if (target.flags & SymbolFlags.Deprecated) {
+                errorOrSuggestion(/* isError */ false, node, Diagnostics._0_is_deprecated, node.escapedText as string);
+            }
             if (localOrExportSymbol.flags & SymbolFlags.Class) {
                 // Due to the emit for class decorators, any reference to the class from inside of the class body
                 // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
@@ -24679,6 +24687,10 @@ namespace ts {
                 propType = indexInfo.type;
             }
             else {
+                if (prop.flags & SymbolFlags.Deprecated) {
+                    errorOrSuggestion(/* isError */ false, right, Diagnostics._0_is_deprecated, right.escapedText as string);
+                }
+
                 checkPropertyNotUsedBeforeDeclaration(prop, node, right);
                 markPropertyAsReferenced(prop, node, left.kind === SyntaxKind.ThisKeyword);
                 getNodeLinks(node).resolvedSymbol = prop;
@@ -30499,8 +30511,15 @@ namespace ts {
                         checkTypeArgumentConstraints(node, typeParameters);
                     }
                 }
-                if (type.flags & TypeFlags.Enum && getNodeLinks(node).resolvedSymbol!.flags & SymbolFlags.EnumMember) {
-                    error(node, Diagnostics.Enum_type_0_has_members_with_initializers_that_are_not_literals, typeToString(type));
+                const symbol = getNodeLinks(node).resolvedSymbol;
+                if (symbol) {
+                    if (symbol.flags & SymbolFlags.Deprecated) {
+                        const diagLocation = isTypeReferenceNode(node) && isQualifiedName(node.typeName) ? node.typeName.right : node;
+                        errorOrSuggestion(/* isError */ false, diagLocation, Diagnostics._0_is_deprecated, symbol.escapedName as string);
+                    }
+                    if (type.flags & TypeFlags.Enum && symbol.flags & SymbolFlags.EnumMember) {
+                        error(node, Diagnostics.Enum_type_0_has_members_with_initializers_that_are_not_literals, typeToString(type));
+                    }
                 }
             }
         }
@@ -31644,6 +31663,7 @@ namespace ts {
                 error(classLike, Diagnostics.JSDoc_0_is_not_attached_to_a_class, idText(node.tagName));
             }
         }
+
         function checkJSDocAugmentsTag(node: JSDocAugmentsTag): void {
             const classLike = getEffectiveJSDocHost(node);
             if (!classLike || !isClassDeclaration(classLike) && !isClassExpression(classLike)) {
@@ -34803,33 +34823,39 @@ namespace ts {
             let symbol = getSymbolOfNode(node);
             const target = resolveAlias(symbol);
 
-            const shouldSkipWithJSExpandoTargets = symbol.flags & SymbolFlags.Assignment;
-            if (!shouldSkipWithJSExpandoTargets && target !== unknownSymbol) {
-                // For external modules symbol represents local symbol for an alias.
-                // This local symbol will merge any other local declarations (excluding other aliases)
-                // and symbol.flags will contains combined representation for all merged declaration.
-                // Based on symbol.flags we can compute a set of excluded meanings (meaning that resolved alias should not have,
-                // otherwise it will conflict with some local declaration). Note that in addition to normal flags we include matching SymbolFlags.Export*
-                // in order to prevent collisions with declarations that were exported from the current module (they still contribute to local names).
-                symbol = getMergedSymbol(symbol.exportSymbol || symbol);
-                const excludedMeanings =
-                    (symbol.flags & (SymbolFlags.Value | SymbolFlags.ExportValue) ? SymbolFlags.Value : 0) |
-                    (symbol.flags & SymbolFlags.Type ? SymbolFlags.Type : 0) |
-                    (symbol.flags & SymbolFlags.Namespace ? SymbolFlags.Namespace : 0);
-                if (target.flags & excludedMeanings) {
-                    const message = node.kind === SyntaxKind.ExportSpecifier ?
-                        Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 :
-                        Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0;
-                    error(node, message, symbolToString(symbol));
-                }
-
-                // Don't allow to re-export something with no value side when `--isolatedModules` is set.
-                if (compilerOptions.isolatedModules
-                    && node.kind === SyntaxKind.ExportSpecifier
-                    && !node.parent.parent.isTypeOnly
-                    && !(target.flags & SymbolFlags.Value)
-                    && !(node.flags & NodeFlags.Ambient)) {
-                    error(node, Diagnostics.Re_exporting_a_type_when_the_isolatedModules_flag_is_provided_requires_using_export_type);
+            if (target !== unknownSymbol) {
+                const shouldSkipWithJSExpandoTargets = symbol.flags & SymbolFlags.Assignment;
+                if (!shouldSkipWithJSExpandoTargets) {
+                    // For external modules symbol represents local symbol for an alias.
+                    // This local symbol will merge any other local declarations (excluding other aliases)
+                    // and symbol.flags will contains combined representation for all merged declaration.
+                    // Based on symbol.flags we can compute a set of excluded meanings (meaning that resolved alias should not have,
+                    // otherwise it will conflict with some local declaration). Note that in addition to normal flags we include matching SymbolFlags.Export*
+                    // in order to prevent collisions with declarations that were exported from the current module (they still contribute to local names).
+                    symbol = getMergedSymbol(symbol.exportSymbol || symbol);
+                    const excludedMeanings =
+                        (symbol.flags & (SymbolFlags.Value | SymbolFlags.ExportValue) ? SymbolFlags.Value : 0) |
+                        (symbol.flags & SymbolFlags.Type ? SymbolFlags.Type : 0) |
+                        (symbol.flags & SymbolFlags.Namespace ? SymbolFlags.Namespace : 0);
+                    if (target.flags & excludedMeanings) {
+                        const message = node.kind === SyntaxKind.ExportSpecifier ?
+                            Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 :
+                            Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0;
+                        error(node, message, symbolToString(symbol));
+                    }
+
+                    // Don't allow to re-export something with no value side when `--isolatedModules` is set.
+                    if (compilerOptions.isolatedModules
+                        && node.kind === SyntaxKind.ExportSpecifier
+                        && !node.parent.parent.isTypeOnly
+                        && !(target.flags & SymbolFlags.Value)
+                        && !(node.flags & NodeFlags.Ambient)) {
+                        error(node, Diagnostics.Re_exporting_a_type_when_the_isolatedModules_flag_is_provided_requires_using_export_type);
+                    }
+                }
+
+                if (isImportSpecifier(node) && target.flags & SymbolFlags.Deprecated) {
+                    errorOrSuggestion(/* isError */ false, node.name, Diagnostics._0_is_deprecated, symbol.escapedName as string);
                 }
             }
         }
 
@@ -4602,6 +4602,11 @@
         "category": "Message",
         "code": 6384
     },
+    "'{0}' is deprecated": {
+        "category": "Suggestion",
+        "code": 6385,
+        "reportsDeprecated": true
+    },
 
     "The expected type comes from property '{0}' which is declared here on type '{1}'": {
         "category": "Message",
 
@@ -358,6 +358,8 @@ namespace ts {
             get updateJSDocProtectedTag() { return getJSDocSimpleTagUpdateFunction<JSDocProtectedTag>(SyntaxKind.JSDocProtectedTag); },
             get createJSDocReadonlyTag() { return getJSDocSimpleTagCreateFunction<JSDocReadonlyTag>(SyntaxKind.JSDocReadonlyTag); },
             get updateJSDocReadonlyTag() { return getJSDocSimpleTagUpdateFunction<JSDocReadonlyTag>(SyntaxKind.JSDocReadonlyTag); },
+            get createJSDocDeprecatedTag() { return getJSDocSimpleTagCreateFunction<JSDocDeprecatedTag>(SyntaxKind.JSDocDeprecatedTag); },
+            get updateJSDocDeprecatedTag() { return getJSDocSimpleTagUpdateFunction<JSDocDeprecatedTag>(SyntaxKind.JSDocDeprecatedTag); },
             createJSDocUnknownTag,
             updateJSDocUnknownTag,
             createJSDocComment,
@@ -4225,6 +4227,7 @@ namespace ts {
         // createJSDocPrivateTag
         // createJSDocProtectedTag
         // createJSDocReadonlyTag
+        // createJSDocDeprecatedTag
         function createJSDocSimpleTagWorker<T extends JSDocTag>(kind: T["kind"], tagName: Identifier | undefined, comment?: string) {
             const node = createBaseJSDocTag<T>(kind, tagName ?? createIdentifier(getDefaultTagNameForKind(kind)), comment);
             return node;
@@ -4237,6 +4240,7 @@ namespace ts {
         // updateJSDocPrivateTag
         // updateJSDocProtectedTag
         // updateJSDocReadonlyTag
+        // updateJSDocDeprecatedTag
         function updateJSDocSimpleTagWorker<T extends JSDocTag>(kind: T["kind"], node: T, tagName: Identifier = getDefaultTagName(node), comment: string | undefined) {
             return node.tagName !== tagName
                 || node.comment !== comment
 
@@ -769,6 +769,10 @@ namespace ts {
         return node.kind === SyntaxKind.JSDocReadonlyTag;
     }
 
+    export function isJSDocDeprecatedTag(node: Node): node is JSDocDeprecatedTag {
+        return node.kind === SyntaxKind.JSDocDeprecatedTag;
+
+    }
     export function isJSDocEnumTag(node: Node): node is JSDocEnumTag {
         return node.kind === SyntaxKind.JSDocEnumTag;
     }
 
@@ -1014,10 +1014,15 @@ namespace ts {
             return hasJSDoc ? addJSDocComment(node) : node;
         }
 
+        let hasDeprecatedTag = false;
         function addJSDocComment<T extends HasJSDoc>(node: T): T {
             Debug.assert(!node.jsDoc); // Should only be called once per node
             const jsDoc = mapDefined(getJSDocCommentRanges(node, sourceText), comment => JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos));
             if (jsDoc.length) node.jsDoc = jsDoc;
+            if (hasDeprecatedTag) {
+                hasDeprecatedTag = false;
+                (node as Mutable<T>).flags |= NodeFlags.Deprecated;
+            }
             return node;
         }
 
@@ -7178,6 +7183,10 @@ namespace ts {
                         case "readonly":
                             tag = parseSimpleTag(start, factory.createJSDocReadonlyTag, tagName, margin, indentText);
                             break;
+                        case "deprecated":
+                            hasDeprecatedTag = true;
+                            tag = parseSimpleTag(start, factory.createJSDocDeprecatedTag, tagName, margin, indentText);
+                            break;
                         case "this":
                             tag = parseThisTag(start, tagName, margin, indentText);
                             break;
Original file line number	Diff line number	Diff line change
`@@ -537,6 +537,10 @@ namespace ts {`
`537`	`537`	`symbol.parent = parent;`
`538`	`538`	`}`
`539`	`539`
	`540`	`+ if (node.flags & NodeFlags.Deprecated) {`
	`541`	`+ symbol.flags \|= SymbolFlags.Deprecated;`
	`542`	`+ }`
	`543`	`+`
`540`	`544`	`return symbol;`
`541`	`545`	`}`
`542`	`546`
Original file line number	Diff line number	Diff line change
`@@ -769,6 +769,10 @@ namespace ts {`
`769`	`769`	`return node.kind === SyntaxKind.JSDocReadonlyTag;`
`770`	`770`	`}`
`771`	`771`
	`772`	`+ export function isJSDocDeprecatedTag(node: Node): node is JSDocDeprecatedTag {`
	`773`	`+ return node.kind === SyntaxKind.JSDocDeprecatedTag;`
	`774`	`+`
	`775`	`+ }`
`772`	`776`	`export function isJSDocEnumTag(node: Node): node is JSDocEnumTag {`
`773`	`777`	`return node.kind === SyntaxKind.JSDocEnumTag;`
`774`	`778`	`}`