aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIsaiah Paget <113209222+IsaiahPaget@users.noreply.github.com>2024-04-07 09:44:03 -0700
committerIsaiah Paget <113209222+IsaiahPaget@users.noreply.github.com>2024-04-07 09:44:03 -0700
commit50d0d1bd80b2edb44695396149c2803983a6d23f (patch)
tree73fdf467f793e926c6c898b579ea927ad6b515ce /src
parent9d8cc49b0f6c3b6d0b5c46dae665fee7c7cb7b42 (diff)
parent34dc6495d51d8525bd2bc1059a31a27588b08e0c (diff)
Merge remote-tracking branch 'origin' into no_type_inference_bug
Diffstat (limited to 'src')
-rw-r--r--src/common/ast.odin2
-rw-r--r--src/server/analysis.odin4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/common/ast.odin b/src/common/ast.odin
index 221432b..1036b04 100644
--- a/src/common/ast.odin
+++ b/src/common/ast.odin
@@ -26,6 +26,8 @@ keyword_map: map[string]bool = {
"any" = true,
"u32" = true,
"u128" = true,
+ "b8" = true,
+ "b16" = true,
"b32" = true,
"b64" = true,
"true" = true,
diff --git a/src/server/analysis.odin b/src/server/analysis.odin
index 6dfe394..6b9f253 100644
--- a/src/server/analysis.odin
+++ b/src/server/analysis.odin
@@ -4460,10 +4460,10 @@ fallback_position_context_completion :: proc(
} else if c == '[' && bracket_count == 0 {
start = i + 1
break
- } else if c == ']' && !last_dot {
+ } else if c == ']' && !last_dot && !last_arrow {
start = i + 1
break
- } else if c == ')' && !last_dot {
+ } else if c == ')' && !last_dot && !last_arrow {
start = i + 1
break
} else if c == ')' {