Skip to content

Add more keyword intellisense to paket dependencies #168

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

Open
MrLuje wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Add more keyword intellisense to paket dependencies #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0d98d6f
Add Framework completion in paket.dependencies
MrLuje Apr 15, 2018
2a27869
Fix paket.dependencies keyword classification
MrLuje Apr 15, 2018
1cd8b73
Add version completion in paket.dependencies
MrLuje Apr 15, 2018
9b663b3
Add storage completion in paket.dependencies
MrLuje Apr 15, 2018
9603b3b
Add content completion in paket.dependencies
MrLuje Apr 15, 2018
1a7d97d
Add copy_content_to_output_dir completion in paket.dependencies
MrLuje Apr 15, 2018
48228b6
Add copy_local completion in paket.dependencies
MrLuje Apr 15, 2018
5cd0189
Add import_targets completion in paket.dependencies
MrLuje Apr 15, 2018
b06c415
Add download_license completion in paket.dependencies
MrLuje Apr 15, 2018
c9b27b1
Add redirects completion in paket.dependencies
MrLuje Apr 15, 2018
e9a9ab7
Add lowest_matching completion in paket.dependencies
MrLuje Apr 15, 2018
640bdef
Add generate_load_scripts completion in paket.dependencies
MrLuje Apr 15, 2018
65b77e2
Remove bad keyword completion + add completion for redirects
MrLuje Apr 16, 2018
bbf33e1
Add references completion in paket.dependencies
MrLuje Apr 18, 2018
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
6 changes: 4 additions & 2 deletions src/Paket.VisualStudio/IntelliSense/Classifier/PaketDependenciesClassifier.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ internal class PaketDependenciesClassifier : IClassifier
{
"source", "nuget", "github", "gist", "http",
"content", "references", "redirects", "group",
"strategy"
"strategy", "framework", "version", "storage", "content",
"copy_content_to_output_dir", "copy_local", "import_targets",
"download_license", "lowest_matching", "generate_load_scripts"
};

public static IEnumerable<string> ValidKeywords
Expand Down Expand Up @@ -46,7 +48,7 @@ public IList<ClassificationSpan> GetClassificationSpans(SnapshotSpan span)
{
var trimmed = text.TrimStart();
var offset = text.Length - trimmed.Length;
string[] args = trimmed.Split(' ');
string[] args = trimmed.Split(' ', ':');

if (args.Length >= 2 && ValidKeywords.Contains(args[0].Trim().ToLowerInvariant()))
{
Expand Down
16 changes: 14 additions & 2 deletions src/Paket.VisualStudio/IntelliSense/CompletionContextType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,18 @@ public enum CompletionContextType
InstalledNuGet,
Source,
Keyword,
Strategy
Strategy,
Framework,
Version,
Storage,
Content,
CopyToOutputDirectory,
CopyLocal,
ImportTargets,
DownloadLicense,
Redirects,
LowestMatching,
GenerateLoadScripts,
References
}
}
}
58 changes: 55 additions & 3 deletions src/Paket.VisualStudio/IntelliSense/CompletionEngine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,46 @@ private static ExportProvider ExportProvider
new PaketKeywordCompletionListProvider(ExportProvider.GetExport<IGlyphService>().Value),
new NuGetNameCompletionListProvider(),
new SourceCompletionListProvider(),
new SimpleOptionCompletionListProvider(CompletionContextType.Strategy, "min", "max")
new SimpleOptionCompletionListProvider(CompletionContextType.Strategy, "min", "max"),
new SimpleOptionCompletionListProvider(CompletionContextType.Framework,
"auto-detect",
"net35",
"net40",
"net45",
"net451",
"net452",
"net46",
"net461",
"net462",
"net47",
"netstandard1.0",
"netstandard1.1",
"netstandard1.2",
"netstandard1.3",
"netstandard1.4",
"netstandard1.5",
"netstandard1.6",
"netstandard2.0",
"netcoreapp1.0",
"netcoreapp1.1",
"netcoreapp2.0",
"uap",
"wp7",
"wp75",
"wp8",
"wp81",
"wpa81"),
new SimpleOptionCompletionListProvider(CompletionContextType.Version, "<any_paket_version>", "--prefer-nuget"),
new SimpleOptionCompletionListProvider(CompletionContextType.Storage, "none", "packages", "symlink"),
new SimpleOptionCompletionListProvider(CompletionContextType.Content, "none", "once"),
new SimpleOptionCompletionListProvider(CompletionContextType.CopyToOutputDirectory, "always", "never", "preserve_newest"),
new SimpleOptionCompletionListProvider(CompletionContextType.CopyLocal, "true", "false"),
new SimpleOptionCompletionListProvider(CompletionContextType.ImportTargets, "true", "false"),
new SimpleOptionCompletionListProvider(CompletionContextType.DownloadLicense, "true", "false"),
new SimpleOptionCompletionListProvider(CompletionContextType.Redirects, "off", "on", "force"),
new SimpleOptionCompletionListProvider(CompletionContextType.LowestMatching, "true", "false"),
new SimpleOptionCompletionListProvider(CompletionContextType.GenerateLoadScripts, "true", "false"),
new SimpleOptionCompletionListProvider(CompletionContextType.References, "strict"),
};

public static IEnumerable<ICompletionListProvider> GetCompletionProviders(IIntellisenseSession session, ITextBuffer textBuffer, SnapshotPoint position, ITextStructureNavigator navigator, out CompletionContext context)
Expand Down Expand Up @@ -70,7 +109,7 @@ private static CompletionContext GetCompletionContext(PaketDocument paketDocumen
{
TextExtent endPosition = navigator.GetExtentOfWord(position - 1);
TextExtent startPosition = endPosition;

// try to extend the span over .
while (!String.IsNullOrWhiteSpace(paketDocument.GetCharAt(startPosition.Span.Start.Position - 1)))
{
Expand All @@ -89,6 +128,7 @@ private static CompletionContext GetCompletionContext(PaketDocument paketDocumen
pos = startPosition.Span.Start - 1;

TextExtent previous = navigator.GetExtentOfWord(pos);

// try to extend the span over blanks
while (paketDocument.GetCharAt(previous.Span.Start.Position) == " ")
{
Expand All @@ -105,6 +145,18 @@ private static CompletionContext GetCompletionContext(PaketDocument paketDocumen
case "nuget": context.ContextType = CompletionContextType.NuGet; break;
case "source": context.ContextType = CompletionContextType.Source; break;
case "strategy": context.ContextType = CompletionContextType.Strategy; break;
case "framework": context.ContextType = CompletionContextType.Framework; break;
case "version": context.ContextType = CompletionContextType.Version; break;
case "storage": context.ContextType = CompletionContextType.Storage; break;
case "content": context.ContextType = CompletionContextType.Content; break;
case "copy_content_to_output_dir": context.ContextType = CompletionContextType.CopyToOutputDirectory; break;
case "copy_local": context.ContextType = CompletionContextType.CopyLocal; break;
case "import_targets": context.ContextType = CompletionContextType.ImportTargets; break;
case "download_license": context.ContextType = CompletionContextType.DownloadLicense; break;
case "redirects": context.ContextType = CompletionContextType.Redirects; break;
case "lowest_matching": context.ContextType = CompletionContextType.LowestMatching; break;
case "generate_load_scripts": context.ContextType = CompletionContextType.GenerateLoadScripts; break;
case "references": context.ContextType = CompletionContextType.References; break;
default: context.ContextType = CompletionContextType.Keyword; break;
}

Expand Down Expand Up @@ -191,4 +243,4 @@ private static CompletionContext GetCompletionContext(PaketDocument paketDocumen
return context;
}
}
}
}