fixed tests

david-driscoll · david-driscoll · commit 413ee4b400ae · 2018-08-28T21:48:21.000-04:00
diff --git a/src/Protocol/Client/Capabilities/RenameCapability.cs b/src/Protocol/Client/Capabilities/RenameCapability.cs
@@ -3,7 +3,7 @@
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities
 {
-    public class RenameCapability : DynamicCapability, ConnectedCapability<IRenameHandler>, ConnectedCapability<IPrepareRenameHandler>
+    public class RenameCapability : DynamicCapability, ConnectedCapability<IRenameHandler>
     {
         /// <summary>
         /// Client supports testing for validity of rename operations
diff --git a/src/Protocol/Models/CodeActionContext.cs b/src/Protocol/Models/CodeActionContext.cs
@@ -1,5 +1,6 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
+using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;
 
 namespace OmniSharp.Extensions.LanguageServer.Protocol.Models
 {
@@ -20,6 +21,7 @@ public class CodeActionContext
         /// Actions not of this kind are filtered out by the client before being shown. So servers
         /// can omit computing them.
         /// </summary>
+        [Optional]
         public Container<CodeActionKind> Only { get; set; }
     }
 }
diff --git a/test/Lsp.Tests/Capabilities/Client/ClientCapabilitiesTests_$SimpleTest.json b/test/Lsp.Tests/Capabilities/Client/ClientCapabilitiesTests_$SimpleTest.json
@@ -27,7 +27,9 @@
         "completion": {
             "completionItem": {
                 "snippetSupport": true,
-                "commitCharactersSupport": false
+                "commitCharactersSupport": false,
+                "deprecatedSupport": false,
+                "preselectSupport": false
             },
             "contextSupport": false,
             "dynamicRegistration": true
@@ -69,6 +71,7 @@
             "dynamicRegistration": true
         },
         "rename": {
+            "prepareSupport": false,
             "dynamicRegistration": true
         }
     },
diff --git a/test/Lsp.Tests/Capabilities/Client/CompletionCapabilityTests_$SimpleTest.json b/test/Lsp.Tests/Capabilities/Client/CompletionCapabilityTests_$SimpleTest.json
@@ -1,7 +1,9 @@
 {
     "completionItem": {
         "snippetSupport": false,
-        "commitCharactersSupport": false
+        "commitCharactersSupport": false,
+        "deprecatedSupport": false,
+        "preselectSupport": false
     },
     "contextSupport": false,
     "dynamicRegistration": false
diff --git a/test/Lsp.Tests/Capabilities/Client/CompletionItemCapabilityTests_$SimpleTest.json b/test/Lsp.Tests/Capabilities/Client/CompletionItemCapabilityTests_$SimpleTest.json
@@ -1,4 +1,6 @@
 {
     "snippetSupport": true,
-    "commitCharactersSupport": false
+    "commitCharactersSupport": false,
+    "deprecatedSupport": false,
+    "preselectSupport": false
 }
diff --git a/test/Lsp.Tests/Capabilities/Client/TextDocumentClientCapabilitiesTests_$SimpleTest.json b/test/Lsp.Tests/Capabilities/Client/TextDocumentClientCapabilitiesTests_$SimpleTest.json
@@ -8,7 +8,9 @@
     "completion": {
         "completionItem": {
             "snippetSupport": true,
-            "commitCharactersSupport": false
+            "commitCharactersSupport": false,
+            "deprecatedSupport": false,
+            "preselectSupport": false
         },
         "contextSupport": false,
         "dynamicRegistration": true
@@ -50,6 +52,7 @@
         "dynamicRegistration": true
     },
     "rename": {
+        "prepareSupport": false,
         "dynamicRegistration": true
     }
 }
diff --git a/test/Lsp.Tests/Capabilities/Server/ServerCapabilitiesTests_$SimpleTest.json b/test/Lsp.Tests/Capabilities/Server/ServerCapabilitiesTests_$SimpleTest.json
@@ -1,4 +1,4 @@
-﻿{
+{
     "textDocumentSync": {
         "openClose": true,
         "change": 1,
@@ -55,5 +55,7 @@
         "abc": "123"
     },
     "typeDefinitionProvider": null,
-    "implementationProvider": null
+    "implementationProvider": null,
+    "colorProvider": null,
+    "foldingRangeProvider": null
 }
diff --git a/test/Lsp.Tests/Models/CodeActionParamsTests_$SimpleTest.json b/test/Lsp.Tests/Models/CodeActionParamsTests_$SimpleTest.json
@@ -1,4 +1,4 @@
-﻿{
+{
     "textDocument": {
         "uri": "file:///test/123/d.cs"
     },
@@ -32,4 +32,4 @@
             }
         ]
     }
-}
+}
diff --git a/test/Lsp.Tests/Models/CompletionItemTests_$SimpleTest.json b/test/Lsp.Tests/Models/CompletionItemTests_$SimpleTest.json
@@ -1,6 +1,8 @@
 {
     "label": null,
     "kind": 1,
+    "deprecated": false,
+    "preselect": false,
     "insertTextFormat": 0,
     "additionalTextEdits": [
         {
diff --git a/test/Lsp.Tests/Models/CompletionListTests_$ComplexTest.json b/test/Lsp.Tests/Models/CompletionListTests_$ComplexTest.json
@@ -1,11 +1,13 @@
-﻿{
+{
     "isIncomplete": true,
     "items": [
         {
             "label": null,
             "kind": 7,
             "detail": "details",
+            "deprecated": false,
+            "preselect": false,
             "insertTextFormat": 0
         }
     ]
-}
+}
diff --git a/test/Lsp.Tests/Models/CompletionListTests_$SimpleTest.json b/test/Lsp.Tests/Models/CompletionListTests_$SimpleTest.json
@@ -1,8 +1,10 @@
-﻿[
+[
     {
         "label": null,
         "kind": 7,
         "detail": "details",
+        "deprecated": false,
+        "preselect": false,
         "insertTextFormat": 0
     }
-]
+]
diff --git a/test/Lsp.Tests/Models/DocumentSymbolInformationTests_$SimpleTest.json b/test/Lsp.Tests/Models/DocumentSymbolInformationTests_$SimpleTest.json
@@ -1,6 +1,7 @@
-﻿{
+{
     "name": "name",
     "kind": 17,
+    "deprecated": false,
     "location": {
         "uri": "file:///abc/123.cs",
         "range": {
@@ -15,4 +16,4 @@
         }
     },
     "containerName": "abc"
-}
+}
diff --git a/test/Lsp.Tests/Models/InitializeParamsTests_$SimpleTest.json b/test/Lsp.Tests/Models/InitializeParamsTests_$SimpleTest.json
@@ -29,7 +29,9 @@
             "completion": {
                 "completionItem": {
                     "snippetSupport": true,
-                    "commitCharactersSupport": false
+                    "commitCharactersSupport": false,
+                    "deprecatedSupport": false,
+                    "preselectSupport": false
                 },
                 "contextSupport": false,
                 "dynamicRegistration": true
@@ -71,6 +73,7 @@
                 "dynamicRegistration": true
             },
             "rename": {
+                "prepareSupport": false,
                 "dynamicRegistration": true
             }
         },
@@ -81,4 +84,3 @@
     "trace": "verbose",
     "workspaceFolders": null
 }
-
diff --git a/test/Lsp.Tests/Models/InitializeResultTests_$SimpleTest.json b/test/Lsp.Tests/Models/InitializeResultTests_$SimpleTest.json
@@ -56,6 +56,8 @@
             "abc": "123"
         },
         "typeDefinitionProvider": null,
-        "implementationProvider": null
+        "implementationProvider": null,
+        "colorProvider": null,
+        "foldingRangeProvider": null
     }
 }
diff --git a/test/Lsp.Tests/Models/WorkspaceSymbolInformationTests_$SimpleTest.json b/test/Lsp.Tests/Models/WorkspaceSymbolInformationTests_$SimpleTest.json
@@ -1,6 +1,7 @@
-﻿{
+{
     "name": "name",
     "kind": 17,
+    "deprecated": false,
     "location": {
         "uri": "file:///abc/123.cs",
         "range": {
@@ -15,4 +16,4 @@
         }
     },
     "containerName": "abc"
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities`
`5`	`5`	`{`
`6`		`- public class RenameCapability : DynamicCapability, ConnectedCapability<IRenameHandler>, ConnectedCapability<IPrepareRenameHandler>`
	`6`	`+ public class RenameCapability : DynamicCapability, ConnectedCapability<IRenameHandler>`
`7`	`7`	`{`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// Client supports testing for validity of rename operations`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using Newtonsoft.Json;`
`2`	`2`	`using Newtonsoft.Json.Serialization;`
	`3`	`+using OmniSharp.Extensions.LanguageServer.Protocol.Serialization;`
`3`	`4`
`4`	`5`	`namespace OmniSharp.Extensions.LanguageServer.Protocol.Models`
`5`	`6`	`{`
`@@ -20,6 +21,7 @@ public class CodeActionContext`
`20`	`21`	`/// Actions not of this kind are filtered out by the client before being shown. So servers`
`21`	`22`	`/// can omit computing them.`
`22`	`23`	`/// </summary>`
	`24`	`+ [Optional]`
`23`	`25`	`public Container<CodeActionKind> Only { get; set; }`
`24`	`26`	`}`
`25`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"snippetSupport": true,`
`3`		`- "commitCharactersSupport": false`
	`3`	`+ "commitCharactersSupport": false,`
	`4`	`+ "deprecatedSupport": false,`
	`5`	`+ "preselectSupport": false`
`4`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{`
	`1`	`+{`
`2`	`2`	`"textDocument": {`
`3`	`3`	`"uri": "file:///test/123/d.cs"`
`4`	`4`	`},`
`@@ -32,4 +32,4 @@`
`32`	`32`	`}`
`33`	`33`	`]`
`34`	`34`	`}`
`35`		`-}`
	`35`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"label": null,`
`3`	`3`	`"kind": 1,`
	`4`	`+ "deprecated": false,`
	`5`	`+ "preselect": false,`
`4`	`6`	`"insertTextFormat": 0,`
`5`	`7`	`"additionalTextEdits": [`
`6`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,13 @@`
`1`		`-{`
	`1`	`+{`
`2`	`2`	`"isIncomplete": true,`
`3`	`3`	`"items": [`
`4`	`4`	`{`
`5`	`5`	`"label": null,`
`6`	`6`	`"kind": 7,`
`7`	`7`	`"detail": "details",`
	`8`	`+ "deprecated": false,`
	`9`	`+ "preselect": false,`
`8`	`10`	`"insertTextFormat": 0`
`9`	`11`	`}`
`10`	`12`	`]`
`11`		`-}`
	`13`	`+}`