* Move completion provider tests to FindInnermostNode
This required adjusting some implementation logic that would have been broken by https://github.com/dotnet/razor/pull/9455, but weren't caught by the tests directly on the main completion provider. We should consider moving these tests to more functional-style implementation, where we test the whole provider pipeline, to avoid potential future bugs here.
* Move TagHelperFactsService tests to FindInnermostNode
* Apply rename suggestion from code review
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
From Version 9.0.0-beta.23551.1 -> To Version 9.0.0-beta.23552.4
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This is an automatically generated pull request from release/dev17.9
into main.
Once all conflicts are resolved and all the tests pass, you are free to
merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file containing conflicts copy its
path into the following searches:
- https://github.com/dotnet/razor/find/release/dev17.9
- https://github.com/dotnet/razor/find/main
Usually the most recent change to a file between the two branches is
considered to have introduced the conflicts, but sometimes it will be
necessary to look for the conflicting lines and check the blame in each
branch. Generally the author whose change introduced the conflicts
should pull down this PR, fix the conflicts locally, then push up a
commit resolving the conflicts.
### Resolve merge conflicts using your local repo
Sometimes merge conflicts may be present on GitHub but merging locally
will work without conflicts. This is due to differences between the
merge algorithm used in local git versus the one used by GitHub.
``` bash
git fetch --all
git checkout -t upstream/merges/release/dev17.9-to-main
git reset --hard upstream/main
git merge upstream/release/dev17.9
# Fix merge conflicts
git commit
git push upstream merges/release/dev17.9-to-main --force
```
* Whitespace
Just a couple of error list issues
* Null enable project snapshot manager
* Prevent a missing project from bringing down the language server
* Don't use the fallback manager if we know about real info now
* Allow documents to be found in the misc files project
This is a regression from pre-multi-targeting. I incorrectly assumed that if we got project context info, it must mean the project was known, but that isn't true at start up necessarily.
* Use a null namespace, don't hardcode the default
This felt wrong, but I doubt it meaningfully changes things.
* Rename action class to match the rest
(and fix typo)
* Thank you Visual Studio for not telling me about these possible null references, I was not mentally prepared to handle them.
This is an automatically generated pull request from release/dev17.9
into main.
Once all conflicts are resolved and all the tests pass, you are free to
merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file containing conflicts copy its
path into the following searches:
- https://github.com/dotnet/razor/find/release/dev17.9
- https://github.com/dotnet/razor/find/main
Usually the most recent change to a file between the two branches is
considered to have introduced the conflicts, but sometimes it will be
necessary to look for the conflicting lines and check the blame in each
branch. Generally the author whose change introduced the conflicts
should pull down this PR, fix the conflicts locally, then push up a
commit resolving the conflicts.
### Resolve merge conflicts using your local repo
Sometimes merge conflicts may be present on GitHub but merging locally
will work without conflicts. This is due to differences between the
merge algorithm used in local git versus the one used by GitHub.
``` bash
git fetch --all
git checkout -t upstream/merges/release/dev17.9-to-main
git reset --hard upstream/main
git merge upstream/release/dev17.9
# Fix merge conflicts
git commit
git push upstream merges/release/dev17.9-to-main --force
```
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
From Version 9.0.0-beta.23531.4 -> To Version 9.0.0-beta.23551.1
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Remove LocateOwner from completion scenarios
Move all completion scenarios over to FindToken.
* More LocateOwner replacements
* Add missing usings, move FindInnermostNode to PreviousToken.
* Handle markers, differences in legacy tree vs modern tree.
* Add additional comment to switch.
* Loosen restrictions on walkMarkersBack and turn it on by default.
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
From Version 9.0.0-beta.23531.1 -> To Version 9.0.0-beta.23531.4
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This is a regression from pre-multi-targeting. I incorrectly assumed that if we got project context info, it must mean the project was known, but that isn't true at start up necessarily.
This is an automatically generated pull request from release/dev17.8
into main.
Once all conflicts are resolved and all the tests pass, you are free to
merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file containing conflicts copy its
path into the following searches:
- https://github.com/dotnet/razor/find/release/dev17.8
- https://github.com/dotnet/razor/find/main
Usually the most recent change to a file between the two branches is
considered to have introduced the conflicts, but sometimes it will be
necessary to look for the conflicting lines and check the blame in each
branch. Generally the author whose change introduced the conflicts
should pull down this PR, fix the conflicts locally, then push up a
commit resolving the conflicts.
### Resolve merge conflicts using your local repo
Sometimes merge conflicts may be present on GitHub but merging locally
will work without conflicts. This is due to differences between the
merge algorithm used in local git versus the one used by GitHub.
``` bash
git fetch --all
git checkout -t upstream/merges/release/dev17.8-to-main
git reset --hard upstream/main
git merge upstream/release/dev17.8
# Fix merge conflicts
git commit
git push upstream merges/release/dev17.8-to-main --force
```
This is an automatically generated pull request from release/dev17.8
into main.
Once all conflicts are resolved and all the tests pass, you are free to
merge the pull request. 🐯
## Troubleshooting conflicts
### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file containing conflicts copy its
path into the following searches:
- https://github.com/dotnet/razor/find/release/dev17.8
- https://github.com/dotnet/razor/find/main
Usually the most recent change to a file between the two branches is
considered to have introduced the conflicts, but sometimes it will be
necessary to look for the conflicting lines and check the blame in each
branch. Generally the author whose change introduced the conflicts
should pull down this PR, fix the conflicts locally, then push up a
commit resolving the conflicts.
### Resolve merge conflicts using your local repo
Sometimes merge conflicts may be present on GitHub but merging locally
will work without conflicts. This is due to differences between the
merge algorithm used in local git versus the one used by GitHub.
``` bash
git fetch --all
git checkout -t upstream/merges/release/dev17.8-to-main
git reset --hard upstream/main
git merge upstream/release/dev17.8
# Fix merge conflicts
git commit
git push upstream merges/release/dev17.8-to-main --force
```
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
From Version 9.0.0-beta.23528.2 -> To Version 9.0.0-beta.23531.1
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Port SyntaxNavigator from Roslyn
Port over SyntaxNavigator from Roslyn. Future PRs will expose `GetNextToken()` and `GetPreviousToken()` as methods on `SyntaxToken`, similar to Roslyn, for use in the IDE layer. I've also rewritten FindToken to utilize this, instead of the hand-built system I did previously. More dedicated tests for SyntaxNavigator are still needed in this PR.
* Add GetFirstToken/GetLastToken/GetNextToken/GetPreviousToken apis, and add comprehensive testing for the APIs.
* Move FindToken to the SyntaxToken APIs, rather than directly calling SyntaxNavigator
* Remove unused local function
David Wengier
dotnet-maestro[bot]
Jan Jones
Andrew Hall
Fred Silberberg
dotnet-maestro[bot]
dotnet bot
Maryam Ariyan
Dustin Campbell