Skip to content

Completion Support #1007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Aug 21, 2019
Merged

Completion Support #1007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a474f1d
completion support
TylerLeonhardt Aug 20, 2019
15c9918
misc codacy fixes
TylerLeonhardt Aug 20, 2019
7b9d5f3
use BUILD_ARTIFACTSTAGINGDIRECTORY so logs can be uploaded
TylerLeonhardt Aug 20, 2019
97a8cb1
publish artifacts even if build fails
TylerLeonhardt Aug 20, 2019
254bc06
handle log messages
TylerLeonhardt Aug 20, 2019
2825373
give PSES a chance to run what it needs to run
TylerLeonhardt Aug 20, 2019
29b84b3
switch to using xUnit output helper
TylerLeonhardt Aug 20, 2019
4b23fa0
treat DynamicKeywords as Keyword
TylerLeonhardt Aug 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .vsts-ci/templates/ci-general.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ steps:
inputs:
ArtifactName: PowerShellEditorServices
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
condition: succeededOrFailed()
1 change: 1 addition & 0 deletions src/PowerShellEditorServices.Engine/LanguageServer/OmnisharpLanguageServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ public async Task StartAsync()
.WithHandler<CodeLensHandlers>()
.WithHandler<CodeActionHandler>()
.WithHandler<InvokeExtensionCommandHandler>()
.WithHandler<CompletionHandler>()
.OnInitialize(
async (languageServer, request) =>
{
Expand Down
2 changes: 0 additions & 2 deletions src/PowerShellEditorServices.Engine/Services/Symbols/SymbolsService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ public class SymbolsService
{
#region Private Fields

const int DefaultWaitTimeoutMilliseconds = 5000;

private readonly ILogger _logger;

private readonly IDocumentSymbolProvider[] _documentSymbolProviders;
Expand Down
180 changes: 93 additions & 87 deletions src/PowerShellEditorServices.Engine/Services/Symbols/Vistors/AstOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,15 @@

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Management.Automation;
using System.Management.Automation.Language;
using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Microsoft.PowerShell.EditorServices.Utility;

namespace Microsoft.PowerShell.EditorServices.Symbols
{
Expand All @@ -17,11 +24,11 @@ internal static class AstOperations
{
// TODO: When netstandard is upgraded to 2.0, see if
// Delegate.CreateDelegate can be used here instead
//private static readonly MethodInfo s_extentCloneWithNewOffset = typeof(PSObject).GetTypeInfo().Assembly
// .GetType("System.Management.Automation.Language.InternalScriptPosition")
// .GetMethod("CloneWithNewOffset", BindingFlags.Instance | BindingFlags.NonPublic);
private static readonly MethodInfo s_extentCloneWithNewOffset = typeof(PSObject).GetTypeInfo().Assembly
.GetType("System.Management.Automation.Language.InternalScriptPosition")
.GetMethod("CloneWithNewOffset", BindingFlags.Instance | BindingFlags.NonPublic);

//private static readonly SemaphoreSlim s_completionHandle = AsyncUtils.CreateSimpleLockingSemaphore();
private static readonly SemaphoreSlim s_completionHandle = AsyncUtils.CreateSimpleLockingSemaphore();

// TODO: BRING THIS BACK
/// <summary>
Expand All @@ -48,89 +55,88 @@ internal static class AstOperations
/// A CommandCompletion instance that contains completions for the
/// symbol at the given offset.
/// </returns>
// static public async Task<CommandCompletion> GetCompletionsAsync(
// Ast scriptAst,
// Token[] currentTokens,
// int fileOffset,
// PowerShellContext powerShellContext,
// ILogger logger,
// CancellationToken cancellationToken)
// {
// if (!s_completionHandle.Wait(0))
// {
// return null;
// }

// try
// {
// IScriptPosition cursorPosition = (IScriptPosition)s_extentCloneWithNewOffset.Invoke(
// scriptAst.Extent.StartScriptPosition,
// new object[] { fileOffset });

// logger.Write(
// LogLevel.Verbose,
// string.Format(
// "Getting completions at offset {0} (line: {1}, column: {2})",
// fileOffset,
// cursorPosition.LineNumber,
// cursorPosition.ColumnNumber));

// if (!powerShellContext.IsAvailable)
// {
// return null;
// }

// var stopwatch = new Stopwatch();

// // If the current runspace is out of process we can use
// // CommandCompletion.CompleteInput because PSReadLine won't be taking up the
// // main runspace.
// if (powerShellContext.IsCurrentRunspaceOutOfProcess())
// {
// using (RunspaceHandle runspaceHandle = await powerShellContext.GetRunspaceHandleAsync(cancellationToken))
// using (PowerShell powerShell = PowerShell.Create())
// {
// powerShell.Runspace = runspaceHandle.Runspace;
// stopwatch.Start();
// try
// {
// return CommandCompletion.CompleteInput(
// scriptAst,
// currentTokens,
// cursorPosition,
// options: null,
// powershell: powerShell);
// }
// finally
// {
// stopwatch.Stop();
// logger.Write(LogLevel.Verbose, $"IntelliSense completed in {stopwatch.ElapsedMilliseconds}ms.");
// }
// }
// }

// CommandCompletion commandCompletion = null;
// await powerShellContext.InvokeOnPipelineThreadAsync(
// pwsh =>
// {
// stopwatch.Start();
// commandCompletion = CommandCompletion.CompleteInput(
// scriptAst,
// currentTokens,
// cursorPosition,
// options: null,
// powershell: pwsh);
// });
// stopwatch.Stop();
// logger.Write(LogLevel.Verbose, $"IntelliSense completed in {stopwatch.ElapsedMilliseconds}ms.");

// return commandCompletion;
// }
// finally
// {
// s_completionHandle.Release();
// }
// }
static public async Task<CommandCompletion> GetCompletionsAsync(
Ast scriptAst,
Token[] currentTokens,
int fileOffset,
PowerShellContextService powerShellContext,
ILogger logger,
CancellationToken cancellationToken)
{
if (!s_completionHandle.Wait(0))
{
return null;
}

try
{
IScriptPosition cursorPosition = (IScriptPosition)s_extentCloneWithNewOffset.Invoke(
scriptAst.Extent.StartScriptPosition,
new object[] { fileOffset });

logger.LogTrace(
string.Format(
"Getting completions at offset {0} (line: {1}, column: {2})",
fileOffset,
cursorPosition.LineNumber,
cursorPosition.ColumnNumber));

if (!powerShellContext.IsAvailable)
{
return null;
}

var stopwatch = new Stopwatch();

// If the current runspace is out of process we can use
// CommandCompletion.CompleteInput because PSReadLine won't be taking up the
// main runspace.
if (powerShellContext.IsCurrentRunspaceOutOfProcess())
{
using (RunspaceHandle runspaceHandle = await powerShellContext.GetRunspaceHandleAsync(cancellationToken))
using (System.Management.Automation.PowerShell powerShell = System.Management.Automation.PowerShell.Create())
{
powerShell.Runspace = runspaceHandle.Runspace;
stopwatch.Start();
try
{
return CommandCompletion.CompleteInput(
scriptAst,
currentTokens,
cursorPosition,
options: null,
powershell: powerShell);
}
finally
{
stopwatch.Stop();
logger.LogTrace($"IntelliSense completed in {stopwatch.ElapsedMilliseconds}ms.");
}
}
}

CommandCompletion commandCompletion = null;
await powerShellContext.InvokeOnPipelineThreadAsync(
pwsh =>
{
stopwatch.Start();
commandCompletion = CommandCompletion.CompleteInput(
scriptAst,
currentTokens,
cursorPosition,
options: null,
powershell: pwsh);
});
stopwatch.Stop();
logger.LogTrace($"IntelliSense completed in {stopwatch.ElapsedMilliseconds}ms.");

return commandCompletion;
}
finally
{
s_completionHandle.Release();
}
}

/// <summary>
/// Finds the symbol at a given file location
Expand Down
Loading