Needed changes for Notebook UI Support #1321
Merged
Conversation
This file contains 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
rjmholt
reviewed
Jul 2, 2020
| // For any vscode-notebook-cell, we need to ignore the backing file on disk. | ||
| if (scriptFile.DocumentUri.Scheme == "vscode-notebook-cell" && | ||
| uri.Path == scriptFile.DocumentUri.Path && | ||
| uri.Scheme == "file") |
There was a problem hiding this comment.
This check is probably simpler and should perhaps come second
| DocumentUri uri = DocumentUri.From(foundReference.FilePath); | ||
| // For any vscode-notebook-cell, we need to ignore the backing file on disk. | ||
| if (scriptFile.DocumentUri.Scheme == "vscode-notebook-cell" && | ||
| uri.Path == scriptFile.DocumentUri.Path && |
There was a problem hiding this comment.
Does this need to be case-insensitive?
There was a problem hiding this comment.
They should be identical ... because in both cases it's using the actual file path on the file system.
| @@ -217,8 +217,7 @@ internal static List<string> GetLinesInternal(string text) | |||
| internal static bool IsUntitledPath(string path) | |||
| { | |||
| Validate.IsNotNull(nameof(path), path); | |||
|
|
|||
| return path.ToLower().StartsWith("untitled:"); | |||
| return DocumentUri.From(path).Scheme.ToLower() != Uri.UriSchemeFile; | |||
There was a problem hiding this comment.
Suggested change
| return DocumentUri.From(path).Scheme.ToLower() != Uri.UriSchemeFile; | |
| return string.Equals(DocumentUri.From(path).Scheme, Uri.UriSchemeFile, StringComparison.OrdinalIgnoreCase); |
rjmholt
approved these changes
Jul 2, 2020
|
There is nothing really stopping this from going in now... but I'll wait until we're a bit further along with PowerShell/vscode-powershell#2789 |
TylerLeonhardt
force-pushed
the
notebook-ui-support
branch
from
6157315 to
5045b8d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I wanted to make changes to PSES as small as possible because Notebook UI is a vscode feature, but some things had to be done.