Merge pull request #821 from julia-vscode/progresstoken

Fix for ProgressToken typing

Author: pfitzseb

src/protocol/basic.jl

@@ -3,9 +3,8 @@ mutable struct CancelParams
 end
 CancelParams(d::Dict) = CancelParams(d["id"])
 
-const ProgressToken = Union{Int,String}
 struct ProgressParams{T}
-    token::ProgressToken
+    token::Union{Int,String} # ProgressToken
     value::T
 end
 
@@ -148,11 +147,11 @@ end
 ##############################################################################
 # Progress
 struct WorkDoneProgressCreateParams <: Outbound
-    token::ProgressToken
+    token::Union{Int,String} # ProgressToken
 end
 
 @dict_readable struct WorkDoneProgressCancelParams
-    token::ProgressToken
+    token::Union{Int,String} # ProgressToken
 end
 
 struct WorkDoneProgressBegin <: Outbound
@@ -185,7 +184,7 @@ struct WorkDoneProgressEnd <: Outbound
 end
 
 struct WorkDoneProgressParams <: Outbound
-    workDoneToken::Union{ProgressToken,Missing}
+    workDoneToken::Union{Int,String,Missing} # ProgressToken
 end
 
 struct WorkDoneProgressOptions <: Outbound
@@ -196,5 +195,5 @@ end
 # Partial
 
 struct PartialResultParams <: Outbound
-    partialResultToken::Union{ProgressToken,Missing}
+    partialResultToken::Union{Int,String,Missing} # ProgressToken
 end

src/protocol/features.jl

@@ -142,8 +142,8 @@ end
 
 @dict_readable struct DocumentColorParams <: Outbound
     textDocument::TextDocumentIdentifier
-    workDoneToken::Union{ProgressToken,Missing}
-    partialResultToken::Union{ProgressToken,Missing}
+    workDoneToken::Union{Int,String,Missing} # ProgressToken
+    partialResultToken::Union{Int,String,Missing} # ProgressToken
 end
 
 struct Color <: Outbound
@@ -196,7 +196,7 @@ end
 @dict_readable struct RenameParams <: Outbound
     textDocument::TextDocumentIdentifier
     position::Position
-    workDoneToken::Union{ProgressToken,Missing}
+    workDoneToken::Union{Int,String,Missing} # ProgressToken
     newName::String
 end
 
@@ -231,8 +231,8 @@ end
 
 @dict_readable struct FoldingRangeParams <: Outbound
     textDocument::TextDocumentIdentifier
-    workDoneToken::Union{ProgressToken,Missing}
-    partialResultToken::Union{ProgressToken,Missing}
+    workDoneToken::Union{Int,String,Missing} # ProgressToken
+    partialResultToken::Union{Int,String,Missing} # ProgressToken
 end
 
 struct FoldingRange <: Outbound
@@ -260,8 +260,8 @@ struct SelectionRangeRegistrationOptions <: Outbound
 end
 
 @dict_readable struct SelectionRangeParams <: Outbound
-    workDoneToken::Union{ProgressToken,Missing}
-    partialResultToken::Union{ProgressToken,Missing}
+    workDoneToken::Union{Int,String,Missing} # ProgressToken
+    partialResultToken::Union{Int,String,Missing} # ProgressToken
     textDocument::TextDocumentIdentifier
     positions::Vector{Position}
 end
@@ -289,7 +289,7 @@ mutable struct ExecuteCommandRegistrationOptions <: Outbound
 end
 
 @dict_readable struct ExecuteCommandParams <: Outbound
-    workDoneToken::Union{ProgressToken,Missing}
+    workDoneToken::Union{Int,String,Missing} # ProgressToken
     command::String
     arguments::Union{Vector{Any},Missing}
 end

src/protocol/goto.jl

@@ -17,8 +17,8 @@ end
 @dict_readable struct DeclarationParams <: Outbound
     textDocument::TextDocumentIdentifier
     position::Position
-    workDoneToken::Union{ProgressToken,Missing}
-    partialResultToken::Union{ProgressToken,Missing}
+    workDoneToken::Union{Int,String,Missing} # ProgressToken
+    partialResultToken::Union{Int,String,Missing} # ProgressToken
 end
 
 ##############################################################################
@@ -40,8 +40,8 @@ end
 @dict_readable struct DefinitionParams <: Outbound
     textDocument::TextDocumentIdentifier
     position::Position
-    workDoneToken::Union{ProgressToken,Missing}
-    partialResultToken::Union{ProgressToken,Missing}
+    workDoneToken::Union{Int,String,Missing} # ProgressToken
+    partialResultToken::Union{Int,String,Missing} # ProgressToken
 end
 
 ##############################################################################
@@ -64,8 +64,8 @@ end
 @dict_readable struct TypeDefinitionParams <: Outbound
     textDocument::TextDocumentIdentifier
     position::Position
-    workDoneToken::Union{ProgressToken,Missing}
-    partialResultToken::Union{ProgressToken,Missing}
+    workDoneToken::Union{Int,String,Missing} # ProgressToken
+    partialResultToken::Union{Int,String,Missing} # ProgressToken
 end
 
 ##############################################################################
@@ -88,8 +88,8 @@ end
 @dict_readable struct ImplementationParams <: Outbound
     textDocument::TextDocumentIdentifier
     position::Position
-    workDoneToken::Union{ProgressToken,Missing}
-    partialResultToken::Union{ProgressToken,Missing}
+    workDoneToken::Union{Int,String,Missing} # ProgressToken
+    partialResultToken::Union{Int,String,Missing} # ProgressToken
 end
 
 ##############################################################################
@@ -114,7 +114,7 @@ end
 @dict_readable struct ReferenceParams <: Outbound
     textDocument::TextDocumentIdentifier
     position::Position
-    workDoneToken::Union{ProgressToken,Missing}
-    partialResultToken::Union{ProgressToken,Missing}
+    workDoneToken::Union{Int,String,Missing} # ProgressToken
+    partialResultToken::Union{Int,String,Missing} # ProgressToken
     context::ReferenceContext
 end

src/protocol/highlight.jl

@@ -19,8 +19,8 @@ end
 @dict_readable struct DocumentHighlightParams <: Outbound
     textDocument::TextDocumentIdentifier
     position::Position
-    workDoneToken::Union{ProgressToken,Missing}
-    partialResultToken::Union{ProgressToken,Missing}
+    workDoneToken::Union{Int,String,Missing} # ProgressToken
+    partialResultToken::Union{Int,String,Missing} # ProgressToken
 end
 
 struct DocumentHighlight <: Outbound

src/protocol/hover.jl

@@ -6,7 +6,7 @@ end
 @dict_readable struct HoverParams <: Outbound
     textDocument::TextDocumentIdentifier
     position::Position
-    workDoneToken::Union{ProgressToken,Missing}
+    workDoneToken::Union{Int,String,Missing} # ProgressToken
 end
 
 struct HoverOptions <: Outbound

src/protocol/initialize.jl

@@ -103,7 +103,7 @@ struct InitializeParams <: Outbound
     capabilities::ClientCapabilities
     trace::Union{String,Missing}
     workspaceFolders::Union{Vector{WorkspaceFolder},Nothing,Missing}
-    workDoneToken::Union{ProgressToken,Missing}
+    workDoneToken::Union{Int,String,Missing} # ProgressToken
 end
 
 # Requires handwritten implementaiton to account for 3-part Unions
@@ -116,7 +116,7 @@ function InitializeParams(dict::Dict)
     ClientCapabilities(dict["capabilities"]),
     haskey(dict, "trace") ? String(dict["trace"]) : missing ,
     !haskey(dict, "workspaceFolders") ? missing : dict["workspaceFolders"] === nothing ? nothing : WorkspaceFolder.(dict["workspaceFolders"]),
-    haskey(dict, "workDoneToken") ? ProgressToken(dict["workDoneToken"]) : missing)
+    haskey(dict, "workDoneToken") ? dict["workDoneToken"] : missing)
 end
 ##############################################################################
 

src/protocol/signature.jl

@@ -57,5 +57,5 @@ end
     textDocument::TextDocumentIdentifier
     position::Position
     context::Union{SignatureHelpContext,Missing}
-    workDoneToken::Union{ProgressToken,Missing}
+    workDoneToken::Union{Int,String,Missing} # ProgressToken
 end

src/protocol/symbols.jl

@@ -61,14 +61,14 @@ end
 
 @dict_readable struct DocumentSymbolParams <: Outbound
     textDocument::TextDocumentIdentifier
-    workDoneToken::Union{ProgressToken,Missing}
-    partialResultToken::Union{ProgressToken,Missing}
+    workDoneToken::Union{Int,String,Missing} # ProgressToken
+    partialResultToken::Union{Int,String,Missing} # ProgressToken
 end
 
 @dict_readable struct WorkspaceSymbolParams <: Outbound
     query::String
-    workDoneToken::Union{ProgressToken,Missing}
-    partialResultToken::Union{ProgressToken,Missing}
+    workDoneToken::Union{Int,String,Missing} # ProgressToken
+    partialResultToken::Union{Int,String,Missing} # ProgressToken
 end
 
 struct SymbolInformation <: Outbound