Skip to content

Add jsdoc support for @public/@private/@protected #35731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sandersn merged 12 commits into from
Dec 18, 2019
Merged

Add jsdoc support for @public/@private/@protected #35731

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
87666a9
Add @private/@protected/@public test
sandersn Dec 10, 2019
9c1a370
Fix @declaration
sandersn Dec 10, 2019
88dcb39
draft abstraction + one usage
sandersn Dec 10, 2019
871a643
Fill in necessary parsing etc
sandersn Dec 10, 2019
455b7b3
make general getEffectiveModifierFlags
sandersn Dec 13, 2019
bd5781a
reorder public/private/protected
sandersn Dec 13, 2019
14d3c38
JS declaration emit works with @public/@private/@protected
sandersn Dec 14, 2019
b80847b
revert unneeded/incorrect changes
sandersn Dec 17, 2019
62a568d
Update baselines and skip @public/etc when parsing
sandersn Dec 17, 2019
f30f399
Parser: don't call hasModifier(s) anymore.
sandersn Dec 17, 2019
37a586a
Merge branch 'master' into private/protected-jsdoc
sandersn Dec 17, 2019
8182bfd
Fix constructor emit
sandersn Dec 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
revert unneeded/incorrect changes
  • Loading branch information
@sandersn
sandersn committed Dec 17, 2019
commit b80847b26a43aed4126b52efea6a823c9306b9a7
10 changes: 4 additions & 6 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5570,7 +5570,6 @@ namespace ts {
getPropertiesOfType(staticType),
p => !(p.flags & SymbolFlags.Prototype) && p.escapedName !== "prototype"
), p => serializePropertySymbolForClass(p, /*isStatic*/ true, staticBaseType));

const constructors = serializeSignatures(SignatureKind.Construct, staticType, baseTypes[0], SyntaxKind.Constructor) as ConstructorDeclaration[];
for (const c of constructors) {
// A constructor's return type and type parameters are supposed to be controlled by the enclosing class declaration
Expand Down Expand Up @@ -6442,7 +6441,7 @@ namespace ts {
case SyntaxKind.SetAccessor:
case SyntaxKind.MethodDeclaration:
case SyntaxKind.MethodSignature:
if (getEffectiveModifierFlags(node) & (ModifierFlags.Private | ModifierFlags.Protected)) {
if (hasModifier(node, ModifierFlags.Private | ModifierFlags.Protected)) {
// Private/protected properties/methods are not visible
return false;
}
Expand Down Expand Up @@ -9776,7 +9775,6 @@ namespace ts {
const type = getApparentType(current);
if (type !== errorType) {
const prop = getPropertyOfType(type, name);
getEffectiveModifierFlags
const modifiers = prop ? getDeclarationModifierFlagsFromSymbol(prop) : 0;
if (prop && !(modifiers & excludeModifiers)) {
if (isUnion) {
Expand Down Expand Up @@ -28362,9 +28360,9 @@ namespace ts {
const otherKind = node.kind === SyntaxKind.GetAccessor ? SyntaxKind.SetAccessor : SyntaxKind.GetAccessor;
const otherAccessor = getDeclarationOfKind<AccessorDeclaration>(getSymbolOfNode(node), otherKind);
if (otherAccessor) {
const nodeFlags = getEffectiveModifierFlags(node) & ModifierFlags.AccessibilityModifier;
const otherFlags = getEffectiveModifierFlags(otherAccessor) & ModifierFlags.AccessibilityModifier;
if (nodeFlags !== otherFlags) {
const nodeFlags = getEffectiveModifierFlags(node);
const otherFlags = getEffectiveModifierFlags(otherAccessor);
if ((nodeFlags & ModifierFlags.AccessibilityModifier) !== (otherFlags & ModifierFlags.AccessibilityModifier)) {
error(node.name, Diagnostics.Getter_and_setter_accessors_do_not_agree_in_visibility);
}
if ((nodeFlags & ModifierFlags.Abstract) !== (otherFlags & ModifierFlags.Abstract)) {
Expand Down