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.

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

[merge-conflicts] fix 'merge-conflicts' command category #6790

Merged
merged 1 commit into from
Dec 23, 2019

Conversation

vince-fugnitto
Copy link
Member

What it does

  • fixed the typo present in the command category prefix.
  • made the command prefix exportable so it can be resued by others.

How to test

  • verify that CI passes for @theia/merge-conflicts (build & tests)
  • verify that the typo is renamed properly

Review checklist

Reminder for reviewers

Signed-off-by: Vincent Fugnitto [email protected]

- fixed the typo present in the command category prefix.
- made the command prefix exportable so it can be resued by others.

Signed-off-by: Vincent Fugnitto <[email protected]>
@vince-fugnitto vince-fugnitto self-assigned this Dec 23, 2019
@@ -35,20 +35,20 @@ export interface MergeConflictCommandArgument {
}

export namespace MergeConflictsCommands {
const MERGE_CONFLIC_PREFIX = 'Merge Conflict';
export const MERGE_CONFLICT_PREFIX = 'Merge Conflict';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need to export this one?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I included the export so that others (extenders) would be able to access the prefix and be able to categorize their commands with existing ones if they wanted to. Do you believe we should not export?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah ok maybe you would have another PR where MERGE_CONFLICT_PREFIX is referenced ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Exactly, let's say I'm an extender who wishes to use the prefix because they are contributing commands to the same category. Before the pull request, they'd have to duplicate and hard code the value while if it is exported they can simply reference it.

Copy link
Contributor

@elaihau elaihau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you Vincent!

@vince-fugnitto
Copy link
Member Author

Thank you Vincent!

Thank you @elaihau!

@vince-fugnitto vince-fugnitto merged commit 2eb1cfc into master Dec 23, 2019
@vince-fugnitto vince-fugnitto deleted the vf/merge-conflicts-typo branch December 23, 2019 19:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants