aboutsummaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorDaniel Gavin <danielgavin5@hotmail.com>2022-02-15 17:35:22 +0100
committerDaniel Gavin <danielgavin5@hotmail.com>2022-02-15 17:35:22 +0100
commit63d0bd412a8817445d6dc18e79d5d54c94caf401 (patch)
tree90032a710b80fe211b0cc9bd46cbc27cd5dbf6ae /src/server
parentefe15efabd1b718f89c869ac9c1a6dbd680a8bc0 (diff)
parent1d4c3bd57e6d5c7f8472f3e0b825bb38739e5ecc (diff)
Merge branch 'master' into refractor-analysis
Diffstat (limited to 'src/server')
-rw-r--r--src/server/completion.odin1
-rw-r--r--src/server/semantic_tokens.odin2
-rw-r--r--src/server/types.odin4
3 files changed, 3 insertions, 4 deletions
diff --git a/src/server/completion.odin b/src/server/completion.odin
index 6b24d9d..59df7a3 100644
--- a/src/server/completion.odin
+++ b/src/server/completion.odin
@@ -1029,7 +1029,6 @@ get_identifier_completion :: proc(ast_context: ^analysis.AstContext, position_co
} else {
item := CompletionItem {
label = result.name,
- insertTextFormat = .PlainText,
documentation = result.doc,
};
diff --git a/src/server/semantic_tokens.odin b/src/server/semantic_tokens.odin
index 389d34c..c0a117f 100644
--- a/src/server/semantic_tokens.odin
+++ b/src/server/semantic_tokens.odin
@@ -472,7 +472,7 @@ visit_enum_fields :: proc(node: ast.Enum_Type, builder: ^SemanticTokenBuilder, a
write_semantic_node(builder, field, ast_context.file.src, .EnumMember, .None);
}
else if f, ok := field.derived.(Field_Value); ok {
- if ident, ok := f.field.derived.(Ident); ok {
+ if _, ok := f.field.derived.(Ident); ok {
write_semantic_node(builder, f.field, ast_context.file.src, .EnumMember, .None);
}
visit(f.value, builder, ast_context);
diff --git a/src/server/types.odin b/src/server/types.odin
index c3147e9..8521108 100644
--- a/src/server/types.odin
+++ b/src/server/types.odin
@@ -268,8 +268,8 @@ CompletionItem :: struct {
kind: CompletionItemKind,
detail: string,
documentation: string,
- insertTextFormat: InsertTextFormat,
- insertText: string,
+ insertTextFormat: Maybe(InsertTextFormat),
+ insertText: Maybe(string),
additionalTextEdits: []TextEdit,
tags: []CompletionItemTag,
deprecated: bool,