Skip to content

GH159: Fixes BooleanOrConverter #160

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

Merged
merged 1 commit into from
Jul 21, 2019
Merged

GH159: Fixes BooleanOrConverter #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion src/Protocol/Serialization/Converters/BooleanOrConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,15 @@ private static void WriteJsonGeneric<T>(JsonWriter writer, BooleanOr<T> value, J
{
if (value.IsValue)
{
new JValue(value.Value).WriteTo(writer);
if (typeof(T).IsValueType)
{
new JValue(value.Value).WriteTo(writer);
}
else
{
serializer.Serialize(writer, value.Value);
}

return;
}

Expand Down
43 changes: 43 additions & 0 deletions test/Lsp.Tests/Models/InitializeResultTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,48 @@ public void SimpleTest(string expected)
var deresult = new Serializer(ClientVersion.Lsp3).DeserializeObject<InitializeResult>(expected);
deresult.Should().BeEquivalentTo(model);
}

[Theory, JsonFixture]
public void BooleanOrTest(string expected)
{
var model = new InitializeResult() {
Capabilities = new ServerCapabilities {
CodeActionProvider = new CodeActionOptions {
CodeActionKinds = new [] {
CodeActionKind.QuickFix
}
},
ColorProvider = new ColorOptions {
DocumentSelector = DocumentSelector.ForPattern("**/*.foo"),
Id = "foo"
},
DeclarationProvider = new DeclarationOptions {
DocumentSelector = DocumentSelector.ForPattern("**/*.foo"),
Id = "foo"
},
FoldingRangeProvider = new FoldingRangeOptions {
DocumentSelector = DocumentSelector.ForPattern("**/*.foo"),
Id = "foo"
},
ImplementationProvider = new ImplementationOptions {
DocumentSelector = DocumentSelector.ForPattern("**/*.foo"),
Id = "foo"
},
RenameProvider = new RenameOptions {
PrepareProvider = true
},
TypeDefinitionProvider = new TypeDefinitionOptions {
DocumentSelector = DocumentSelector.ForPattern("**/*.foo"),
Id = "foo"
}
}
};
var result = Fixture.SerializeObject(model);

result.Should().Be(expected);

var deresult = new Serializer(ClientVersion.Lsp3).DeserializeObject<InitializeResult>(expected);
deresult.Should().BeEquivalentTo(model);
}
}
}
61 changes: 61 additions & 0 deletions test/Lsp.Tests/Models/InitializeResultTests_$BooleanOrTest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"capabilities": {
"hoverProvider": false,
"definitionProvider": false,
"referencesProvider": false,
"documentHighlightProvider": false,
"documentSymbolProvider": false,
"workspaceSymbolProvider": false,
"codeActionProvider": {
"codeActionKinds": [
"quickfix"
]
},
"documentFormattingProvider": false,
"documentRangeFormattingProvider": false,
"renameProvider": {
"prepareProvider": true
},
"experimental": {},
"typeDefinitionProvider": {
"id": "foo",
"documentSelector": [
{
"pattern": "**/*.foo"
}
]
},
"implementationProvider": {
"id": "foo",
"documentSelector": [
{
"pattern": "**/*.foo"
}
]
},
"colorProvider": {
"id": "foo",
"documentSelector": [
{
"pattern": "**/*.foo"
}
]
},
"foldingRangeProvider": {
"id": "foo",
"documentSelector": [
{
"pattern": "**/*.foo"
}
]
},
"declarationProvider": {
"id": "foo",
"documentSelector": [
{
"pattern": "**/*.foo"
}
]
}
}
}