bumped Microsoft.VisualStudio.LanguageServer.Protocol 17.2.8 -> 18.8.9-preview

HJLebbink · HJLebbink · commit 095211d0ecb3 · 2023-11-15T13:07:36.000+01:00
bumped Microsoft.VisualStudio.LanguageServer 17.2.8 -&gt; 18.8.9-preview
diff --git a/VS/CSHARP/asm-dude2-ls-lib/AsmFoldingRange.cs b/VS/CSHARP/asm-dude2-ls-lib/AsmFoldingRange.cs
diff --git a/VS/CSHARP/asm-dude2-ls-lib/LanguageServer.cs b/VS/CSHARP/asm-dude2-ls-lib/LanguageServer.cs
@@ -61,7 +61,7 @@ public class LanguageServer : INotifyPropertyChanged
         private readonly Dictionary<Uri, string[]> textDocumentLines;
         private readonly Dictionary<Uri, KeywordID[][]> parsedDocuments;
 
-        private readonly Dictionary<Uri, IEnumerable<AsmFoldingRange>> foldingRanges;
+        private readonly Dictionary<Uri, IEnumerable<FoldingRange>> foldingRanges;
         private readonly Dictionary<Uri, LabelGraph> labelGraphs;
 
         private readonly int referencesChunkSize = 10;
@@ -102,7 +102,7 @@ private LanguageServer(Stream sender, Stream reader)
             this.parsedDocuments = new Dictionary<Uri, KeywordID[][]>();
 
             this.labelGraphs = new Dictionary<Uri, LabelGraph>();
-            this.foldingRanges = new Dictionary<Uri, IEnumerable<AsmFoldingRange>>();
+            this.foldingRanges = new Dictionary<Uri, IEnumerable<FoldingRange>>();
             this.diagnostics = new List<Diagnostic>();
             this.Symbols = Array.Empty<VSSymbolInformation>();
 
@@ -401,7 +401,7 @@ static string GetCollapsedText(int startPos, string line)
             int startKeywordLength = StartKeyword.Length;
             int endKeywordLength = EndKeyword.Length;
 
-            List<AsmFoldingRange> foldingRanges = new();
+            List<FoldingRange> foldingRanges = new();
             Stack<int> startLineNumbers = new();
             Stack<int> startCharacters = new();
 
@@ -437,7 +437,7 @@ static string GetCollapsedText(int startPos, string line)
                         {
                             int startLine = startLineNumbers.Pop();
                             int startCharacter = startCharacters.Pop();
-                            foldingRanges.Add(new AsmFoldingRange
+                            foldingRanges.Add(new FoldingRange
                             {
                                 StartLine = startLine,
                                 StartCharacter = startCharacter,
@@ -951,23 +951,23 @@ public SignatureHelp GetTextDocumentSignatureHelp(SignatureHelpParams parameter)
             }
         }
 
-        public void SetFoldingRanges(IEnumerable<AsmFoldingRange> foldingRanges, Uri uri)
+        public void SetFoldingRanges(IEnumerable<FoldingRange> foldingRanges, Uri uri)
         {
             this.foldingRanges.Remove(uri);
             this.foldingRanges.Add(uri, foldingRanges);
         }
 
-        public AsmFoldingRange[] GetFoldingRanges(FoldingRangeParams parameter)
+        public FoldingRange[] GetFoldingRanges(FoldingRangeParams parameter)
         {
             if (!this.options.CodeFolding_On)
             {
-                return Array.Empty<AsmFoldingRange>();
+                return Array.Empty<FoldingRange>();
             }
-            if (this.foldingRanges.TryGetValue(parameter.TextDocument.Uri, out IEnumerable<AsmFoldingRange> value))
+            if (this.foldingRanges.TryGetValue(parameter.TextDocument.Uri, out IEnumerable<FoldingRange> value))
             {
                 return value.ToArray();
             }
-            return Array.Empty<AsmFoldingRange>();
+            return Array.Empty<FoldingRange>();
         }
 
         private HashSet<CompletionItem> Mnemonic_Operand_Completions(bool useCapitals, HashSet<AsmSignatureEnum> allowedOperands, int lineNumber)
@@ -1557,7 +1557,7 @@ public Hover GetHover(TextDocumentPositionParams parameter)
                                 Language = MarkupKind.PlainText.ToString(),
                                 Value = full_Descr + "\n",
                             }),
-                            new SumType<string, MarkedString>(new MarkedString
+                            new(new MarkedString
                             {
                                 Language = MarkupKind.Markdown.ToString(),
                                 Value = ((performanceInfoAvailable) ? "**Performance:**\n```text\n" + performanceStr + "\n```" : "No performance info"),
@@ -1613,7 +1613,7 @@ public Hover GetHover(TextDocumentPositionParams parameter)
                             }
                             descr = AsmTools.AsmSourceTools.Linewrap(descr, MaxNumberOfCharsInToolTips);
                             hoverContent = new SumType<string, MarkedString>[]{
-                                new SumType<string, MarkedString>(new MarkedString
+                                new(new MarkedString
                                 {
                                     Language = MarkupKind.PlainText.ToString(),
                                     Value = $"Keyword {keyword}: {descr}",
@@ -1795,8 +1795,24 @@ public Hover GetHover(TextDocumentPositionParams parameter)
             }
             */
 
+
             if (hoverContent != null)
             {
+                //return new Microsoft.VisualStudio.LanguageServer.Protocol.VSInternalHover
+                //{
+                //    Range = new Range()
+                //    {
+                //        Start = new Position(parameter.Position.Line, startPos),
+                //        End = new Position(parameter.Position.Line, endPos),
+                //    },
+                //    Contents = new MarkupContent
+                //    {
+                //        Kind = MarkupKind.Markdown,
+                //        Value = "TODO **bold**"
+                //    },
+                //    //RawContent = new ClassifiedTextElement(descriptionBuilder.Select(tp => new ClassifiedTextRun(tp.Tag.ToClassificationTypeName(), tp.Text)))
+                //};
+
                 return new Hover()
                 {
                     Contents = hoverContent,
diff --git a/VS/CSHARP/asm-dude2-ls-lib/asm-dude2-ls-lib.csproj b/VS/CSHARP/asm-dude2-ls-lib/asm-dude2-ls-lib.csproj
@@ -73,8 +73,11 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0-rc.1.23419.4" />
-    <PackageReference Include="Microsoft.VisualStudio.LanguageServer.Protocol.Extensions" Version="17.2.8" />
-    <PackageReference Include="StreamJsonRpc" Version="2.16.36" />
+    <PackageReference Include="Microsoft.VisualStudio.Language.StandardClassification" Version="17.7.188" />
+	<PackageReference Include="Microsoft.VisualStudio.LanguageServer.Protocol" Version="17.8.9-preview" />
+	<PackageReference Include="Microsoft.VisualStudio.LanguageServer.Protocol.Internal" Version="17.8.9-preview" />
+	<PackageReference Include="Microsoft.VisualStudio.LanguageServer.Protocol.Extensions" Version="17.8.9-preview" />
+	<PackageReference Include="StreamJsonRpc" Version="2.16.36" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
   <ItemGroup>
diff --git a/VS/CSHARP/asm-dude2-vsix/asm-dude2-vsix.csproj b/VS/CSHARP/asm-dude2-vsix/asm-dude2-vsix.csproj
@@ -111,7 +111,8 @@
 	
 	<ItemGroup>
 		<PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.1" />
-		<PackageReference Include="Microsoft.VisualStudio.LanguageServer.Protocol" Version="17.2.8" />
+		<PackageReference Include="Microsoft.VisualStudio.LanguageServer.Protocol" Version="17.8.9-preview" />
+		<PackageReference Include="Microsoft.VisualStudio.LanguageServer.Protocol.Internal" Version="17.8.9-preview" />
 		<PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.7.37357" />
 		<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
 		  <PrivateAssets>all</PrivateAssets>

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public class LanguageServer : INotifyPropertyChanged`
`61`	`61`	`private readonly Dictionary<Uri, string[]> textDocumentLines;`
`62`	`62`	`private readonly Dictionary<Uri, KeywordID[][]> parsedDocuments;`
`63`	`63`
`64`		`- private readonly Dictionary<Uri, IEnumerable<AsmFoldingRange>> foldingRanges;`
	`64`	`+ private readonly Dictionary<Uri, IEnumerable<FoldingRange>> foldingRanges;`
`65`	`65`	`private readonly Dictionary<Uri, LabelGraph> labelGraphs;`
`66`	`66`
`67`	`67`	`private readonly int referencesChunkSize = 10;`
`@@ -102,7 +102,7 @@ private LanguageServer(Stream sender, Stream reader)`
`102`	`102`	`this.parsedDocuments = new Dictionary<Uri, KeywordID[][]>();`
`103`	`103`
`104`	`104`	`this.labelGraphs = new Dictionary<Uri, LabelGraph>();`
`105`		`- this.foldingRanges = new Dictionary<Uri, IEnumerable<AsmFoldingRange>>();`
	`105`	`+ this.foldingRanges = new Dictionary<Uri, IEnumerable<FoldingRange>>();`
`106`	`106`	`this.diagnostics = new List<Diagnostic>();`
`107`	`107`	`this.Symbols = Array.Empty<VSSymbolInformation>();`
`108`	`108`
`@@ -401,7 +401,7 @@ static string GetCollapsedText(int startPos, string line)`
`401`	`401`	`int startKeywordLength = StartKeyword.Length;`
`402`	`402`	`int endKeywordLength = EndKeyword.Length;`
`403`	`403`
`404`		`- List<AsmFoldingRange> foldingRanges = new();`
	`404`	`+ List<FoldingRange> foldingRanges = new();`
`405`	`405`	`Stack<int> startLineNumbers = new();`
`406`	`406`	`Stack<int> startCharacters = new();`
`407`	`407`
`@@ -437,7 +437,7 @@ static string GetCollapsedText(int startPos, string line)`
`437`	`437`	`{`
`438`	`438`	`int startLine = startLineNumbers.Pop();`
`439`	`439`	`int startCharacter = startCharacters.Pop();`
`440`		`- foldingRanges.Add(new AsmFoldingRange`
	`440`	`+ foldingRanges.Add(new FoldingRange`
`441`	`441`	`{`
`442`	`442`	`StartLine = startLine,`
`443`	`443`	`StartCharacter = startCharacter,`
`@@ -951,23 +951,23 @@ public SignatureHelp GetTextDocumentSignatureHelp(SignatureHelpParams parameter)`
`951`	`951`	`}`
`952`	`952`	`}`
`953`	`953`
`954`		`- public void SetFoldingRanges(IEnumerable<AsmFoldingRange> foldingRanges, Uri uri)`
	`954`	`+ public void SetFoldingRanges(IEnumerable<FoldingRange> foldingRanges, Uri uri)`
`955`	`955`	`{`
`956`	`956`	`this.foldingRanges.Remove(uri);`
`957`	`957`	`this.foldingRanges.Add(uri, foldingRanges);`
`958`	`958`	`}`
`959`	`959`
`960`		`- public AsmFoldingRange[] GetFoldingRanges(FoldingRangeParams parameter)`
	`960`	`+ public FoldingRange[] GetFoldingRanges(FoldingRangeParams parameter)`
`961`	`961`	`{`
`962`	`962`	`if (!this.options.CodeFolding_On)`
`963`	`963`	`{`
`964`		`- return Array.Empty<AsmFoldingRange>();`
	`964`	`+ return Array.Empty<FoldingRange>();`
`965`	`965`	`}`
`966`		`- if (this.foldingRanges.TryGetValue(parameter.TextDocument.Uri, out IEnumerable<AsmFoldingRange> value))`
	`966`	`+ if (this.foldingRanges.TryGetValue(parameter.TextDocument.Uri, out IEnumerable<FoldingRange> value))`
`967`	`967`	`{`
`968`	`968`	`return value.ToArray();`
`969`	`969`	`}`
`970`		`- return Array.Empty<AsmFoldingRange>();`
	`970`	`+ return Array.Empty<FoldingRange>();`
`971`	`971`	`}`
`972`	`972`
`973`	`973`	`private HashSet<CompletionItem> Mnemonic_Operand_Completions(bool useCapitals, HashSet<AsmSignatureEnum> allowedOperands, int lineNumber)`
`@@ -1557,7 +1557,7 @@ public Hover GetHover(TextDocumentPositionParams parameter)`
`1557`	`1557`	`Language = MarkupKind.PlainText.ToString(),`
`1558`	`1558`	`Value = full_Descr + "\n",`
`1559`	`1559`	`}),`
`1560`		`- new SumType<string, MarkedString>(new MarkedString`
	`1560`	`+ new(new MarkedString`
`1561`	`1561`	`{`
`1562`	`1562`	`Language = MarkupKind.Markdown.ToString(),`
`1563`	`1563`	Value = ((performanceInfoAvailable) ? "Performance:\n```text\n" + performanceStr + "\n```" : "No performance info"),
`@@ -1613,7 +1613,7 @@ public Hover GetHover(TextDocumentPositionParams parameter)`
`1613`	`1613`	`}`
`1614`	`1614`	`descr = AsmTools.AsmSourceTools.Linewrap(descr, MaxNumberOfCharsInToolTips);`
`1615`	`1615`	`hoverContent = new SumType<string, MarkedString>[]{`
`1616`		`- new SumType<string, MarkedString>(new MarkedString`
	`1616`	`+ new(new MarkedString`
`1617`	`1617`	`{`
`1618`	`1618`	`Language = MarkupKind.PlainText.ToString(),`
`1619`	`1619`	`Value = $"Keyword {keyword}: {descr}",`
`@@ -1795,8 +1795,24 @@ public Hover GetHover(TextDocumentPositionParams parameter)`
`1795`	`1795`	`}`
`1796`	`1796`	`*/`
`1797`	`1797`
	`1798`	`+`
`1798`	`1799`	`if (hoverContent != null)`
`1799`	`1800`	`{`
	`1801`	`+ //return new Microsoft.VisualStudio.LanguageServer.Protocol.VSInternalHover`
	`1802`	`+ //{`
	`1803`	`+ // Range = new Range()`
	`1804`	`+ // {`
	`1805`	`+ // Start = new Position(parameter.Position.Line, startPos),`
	`1806`	`+ // End = new Position(parameter.Position.Line, endPos),`
	`1807`	`+ // },`
	`1808`	`+ // Contents = new MarkupContent`
	`1809`	`+ // {`
	`1810`	`+ // Kind = MarkupKind.Markdown,`
	`1811`	`+ // Value = "TODO bold"`
	`1812`	`+ // },`
	`1813`	`+ // //RawContent = new ClassifiedTextElement(descriptionBuilder.Select(tp => new ClassifiedTextRun(tp.Tag.ToClassificationTypeName(), tp.Text)))`
	`1814`	`+ //};`
	`1815`	`+`
`1800`	`1816`	`return new Hover()`
`1801`	`1817`	`{`
`1802`	`1818`	`Contents = hoverContent,`