Further improvements to CSX support #760
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
filipw
commented
Feb 8, 2017
| var cancellationSource = new CancellationTokenSource(TimeSpan.FromMilliseconds(request.Timeout)); | ||
| var metadataDocument = await _metadataHelper.GetDocumentFromMetadata(document.Project, symbol, cancellationSource.Token); | ||
| if (metadataDocument != null) | ||
| try |
There was a problem hiding this comment.
sorry this change got in by accident, will revert
| @@ -62,8 +62,7 @@ public Task<Document> GetDocumentFromMetadata(Project project, ISymbol symbol, C | |||
|
|
|||
| var service = _csharpMetadataAsSourceService.CreateInstance(temporaryDocument.Project.LanguageServices); | |||
| var method = _csharpMetadataAsSourceService.GetMethod(AddSourceToAsync); | |||
|
|
|||
| return method.Invoke<Task<Document>>(service, new object[] { temporaryDocument, topLevelSymbol, cancellationToken }); | |||
| return method.Invoke<Task<Document>>(service, new object[] {temporaryDocument, topLevelSymbol, cancellationToken}); | |||
There was a problem hiding this comment.
Did you mean to indent here?
| CreateCsxProject(csxPath); | ||
| var csxFileName = Path.GetFileName(csxPath); | ||
| var project = ProjectInfo.Create( | ||
| id: ProjectId.CreateNewId(Guid.NewGuid().ToString()), |
There was a problem hiding this comment.
I don't think you need to create a new Guid for this. ProjectId.Create() already does that. The debugName parameter is to give it something human-readable for debugging. (ref)
| Logger.LogError($"{csxPath} will be ignored due to the following error:", ex.ToString()); | ||
| Logger.LogError(ex.ToString()); | ||
| Logger.LogError(ex.InnerException?.ToString() ?? "No inner exception."); | ||
| _logger.LogError(0, ex, $"{csxPath} will be ignored due to an following error"); |
There was a problem hiding this comment.
We've got an extension method that allows you to call LogError without needing to pass an event ID now.
DustinCampbell
approved these changes
Feb 9, 2017
|
All kinds of awesome |
|
thanks, pushed the mentioned changes - should be good to go now |
|
|
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.
This is a follow up PR to the large work we did in #659
In that PR we removed custom scripting code and focused on "standard" Roslyn scripting.
In this PR, we take it a step further and introduce suggestions from Tomas (#659 (comment)) on how to approach CSX projects (which have no project system after all). So what we do here, is we move away from the current model of "project-per-file" to a "project-per-entry-file" model (a project is created only for a top-level CSX file and all its #load dependencies are delegated to Roslyn's
ScriptSourceResolver- we never manually specify project-to-project relationships anymore).This has some terrific results for us:
#rreferences or#loaddirectives and we pick them up in real time#loadper project are now supported (in the past, due to our "project-per-file" model, only 1 was allowed - this is because a submission compilation can only have one project reference)Fixes #227 and #689 - two most important issues we have for CSX at the moment.
Here is the behavior demo for "real time"
#load:And "real time"
#r: