fix rename file to use DocumentUri instead of string (#270)

* fix rename file to use DocumentUri instead of string * Updated versioned identifier
OmniSharp · Aug 1, 2020 · bfe5f1c · bfe5f1c
1 parent 00dafaa
commit bfe5f1c
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 9 deletions.
diff --git a/src/Protocol/Models/PublishDiagnosticsParams.cs b/src/Protocol/Models/PublishDiagnosticsParams.cs
@@ -18,7 +18,7 @@ public class PublishDiagnosticsParams : IRequest
         /// @since 3.15.0
         /// </summary>
         [Optional]
-        public long Version { get; set; }
+        public int? Version { get; set; }
 
         /// <summary>
         ///  An array of diagnostic information items.

diff --git a/src/Protocol/Models/RenameFile.cs b/src/Protocol/Models/RenameFile.cs
@@ -14,11 +14,11 @@ public class RenameFile : IFile
         /// <summary>
         /// The old (existing) location.
         /// </summary>
-        public string OldUri { get; set; }
+        public DocumentUri OldUri { get; set; }
         /// <summary>
         /// The new location.
         /// </summary>
-        public string NewUri { get; set; }
+        public DocumentUri NewUri { get; set; }
         /// <summary>
         /// Rename Options.
         /// </summary>

diff --git a/src/Protocol/Models/TextDocumentItem.cs b/src/Protocol/Models/TextDocumentItem.cs
@@ -14,7 +14,7 @@ public class TextDocumentItem : TextDocumentIdentifier
         /// The version number of this document (it will strictly increase after each
         /// change, including undo/redo).
         /// </summary>
-        public long Version { get; set; }
+        public int? Version { get; set; }
 
         /// <summary>
         /// The content of the opened text document.

diff --git a/src/Protocol/Models/VersionedTextDocumentIdentifier.cs b/src/Protocol/Models/VersionedTextDocumentIdentifier.cs
@@ -36,9 +36,9 @@ public override int GetHashCode()
         /// <summary>
         /// The version number of this document.
         /// </summary>
-        public long Version { get; set; }
+        public int? Version { get; set; }
 
-        private string DebuggerDisplay => $"({Version}) {Uri}";
+        private string DebuggerDisplay => $"{Uri}@({Version})";
         /// <inheritdoc />
         public override string ToString() => DebuggerDisplay;
     }

diff --git a/test/Lsp.Tests/Models/DidChangeTextDocumentParamsTests_$NonStandardCharactersTest.json b/test/Lsp.Tests/Models/DidChangeTextDocumentParamsTests_$NonStandardCharactersTest.json
@@ -1,6 +1,6 @@
 {
     "textDocument": {
-        "version": 0,
+        "version": null,
         "uri": "file:///c:/abc/M%C3%B6rk%C3%B6.cs"
     },
     "contentChanges": [

diff --git a/test/Lsp.Tests/Models/DidChangeTextDocumentParamsTests_$SimpleTest.json b/test/Lsp.Tests/Models/DidChangeTextDocumentParamsTests_$SimpleTest.json
@@ -1,6 +1,6 @@
 {
     "textDocument": {
-        "version": 0,
+        "version": null,
         "uri": "file:///somepath/to/a/file.ext"
     },
     "contentChanges": [

diff --git a/test/Lsp.Tests/Models/PublishDiagnosticsParamsTests_$SimpleTest.json b/test/Lsp.Tests/Models/PublishDiagnosticsParamsTests_$SimpleTest.json
@@ -1,6 +1,5 @@
 {
     "uri": "file:///abc/123.cs",
-    "version": 0,
     "diagnostics": [
         {
             "range": {