Skip to content

Commit

Permalink
Trigger completion tool
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ahmadkhan02
Ahmadkhan02 committed Jul 20, 2024
1 parent ceb264c commit 14bb138
Show file tree
Hide file tree
Showing 8 changed files with 414 additions and 330 deletions.
1 change: 0 additions & 1 deletion MultilineGreyText/Options/General.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ public class General : BaseOptionModel<General>{
// Event handler to be invoked when settings are saved
private void OnSettingsSaved(General options)
{
VS.StatusBar.ShowMessageAsync("Options Saved").FireAndForget();
OnSettingsChanged?.Invoke(this, EventArgs.Empty);
}

Expand Down
14 changes: 4 additions & 10 deletions MultilineGreyText/RefactCompletionCommandHandler.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,9 @@ public bool IsInline(int lineN){
}

//gets recommendations from LSP
public async void GetLSPCompletions(){
if (!General.Instance.PauseCompletion){
public async void GetLSPCompletions()
{
if (!General.Instance.PauseCompletion){
SnapshotPoint? caretPoint = m_textView.Caret.Position.Point.GetPoint(textBuffer => (!textBuffer.ContentType.IsOfType("projection")), PositionAffinity.Predecessor);

if (caretPoint.HasValue){
Expand Down Expand Up @@ -236,18 +237,11 @@ void CheckSuggestionUpdate(uint nCmdID){

//Key input handler
public int Exec(ref Guid pguidCmdGroup, uint nCmdID, uint nCmdexecopt, IntPtr pvaIn, IntPtr pvaOut){
//let the other handlers handle automation functions
//let the other handlers handle automation
if (VsShellUtilities.IsInAutomationFunction(m_provider.ServiceProvider)){
return m_nextCommandHandler.Exec(ref pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut);
}

if (pguidCmdGroup == RefactPackage.CommandSet && nCmdID == TriggerCompletionCommand.CommandId)
{
GetLSPCompletions();
return VSConstants.S_OK;
}


//check for a commit character
if (!hasCompletionUpdated && nCmdID == (uint)VSConstants.VSStd2KCmdID.TAB){

Expand Down
371 changes: 186 additions & 185 deletions MultilineGreyText/RefactExtension.csproj
View file

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions MultilineGreyText/RefactLanguageClient.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ public RefactLanguageClient()
Instance = this;
files = new HashSet<string>();
statusBar = new StatusBar();
ShowDefaultStatusBar();

General.OnSettingsChanged += ReloadLanguageClient;
}
Expand All @@ -108,10 +109,10 @@ async void ReloadLanguageClient(object sender, EventArgs e)
var connection = await ActivateAsync(CancellationToken.None);
// Rpc = new JsonRpc(connection.Input, connection.Output);

VS.StatusBar.ShowMessageAsync("Restarting Refact").FireAndForget();
await OnLoadedAsync();
VS.StatusBar.ShowMessageAsync("Options Updated").FireAndForget();
await OnLoadedAsync();

VS.StatusBar.ShowMessageAsync("Options updated").FireAndForget();
VS.StatusBar.ShowMessageAsync("Ready").FireAndForget();
}
catch (Exception ex)
{
Expand Down Expand Up @@ -204,8 +205,6 @@ public async Task<Connection> ActivateAsync(CancellationToken token)
}

throw new InvalidOperationException("Failed to start language server process.");

return null;
}

// get extension version
Expand Down
8 changes: 5 additions & 3 deletions MultilineGreyText/RefactPackage.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Community.VisualStudio.Toolkit;
using Microsoft.VisualStudio.Shell;
using System;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices;
using System.Threading;
Expand Down Expand Up @@ -36,7 +37,6 @@ public sealed class RefactPackage : ToolkitPackage{
/// VSPackage1 GUID string.
/// </summary>
public const string PackageGuidString = "6f370a16-644a-450c-8e52-e2b92644822b";
public static readonly Guid CommandSet = new Guid("6f370a16-644a-450c-8e52-e2b92644822b");

/// <summary>
/// Initializes a new instance of the <see cref="RefactPackage"/> class.
Expand All @@ -58,9 +58,11 @@ public RefactPackage(){
/// <param name="progress">A provider for progress updates.</param>
/// <returns>A task representing the async work of package initialization, or an already completed task if there is none. Do not return null from this method.</returns>
protected override async Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress){
Debug.Write("Initialzing the extension!");
await this.RegisterCommandsAsync();
await RefactAI.PauseRefactCommand.InitializeAsync(this);
await RefactAI.TriggerCompletionCommand.InitializeAsync(this);

await PauseRefactCommand.InitializeAsync(this);
await TriggerCompletionCommand.InitializeAsync(this);
}

#endregion
Expand Down
239 changes: 125 additions & 114 deletions MultilineGreyText/RefactPackage.vsct
View file
Original file line number Diff line number Diff line change
@@ -1,114 +1,125 @@
<?xml version="1.0" encoding="utf-8"?>
<CommandTable xmlns="http://schemas.microsoft.com/VisualStudio/2005-10-18/CommandTable" xmlns:xs="http://www.w3.org/2001/XMLSchema">

<!-- This is the file that defines the actual layout and type of the commands.
It is divided in different sections (e.g. command definition, command
placement, ...), with each defining a specific set of properties.
See the comment before each section for more details about how to
use it. -->

<!-- The VSCT compiler (the tool that translates this file into the binary -->
<!-- format that VisualStudio will consume) has the ability to run a preprocessor -->
<!-- on the vsct file; this preprocessor is (usually) the C++ preprocessor, so -->
<!-- it is possible to define includes and macros with the same syntax used -->
<!-- in C++ files. Using this ability of the compiler here, we include some files -->
<!-- defining some of the constants that we will use inside the file. -->

<!-- This is the file that defines the IDs for all the commands exposed by VisualStudio. -->
<Extern href="stdidcmd.h" />

<!-- This header contains the command ids for the menus provided by the shell. -->
<Extern href="vsshlids.h" />

<!-- The Commands section is where commands, menus, and menu groups are defined. -->
<!-- This section uses a Guid to identify the package that provides the command defined inside it. -->
<Commands package="guidRefactPackage">
<!-- Inside this section we have different sub-sections: one for the menus, another -->
<!-- for the menu groups, one for the buttons (the actual commands), one for the combos -->
<!-- and the last one for the bitmaps used. Each element is identified by a command id that -->
<!-- is a unique pair of guid and numeric identifier; the guid part of the identifier is usually -->
<!-- called "command set" and is used to group different command inside a logically related -->
<!-- group; your package should define its own command set in order to avoid collisions -->
<!-- with command ids defined by other packages. -->

<!-- Define new menu groups. A menu group is a container for -->
<!-- other menus or buttons (commands); from a visual point of view you can see the -->
<!-- group as the part of a menu contained between two lines. The parent of a group -->
<!-- must be a menu. -->
<Groups>
<Group guid="guidRefactPackageCmdSet" id="MyMenuGroup" priority="0x0600">
<Parent guid="guidSHLMainMenu" id="IDM_VS_MENU_TOOLS" />
</Group>
</Groups>

<!-- Define buttons (commands) -->
<Buttons>
<!-- To define a menu group you have to specify its ID, the parent menu and its display priority. -->
<!-- The command is visible and enabled by default. If you need to change the visibility, status, etc, you can use -->
<!-- the CommandFlag node. -->
<!-- You can add more than one CommandFlag node e.g.: -->
<!-- <CommandFlag>DefaultInvisible</CommandFlag> -->
<!-- <CommandFlag>DynamicVisibility</CommandFlag> -->
<!-- If you do not want an image next to your command, remove the Icon node. -->
<Button guid="guidRefactPackageCmdSet" id="cmdidPauseRefactCommand" priority="0x0100" type="Button">
<Parent guid="guidRefactPackageCmdSet" id="MyMenuGroup" />
<Strings>
<ButtonText>Pause Refact</ButtonText>
</Strings>
</Button>
<!-- Define the TriggerCompletion command -->
<Button guid="guidRefactPackageCmdSet" id="cmdidTriggerCompletion" priority="0x0100" type="Button">
<Parent guid="guidRefactPackageCmdSet" id="MyMenuGroup" />
<Strings>
<ButtonText>Trigger Completion</ButtonText>
</Strings>
</Button>
</Buttons>

<!-- Define bitmaps used for the commands -->
<Bitmaps>
<!-- The bitmap id is defined in a way that is a little bit different from the others: -->
<!-- the declaration starts with a guid for the bitmap strip, then there is the resource id of the -->
<!-- bitmap strip containing the bitmaps and then there are the numeric ids of the elements used -->
<!-- inside a button definition. An important aspect of this declaration is that the element id -->
<!-- must be the actual index (1-based) of the bitmap inside the bitmap strip. -->
<Bitmap guid="guidImages1" href="Resources\PauseRefactCommand.png" usedList="bmpPic1, bmpPic2, bmpPicSearch, bmpPicX, bmpPicArrows, bmpPicStrikethrough" />
</Bitmaps>
</Commands>

<!-- Define key bindings outside of the <Commands> section --> re
<KeyBindings>
<KeyBinding guid="guidRefactPackageCmdSet" id="cmdidTriggerCompletion" key1="VK_MENU" key2="VK_SHIFT" editor="guidVSStd97" mod1="Alt" mod2="Shift"/>
</KeyBindings>

<!-- Define symbols -->
<Symbols>
<!-- This is the package guid. -->
<GuidSymbol name="guidRefactPackage" value="{6f370a16-644a-450c-8e52-e2b92644822b}" />

<!-- This is the guid used to group the menu commands together -->
<GuidSymbol name="guidRefactPackageCmdSet" value="{528a0c75-4c23-4946-8b7f-b28afb34defc}">
<IDSymbol name="MyMenuGroup" value="0x1020" />
<IDSymbol value="4129" name="cmdidPauseRefactCommand" />
<IDSymbol value="0x0100" name="cmdidTriggerCompletion" />
</GuidSymbol>

<GuidSymbol name="guidImages" value="{29f5724b-66aa-41ae-8e43-91bb0a73aa70}">
<IDSymbol name="bmpPic1" value="1" />
<IDSymbol name="bmpPic2" value="2" />
<IDSymbol name="bmpPicSearch" value="3" />
<IDSymbol name="bmpPicX" value="4" />
<IDSymbol name="bmpPicArrows" value="5" />
<IDSymbol name="bmpPicStrikethrough" value="6" />
</GuidSymbol>

<GuidSymbol value="{a76fad5f-a5e5-432f-96db-f5fb99105ce5}" name="guidImages1">
<IDSymbol name="bmpPic1" value="1" />
<IDSymbol name="bmpPic2" value="2" />
<IDSymbol name="bmpPicSearch" value="3" />
<IDSymbol name="bmpPicX" value="4" />
<IDSymbol name="bmpPicArrows" value="5" />
<IDSymbol name="bmpPicStrikethrough" value="6" />
</GuidSymbol>
</Symbols>
</CommandTable>
<?xml version="1.0" encoding="utf-8"?>
<CommandTable xmlns="http://schemas.microsoft.com/VisualStudio/2005-10-18/CommandTable" xmlns:xs="http://www.w3.org/2001/XMLSchema">

<!-- This is the file that defines the actual layout and type of the commands.
It is divided in different sections (e.g. command definition, command
placement, ...), with each defining a specific set of properties.
See the comment before each section for more details about how to
use it. -->

<!-- The VSCT compiler (the tool that translates this file into the binary
format that VisualStudio will consume) has the ability to run a preprocessor
on the vsct file; this preprocessor is (usually) the C++ preprocessor, so
it is possible to define includes and macros with the same syntax used
in C++ files. Using this ability of the compiler here, we include some files
defining some of the constants that we will use inside the file. -->

<!--This is the file that defines the IDs for all the commands exposed by VisualStudio. -->
<Extern href="stdidcmd.h" />

<!--This header contains the command ids for the menus provided by the shell. -->
<Extern href="vsshlids.h" />

<!--The Commands section is where commands, menus, and menu groups are defined.
This section uses a Guid to identify the package that provides the command defined inside it. -->
<Commands package="guidRefactPackage">
<!-- Inside this section we have different sub-sections: one for the menus, another
for the menu groups, one for the buttons (the actual commands), one for the combos
and the last one for the bitmaps used. Each element is identified by a command id that
is a unique pair of guid and numeric identifier; the guid part of the identifier is usually
called "command set" and is used to group different command inside a logically related
group; your package should define its own command set in order to avoid collisions
with command ids defined by other packages. -->

<!-- In this section you can define new menu groups. A menu group is a container for
other menus or buttons (commands); from a visual point of view you can see the
group as the part of a menu contained between two lines. The parent of a group
must be a menu. -->
<Groups>
<Group guid="guidRefactPackageCmdSet" id="MyMenuGroup" priority="0x0600">
<Parent guid="guidSHLMainMenu" id="IDM_VS_MENU_TOOLS" />
</Group>
</Groups>

<!--Buttons section. -es the elements the user can interact with, like a menu command or a button
or combo box in a toolbar. -->
<Buttons>
<!--To define a menu group you have to specify its ID, the parent menu and its display priority.
The command is visible and enabled by default. If you need to change the visibility, status, etc, you can use
the CommandFlag node.
You can add more than one CommandFlag node e.g.:
<CommandFlag>DefaultInvisible</CommandFlag>
<CommandFlag>DynamicVisibility</CommandFlag>
If you do not want an image next to your command, remove the Icon node /> -->

<Button guid="guidRefactPackageCmdSet" id="cmdidPauseRefactCommand" priority="0x0100" type="Button">
<Parent guid="guidRefactPackageCmdSet" id="MyMenuGroup" />
<Strings>
<ButtonText>Pause Refact</ButtonText>
</Strings>
</Button>
<Button guid="guidRefactPackageCmdSet" id="cmdidTriggerCompletionCommand" priority="0x0100" type="Button">
<Parent guid="guidRefactPackageCmdSet" id="MyMenuGroup" />
<Icon guid="guidImages2" id="bmpPic1" />
<Strings>
<ButtonText>Manual Completition</ButtonText>
</Strings>
</Button>
</Buttons>

<!--The bitmaps section is used to define the bitmaps that are used for the commands.-->
<Bitmaps>
<!-- The bitmap id is defined in a way that is a little bit different from the others:
the declaration starts with a guid for the bitmap strip, then there is the resource id of the
bitmap strip containing the bitmaps and then there are the numeric ids of the elements used
inside a button definition. An important aspect of this declaration is that the element id
must be the actual index (1-based) of the bitmap inside the bitmap strip. -->
<Bitmap guid="guidImages1" href="Resources\PauseRefactCommand.png" usedList="bmpPic1, bmpPic2, bmpPicSearch, bmpPicX, bmpPicArrows, bmpPicStrikethrough" />
<Bitmap guid="guidImages2" href="Resources\TriggerCompletionCommand.png" usedList="bmpPic1, bmpPic2, bmpPicSearch, bmpPicX, bmpPicArrows, bmpPicStrikethrough" />
</Bitmaps>
</Commands>

<KeyBindings>
<KeyBinding guid="guidRefactPackageCmdSet" id="cmdidTriggerCompletionCommand"
editor="guidVSStd97" key1="VK_OEM_2" mod1="SHIFT ALT"/>
</KeyBindings>

<Symbols>
<!-- This is the package guid. -->
<GuidSymbol name="guidRefactPackage" value="{6f370a16-644a-450c-8e52-e2b92644822b}" />

<!-- This is the guid used to group the menu commands together -->
<GuidSymbol name="guidRefactPackageCmdSet" value="{528a0c75-4c23-4946-8b7f-b28afb34defc}">
<IDSymbol name="MyMenuGroup" value="0x1020" />
<IDSymbol value="4129" name="cmdidPauseRefactCommand" />
<IDSymbol value="256" name="cmdidTriggerCompletionCommand" />
</GuidSymbol>

<GuidSymbol name="guidImages" value="{29f5724b-66aa-41ae-8e43-91bb0a73aa70}">
<IDSymbol name="bmpPic1" value="1" />
<IDSymbol name="bmpPic2" value="2" />
<IDSymbol name="bmpPicSearch" value="3" />
<IDSymbol name="bmpPicX" value="4" />
<IDSymbol name="bmpPicArrows" value="5" />
<IDSymbol name="bmpPicStrikethrough" value="6" />
</GuidSymbol>

<GuidSymbol value="{a76fad5f-a5e5-432f-96db-f5fb99105ce5}" name="guidImages1">
<IDSymbol name="bmpPic1" value="1" />
<IDSymbol name="bmpPic2" value="2" />
<IDSymbol name="bmpPicSearch" value="3" />
<IDSymbol name="bmpPicX" value="4" />
<IDSymbol name="bmpPicArrows" value="5" />
<IDSymbol name="bmpPicStrikethrough" value="6" />
</GuidSymbol>

<GuidSymbol value="{0f1711c3-dd9f-4a92-a197-ecd6a31e8f2e}" name="guidImages2">
<IDSymbol name="bmpPic1" value="1" />
<IDSymbol name="bmpPic2" value="2" />
<IDSymbol name="bmpPicSearch" value="3" />
<IDSymbol name="bmpPicX" value="4" />
<IDSymbol name="bmpPicArrows" value="5" />
<IDSymbol name="bmpPicStrikethrough" value="6" />
</GuidSymbol>
</Symbols>
</CommandTable>
Binary file added MultilineGreyText/Resources/TriggerCompletionCommand.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 14bb138

Please sign in to comment.