Skip to content

Commit

Permalink
Merge branch 'release/vs16.0-preview3'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ajaybhargavb
ajaybhargavb committed Feb 1, 2019
2 parents f5b95aa + 79f9684 commit 77532db
Show file tree
Hide file tree
Showing 19 changed files with 852 additions and 94 deletions.
4 changes: 2 additions & 2 deletions ...azor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIntermediateNodeLoweringPhase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1008,7 +1008,7 @@ private void VisitAttributeValue(SyntaxNode node)

IReadOnlyList<SyntaxNode> children = node.ChildNodes();
var position = node.Position;
if (children.First() is MarkupBlockSyntax markupBlock &&
if (children.FirstOrDefault() is MarkupBlockSyntax markupBlock &&
markupBlock.Children.Count == 2 &&
markupBlock.Children[0] is MarkupTextLiteralSyntax &&
markupBlock.Children[1] is MarkupEphemeralTextLiteralSyntax)
Expand Down Expand Up @@ -1725,7 +1725,7 @@ private void VisitAttributeValue(SyntaxNode node)

IReadOnlyList<SyntaxNode> children = node.ChildNodes();
var position = node.Position;
if (children.First() is MarkupBlockSyntax markupBlock &&
if (children.FirstOrDefault() is MarkupBlockSyntax markupBlock &&
markupBlock.Children.Count == 2 &&
markupBlock.Children[0] is MarkupTextLiteralSyntax &&
markupBlock.Children[1] is MarkupEphemeralTextLiteralSyntax)
Expand Down
207 changes: 181 additions & 26 deletions src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultVisualStudioRazorParser.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,18 @@ internal class DefaultVisualStudioRazorParser : VisualStudioRazorParser, IDispos
internal RazorSyntaxTreePartialParser _partialParser;

private readonly object IdleLock = new object();
private readonly object GetCodeDocumentLock = new object();
private readonly object UpdateStateLock = new object();
private readonly VisualStudioCompletionBroker _completionBroker;
private readonly VisualStudioDocumentTracker _documentTracker;
private readonly ForegroundDispatcher _dispatcher;
private readonly ProjectSnapshotProjectEngineFactory _projectEngineFactory;
private readonly ErrorReporter _errorReporter;
private TaskCompletionSource<RazorCodeDocument> _codeDocumentTaskCompletionSource;
private readonly List<SyntaxTreeRequest> _syntaxTreeRequests;
private RazorProjectEngine _projectEngine;
private RazorCodeDocument _codeDocument;
private ITextSnapshot _snapshot;
private bool _disposed;
private ITextSnapshot _latestParsedSnapshot;

// For testing only
internal DefaultVisualStudioRazorParser(RazorCodeDocument codeDocument)
Expand Down Expand Up @@ -86,6 +87,7 @@ public DefaultVisualStudioRazorParser(
_errorReporter = errorReporter;
_completionBroker = completionBroker;
_documentTracker = documentTracker;
_syntaxTreeRequests = new List<SyntaxTreeRequest>();

_documentTracker.ContextChanged += DocumentTracker_ContextChanged;
}
Expand All @@ -106,24 +108,38 @@ public DefaultVisualStudioRazorParser(
// Used in unit tests to ensure we can block background idle work.
internal ManualResetEventSlim BlockBackgroundIdleWork { get; set; }

public override Task<RazorCodeDocument> GetLatestCodeDocumentAsync()
public override Task<RazorSyntaxTree> GetLatestSyntaxTreeAsync(ITextSnapshot atOrNewerSnapshot, CancellationToken cancellationToken = default)
{
lock (GetCodeDocumentLock)
if (atOrNewerSnapshot == null)
{
if (_disposed || !HasPendingChanges)
throw new ArgumentNullException(nameof(atOrNewerSnapshot));
}

lock (UpdateStateLock)
{
if (_disposed ||
(_latestParsedSnapshot != null && atOrNewerSnapshot.Version.VersionNumber <= _latestParsedSnapshot.Version.VersionNumber))
{
// No pending changes, code document is already latest.
return Task.FromResult(CodeDocument);
return Task.FromResult(CodeDocument?.GetSyntaxTree());
}

// In the process of parsing changes.
SyntaxTreeRequest request = null;
for (var i = _syntaxTreeRequests.Count - 1; i >= 0; i--)
{
if (_syntaxTreeRequests[i].Snapshot == atOrNewerSnapshot)
{
request = _syntaxTreeRequests[i];
break;
}
}

if (_codeDocumentTaskCompletionSource == null)
if (request == null)
{
_codeDocumentTaskCompletionSource = new TaskCompletionSource<RazorCodeDocument>(TaskCreationOptions.RunContinuationsAsynchronously);
request = new SyntaxTreeRequest(atOrNewerSnapshot, cancellationToken);
_syntaxTreeRequests.Add(request);
}

return _codeDocumentTaskCompletionSource.Task;
return request.Task;
}
}

Expand Down Expand Up @@ -151,10 +167,13 @@ public void Dispose()

StopIdleTimer();

lock (GetCodeDocumentLock)
lock (UpdateStateLock)
{
_disposed = true;
_codeDocumentTaskCompletionSource?.SetResult(CodeDocument);
foreach (var request in _syntaxTreeRequests)
{
request.Cancel();
}
}
}

Expand Down Expand Up @@ -277,21 +296,23 @@ private void TextBuffer_OnChanged(object sender, TextContentChangedEventArgs arg
StopIdleTimer();
}

var snapshot = args.After;
if (!args.TextChangeOccurred(out var changeInformation))
{
// Ensure we get a parse for latest snapshot.
QueueChange(null, snapshot);
return;
}

var change = new SourceChange(changeInformation.firstChange.OldPosition, changeInformation.oldText.Length, changeInformation.newText);
var snapshot = args.After;
var result = PartialParseResultInternal.Rejected;

RazorSyntaxTree partialParseSyntaxTree = null;
using (_parser.SynchronizeMainThreadState())
{
// Check if we can partial-parse
if (_partialParser != null && _parser.IsIdle)
{
result = _partialParser.Parse(change);
(result, partialParseSyntaxTree) = _partialParser.Parse(change);
}
}

Expand All @@ -300,6 +321,10 @@ private void TextBuffer_OnChanged(object sender, TextContentChangedEventArgs arg
{
QueueChange(change, snapshot);
}
else
{
TryUpdateLatestParsedSyntaxTreeSnapshot(partialParseSyntaxTree, snapshot);
}

if ((result & PartialParseResultInternal.Provisional) == PartialParseResultInternal.Provisional)
{
Expand Down Expand Up @@ -389,10 +414,13 @@ private void Timer_Tick()
}
}

private void OnResultsReady(object sender, BackgroundParserResultsReadyEventArgs args)
// Internal for testing
internal void OnResultsReady(object sender, BackgroundParserResultsReadyEventArgs args)
{
_dispatcher.AssertBackgroundThread();

UpdateParserState(args.CodeDocument, args.ChangeReference.Snapshot);

// Jump back to UI thread to notify structure changes.
Task.Factory.StartNew(OnDocumentStructureChanged, args, CancellationToken.None, TaskCreationOptions.None, _dispatcher.ForegroundScheduler);
}
Expand Down Expand Up @@ -425,15 +453,7 @@ internal void OnDocumentStructureChanged(object state)
return;
}

lock (GetCodeDocumentLock)
{
_latestChangeReference = null;
_codeDocument = backgroundParserArgs.CodeDocument;
_snapshot = backgroundParserArgs.ChangeReference.Snapshot;
_partialParser = new RazorSyntaxTreePartialParser(_codeDocument.GetSyntaxTree());
_codeDocumentTaskCompletionSource?.SetResult(_codeDocument);
_codeDocumentTaskCompletionSource = null;
}
_latestChangeReference = null;

var documentStructureChangedArgs = new DocumentStructureChangedEventArgs(
backgroundParserArgs.ChangeReference.Change,
Expand All @@ -448,6 +468,73 @@ private void ConfigureProjectEngine(RazorProjectEngineBuilder builder)
builder.Features.Add(new VisualStudioTagHelperFeature(_documentTracker.TagHelpers));
}

private void UpdateParserState(RazorCodeDocument codeDocument, ITextSnapshot snapshot)
{
lock (UpdateStateLock)
{
if (_snapshot != null && snapshot.Version.VersionNumber < _snapshot.Version.VersionNumber)
{
// Changes flowed out of order due to the slight race condition at the beginning of this method. Our current
// CodeDocument and Snapshot are newer then the ones that made it into the lock.
return;
}

_codeDocument = codeDocument;
_snapshot = snapshot;
_partialParser = new RazorSyntaxTreePartialParser(_codeDocument.GetSyntaxTree());
TryUpdateLatestParsedSyntaxTreeSnapshot(_codeDocument.GetSyntaxTree(), _snapshot);
}
}

private void TryUpdateLatestParsedSyntaxTreeSnapshot(RazorSyntaxTree syntaxTree, ITextSnapshot snapshot)
{
if (snapshot == null)
{
throw new ArgumentNullException(nameof(snapshot));
}

lock (UpdateStateLock)
{
if (_latestParsedSnapshot == null ||
_latestParsedSnapshot.Version.VersionNumber < snapshot.Version.VersionNumber)
{
_latestParsedSnapshot = snapshot;

CompleteSyntaxTreeRequestsForSnapshot(syntaxTree, snapshot);
}
}
}

private void CompleteSyntaxTreeRequestsForSnapshot(RazorSyntaxTree syntaxTree, ITextSnapshot snapshot)
{
lock (UpdateStateLock)
{
if (_syntaxTreeRequests.Count == 0)
{
return;
}

var matchingRequests = new List<SyntaxTreeRequest>();
for (var i = _syntaxTreeRequests.Count - 1; i >= 0; i--)
{
var request = _syntaxTreeRequests[i];
if (request.Snapshot.Version.VersionNumber <= snapshot.Version.VersionNumber)
{
// This change was for a newer snapshot, we can complete the TCS.
matchingRequests.Add(request);
_syntaxTreeRequests.RemoveAt(i);
}
}

// The matching requests are in reverse order so we need to invoke them from the back to front.
for (var i = matchingRequests.Count - 1; i >= 0; i--)
{
// At this point it's possible these requests have been cancelled, if that's the case Complete noops.
matchingRequests[i].Complete(syntaxTree);
}
}
}

private class VisualStudioParserOptionsFeature : RazorEngineFeatureBase, IConfigureRazorCodeGenerationOptionsFeature
{
private readonly EditorSettings _settings;
Expand Down Expand Up @@ -482,5 +569,73 @@ public IReadOnlyList<TagHelperDescriptor> GetDescriptors()
return _tagHelpers;
}
}

// Internal for testing
internal class SyntaxTreeRequest
{
private readonly object CompletionLock = new object();
private readonly TaskCompletionSource<RazorSyntaxTree> _taskCompletionSource;
private readonly CancellationTokenRegistration _cancellationTokenRegistration;
private bool _done;

public SyntaxTreeRequest(ITextSnapshot snapshot, CancellationToken cancellationToken)
{
if (snapshot == null)
{
throw new ArgumentNullException(nameof(snapshot));
}

Snapshot = snapshot;
_taskCompletionSource = new TaskCompletionSource<RazorSyntaxTree>(TaskCreationOptions.RunContinuationsAsynchronously);
_cancellationTokenRegistration = cancellationToken.Register(Cancel);
Task = _taskCompletionSource.Task;

if (cancellationToken.IsCancellationRequested)
{
// If the token was already cancelled we need to bail.
Cancel();
}
}

public ITextSnapshot Snapshot { get; }

public Task<RazorSyntaxTree> Task { get; }

public void Complete(RazorSyntaxTree syntaxTree)
{
if (syntaxTree == null)
{
throw new ArgumentNullException(nameof(syntaxTree));
}

lock (CompletionLock)
{
if (_done)
{
// Request was already cancelled.
return;
}

_done = true;
_cancellationTokenRegistration.Dispose();
_taskCompletionSource.SetResult(syntaxTree);
}
}

public void Cancel()
{
lock (CompletionLock)
{
if (_done)
{
return;
}

_taskCompletionSource.TrySetCanceled();
_cancellationTokenRegistration.Dispose();
_done = true;
}
}
}
}
}
56 changes: 31 additions & 25 deletions src/Razor/src/Microsoft.VisualStudio.Editor.Razor/RazorDirectiveCompletionSource.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,35 +70,41 @@ public async Task<CompletionContext> GetCompletionContextAsync(
{
_foregroundDispatcher.AssertBackgroundThread();

var codeDocument = await _parser.GetLatestCodeDocumentAsync();
var syntaxTree = codeDocument?.GetSyntaxTree();
var location = new SourceSpan(applicableSpan.Start.Position, applicableSpan.Length);
var razorCompletionItems = _completionFactsService.GetCompletionItems(syntaxTree, location);

var completionItems = new List<CompletionItem>();
foreach (var razorCompletionItem in razorCompletionItems)
try
{
if (razorCompletionItem.Kind != RazorCompletionItemKind.Directive)
var syntaxTree = await _parser.GetLatestSyntaxTreeAsync(triggerLocation.Snapshot, token);
var location = new SourceSpan(triggerLocation.Position, 0);
var razorCompletionItems = _completionFactsService.GetCompletionItems(syntaxTree, location);

var completionItems = new List<CompletionItem>();
foreach (var razorCompletionItem in razorCompletionItems)
{
// Don't support any other types of completion kinds other than directives.
continue;
}
if (razorCompletionItem.Kind != RazorCompletionItemKind.Directive)
{
// Don't support any other types of completion kinds other than directives.
continue;
}

var completionItem = new CompletionItem(
displayText: razorCompletionItem.DisplayText,
filterText: razorCompletionItem.DisplayText,
insertText: razorCompletionItem.InsertText,
source: this,
icon: DirectiveImageGlyph,
filters: DirectiveCompletionFilters,
suffix: string.Empty,
sortText: razorCompletionItem.DisplayText,
attributeIcons: ImmutableArray<ImageElement>.Empty);
completionItem.Properties.AddProperty(DescriptionKey, razorCompletionItem.Description);
completionItems.Add(completionItem);
var completionItem = new CompletionItem(
displayText: razorCompletionItem.DisplayText,
filterText: razorCompletionItem.DisplayText,
insertText: razorCompletionItem.InsertText,
source: this,
icon: DirectiveImageGlyph,
filters: DirectiveCompletionFilters,
suffix: string.Empty,
sortText: razorCompletionItem.DisplayText,
attributeIcons: ImmutableArray<ImageElement>.Empty);
completionItem.Properties.AddProperty(DescriptionKey, razorCompletionItem.Description);
completionItems.Add(completionItem);
}
var context = new CompletionContext(completionItems.ToImmutableArray());
return context;
}
catch (OperationCanceledException)
{
return CompletionContext.Empty;
}
var context = new CompletionContext(completionItems.ToImmutableArray());
return context;
}

public Task<object> GetDescriptionAsync(IAsyncCompletionSession session, CompletionItem item, CancellationToken token)
Expand Down
Loading

0 comments on commit 77532db

Please sign in to comment.