Changed "Duplicate Identifier" to "enum cannot be merged..." #18579
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
NaridaL
force-pushed
the
merge_enum_error
branch
from
ca89bd9 to
1ac2b8f
Compare
|
@DanielRosenwasser can i get your input on the proposed error message here? |
|
@DanielRosenwasser If you OK the message, I'll rebase the PR and we can merge it^^. |
mhegazy
reviewed
Feb 2, 2018
src/compiler/diagnosticMessages.json
Outdated
| "category": "Error", | ||
| "code": 2563 | ||
| }, | ||
| "An enum cannot be merged with a class, interface, function, namespace or variable.": { |
There was a problem hiding this comment.
how about Enum declarations can only merge with namespace or other enum declarations.
when either declaration of the identifier is an enum. Partial (?) fix for microsoft#529 Not sure if the new test is necessary, all the cases seem to have been covered by others tests.
NaridaL
force-pushed
the
merge_enum_error
branch
from
1ac2b8f to
8d4bd48
Compare
|
@mhegazy "Enum declarations can only merge with namespace or other enum declarations." definitely seems better. I rebased and changed it. |
mhegazy
reviewed
Feb 2, 2018
src/compiler/checker.ts
Outdated
| else { | ||
| const message = target.flags & SymbolFlags.BlockScopedVariable || source.flags & SymbolFlags.BlockScopedVariable | ||
| ? Diagnostics.Cannot_redeclare_block_scoped_variable_0 : Diagnostics.Duplicate_identifier_0; | ||
| let message = Diagnostics.Duplicate_identifier_0; |
There was a problem hiding this comment.
nit:
const message = target.flags & SymbolFlags.Enum || source.flags & SymbolFlags.Enum
? Diagnostics.Enum_declarations_can_only_merge_with_namespace_or_other_enum_declaration
: target.flags & SymbolFlags.BlockScopedVariable || source.flags & SymbolFlags.BlockScopedVariable
? Diagnostics.Cannot_redeclare_block_scoped_variable_0
: Diagnostics.Duplicate_identifier_0;
|
thanks! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
when either declaration of the identifier is an enum.
Partial (?) fix for #529