Skip to content
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

Jump to bottom

report error for duplicate @type declaration #38340

Merged
merged 1 commit into from
May 11, 2020
Merged

report error for duplicate @type declaration #38340

merged 1 commit into from
May 11, 2020

Conversation

wenqi73
Copy link
Contributor

@wenqi73 wenqi73 commented May 5, 2020

Fixes #17442

@msftclas
Copy link

msftclas commented May 5, 2020 •
edited
Loading

CLA assistant check
All CLA requirements met.

@wenqi73
Copy link
Contributor Author

wenqi73 commented May 11, 2020

@sandersn Could you help review this?

@sandersn
Copy link
Member

Thanks @wenqi73 !

@sandersn sandersn merged commit 1b7b3eb into microsoft:master May 11, 2020
@wenqi73 wenqi73 deleted the fix/17442 branch May 12, 2020 00:43
cangSDARM added a commit to cangSDARM/TypeScript that referenced this pull request May 12, 2020
@cangSDARM
Merge remote-tracking branch 'upstream/master'
2e7319b 
* upstream/master: (54 commits)
  LEGO: check in for master to temporary branch.
  LEGO: check in for master to temporary branch.
  Fix for jsdoc modifiers on constructor params (microsoft#38403)
  Improve assert message in binder (microsoft#38270)
  fix broken regex on "src/services/completions.ts#getCompletionData" (microsoft#37546)
  report error for duplicate @type declaration (microsoft#38340)
  fix(38073): hide 'Extract to function in global scope' action for arrow functions which use 'this' (microsoft#38107)
  Update user baselines (microsoft#38472)
  Update user baselines (microsoft#38405)
  Changed template strings to emit void 0 instead of undefined (microsoft#38430)
  Fix js missing type arguments on existing nodes and jsdoc object literal declaration emit (microsoft#38368)
  LEGO: check in for master to temporary branch.
  Make isDynamicFileName available publicly (microsoft#38269)
  LEGO: check in for master to temporary branch.
  LEGO: check in for master to temporary branch.
  Exclude arrays and tuples from full intersection property check (microsoft#38395)
  Fix crash caused by assertion with evolving array type (microsoft#38398)
  Update user baselines (microsoft#38128)
  LEGO: check in for master to temporary branch.
  moveToNewFile: handle namespace imports too
  ...

# Conflicts:
#	src/compiler/types.ts
#	src/compiler/utilities.ts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sandersn sandersn sandersn approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Report error for duplicate @type declaration in @typedef
3 participants
@wenqi73 @msftclas @sandersn