Skip to content

Inactive region highlight#1505

Merged
grdowns merged 9 commits into
masterfrom
inactive-region-highlight
Jan 31, 2018
Merged

Inactive region highlight#1505
grdowns merged 9 commits into
masterfrom
inactive-region-highlight

Conversation

@grdowns

@grdowns grdowns commented Jan 31, 2018

Copy link
Copy Markdown
Contributor
  • Remove Ranges equality comparison as it is only a topical fix for incorrect messages on partial reparses of files from the language server
  • InputRanges replaced with InputRegions. As inactive regions apply to the whole line, having the character number information is not needed

WardenGnaw
WardenGnaw approved these changes Jan 31, 2018
View reviewed changes

@WardenGnaw WardenGnaw left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Next time, don't merge master into your working branch. This way you won't have previous commits listed in the PR. You can either create a new branch off of master git checkout master -b <branchname> or if you are on the branch you are on and are about to start working on it without any changes you can do git reset --hard origin/master.

Don't forget to squash 😄

@pieandcakes

pieandcakes commented Jan 31, 2018

Copy link
Copy Markdown
Contributor

+1 to what @WardenGnaw said.

If you check out latest master, you can do git checkout -b <your new branch name> and it will be based off of latest master, this way you don't have merges in from master. Before you go create a PR, you can also rebase your current branch off of latest master by: git fetch origin master, git rebase origin/master when you are on your own branch and it should place your latest changes ontop of the latest changes in master. It makes the experience cleaner.

@grdowns

grdowns commented Jan 31, 2018 via email

Copy link
Copy Markdown
Contributor Author

@grdowns grdowns merged commit fd7b691 into master Jan 31, 2018
@grdowns grdowns deleted the inactive-region-highlight branch January 31, 2018 22:02
@github-actions github-actions Bot locked and limited conversation to collaborators Oct 15, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@WardenGnaw WardenGnaw WardenGnaw approved these changes

@bobbrow bobbrow bobbrow approved these changes

+1 more reviewer

@pieandcakes pieandcakes pieandcakes approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@WardenGnaw WardenGnaw

@bobbrow bobbrow

@pieandcakes pieandcakes

@sean-mcmanus sean-mcmanus

@grdowns grdowns

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@grdowns @pieandcakes @WardenGnaw @bobbrow @sean-mcmanus