From 7fad94a24b69f6b9f1290b505c982028352ab352 Mon Sep 17 00:00:00 2001 From: Chris Rybicki Date: Mon, 22 Apr 2024 14:23:51 -0400 Subject: [PATCH] fix: missing built-in types in LSP auto-completion (#6296) ## Checklist - [ ] Title matches [Winglang's style guide](https://www.winglang.io/contributing/start-here/pull_requests#how-are-pull-request-titles-formatted) - [ ] Description explains motivation and solution - [ ] Tests added (always) - [ ] Docs updated (only required for features) - [ ] Added `pr/e2e-full` label if this feature requires end-to-end testing *By submitting this pull request, I confirm that my contribution is made under the terms of the [Wing Cloud Contribution License](https://github.com/winglang/wing/blob/main/CONTRIBUTION_LICENSE.md)*. --- libs/wingc/src/lsp/completions.rs | 2 +- .../lsp/snapshots/completions/call_struct_expansion.snap | 6 ++++++ .../completions/call_struct_expansion_partial.snap | 6 ++++++ libs/wingc/src/lsp/snapshots/completions/empty.snap | 6 ++++++ .../completions/hide_parent_symbols_defined_later.snap | 6 ++++++ .../snapshots/completions/only_show_symbols_in_scope.snap | 6 ++++++ .../lsp/snapshots/completions/struct_definition_types.snap | 6 ++++++ .../src/lsp/snapshots/completions/struct_literal_value.snap | 6 ++++++ .../src/lsp/snapshots/completions/struct_show_values.snap | 6 ++++++ .../snapshots/completions/type_annotation_shows_struct.snap | 6 ++++++ .../wingc/src/lsp/snapshots/completions/type_parameter.snap | 6 ++++++ 11 files changed, 61 insertions(+), 1 deletion(-) diff --git a/libs/wingc/src/lsp/completions.rs b/libs/wingc/src/lsp/completions.rs index bdf08bafb7d..337199c61ce 100644 --- a/libs/wingc/src/lsp/completions.rs +++ b/libs/wingc/src/lsp/completions.rs @@ -24,7 +24,7 @@ use crate::{UTIL_CLASS_NAME, WINGSDK_BRINGABLE_MODULES, WINGSDK_STD_MODULE}; use super::sync::check_utf8; -const BUILTIN_TYPES: [&str; 6] = ["bool", "duration", "Json", "MutJson", "num", "str"]; +const BUILTIN_TYPES: [&str; 8] = ["bool", "duration", "Json", "MutJson", "num", "str", "datetime", "regex"]; const BUILTIN_GENERICS: [&str; 6] = ["Array", "Map", "MutArray", "MutMap", "MutSet", "Set"]; #[no_mangle] diff --git a/libs/wingc/src/lsp/snapshots/completions/call_struct_expansion.snap b/libs/wingc/src/lsp/snapshots/completions/call_struct_expansion.snap index beffb2ff652..0f48b965ac3 100644 --- a/libs/wingc/src/lsp/snapshots/completions/call_struct_expansion.snap +++ b/libs/wingc/src/lsp/snapshots/completions/call_struct_expansion.snap @@ -59,12 +59,18 @@ source: libs/wingc/src/lsp/completions.rs - label: bool kind: 14 sortText: kl|zybool +- label: datetime + kind: 14 + sortText: kl|zydatetime - label: duration kind: 14 sortText: kl|zyduration - label: num kind: 14 sortText: kl|zynum +- label: regex + kind: 14 + sortText: kl|zyregex - label: str kind: 14 sortText: kl|zystr diff --git a/libs/wingc/src/lsp/snapshots/completions/call_struct_expansion_partial.snap b/libs/wingc/src/lsp/snapshots/completions/call_struct_expansion_partial.snap index f9a8ea1b2ee..f7b56f8d439 100644 --- a/libs/wingc/src/lsp/snapshots/completions/call_struct_expansion_partial.snap +++ b/libs/wingc/src/lsp/snapshots/completions/call_struct_expansion_partial.snap @@ -59,12 +59,18 @@ source: libs/wingc/src/lsp/completions.rs - label: bool kind: 14 sortText: kl|zybool +- label: datetime + kind: 14 + sortText: kl|zydatetime - label: duration kind: 14 sortText: kl|zyduration - label: num kind: 14 sortText: kl|zynum +- label: regex + kind: 14 + sortText: kl|zyregex - label: str kind: 14 sortText: kl|zystr diff --git a/libs/wingc/src/lsp/snapshots/completions/empty.snap b/libs/wingc/src/lsp/snapshots/completions/empty.snap index dc42d2b12af..0dc0d885fd1 100644 --- a/libs/wingc/src/lsp/snapshots/completions/empty.snap +++ b/libs/wingc/src/lsp/snapshots/completions/empty.snap @@ -77,12 +77,18 @@ source: libs/wingc/src/lsp/completions.rs - label: bool kind: 14 sortText: kl|zybool +- label: datetime + kind: 14 + sortText: kl|zydatetime - label: duration kind: 14 sortText: kl|zyduration - label: num kind: 14 sortText: kl|zynum +- label: regex + kind: 14 + sortText: kl|zyregex - label: str kind: 14 sortText: kl|zystr diff --git a/libs/wingc/src/lsp/snapshots/completions/hide_parent_symbols_defined_later.snap b/libs/wingc/src/lsp/snapshots/completions/hide_parent_symbols_defined_later.snap index 51c1d5f5334..bdbd5f2b5f4 100644 --- a/libs/wingc/src/lsp/snapshots/completions/hide_parent_symbols_defined_later.snap +++ b/libs/wingc/src/lsp/snapshots/completions/hide_parent_symbols_defined_later.snap @@ -84,12 +84,18 @@ source: libs/wingc/src/lsp/completions.rs - label: bool kind: 14 sortText: kl|zybool +- label: datetime + kind: 14 + sortText: kl|zydatetime - label: duration kind: 14 sortText: kl|zyduration - label: num kind: 14 sortText: kl|zynum +- label: regex + kind: 14 + sortText: kl|zyregex - label: str kind: 14 sortText: kl|zystr diff --git a/libs/wingc/src/lsp/snapshots/completions/only_show_symbols_in_scope.snap b/libs/wingc/src/lsp/snapshots/completions/only_show_symbols_in_scope.snap index b30720ae3ec..bee389dcdcc 100644 --- a/libs/wingc/src/lsp/snapshots/completions/only_show_symbols_in_scope.snap +++ b/libs/wingc/src/lsp/snapshots/completions/only_show_symbols_in_scope.snap @@ -48,12 +48,18 @@ source: libs/wingc/src/lsp/completions.rs - label: bool kind: 14 sortText: kl|zybool +- label: datetime + kind: 14 + sortText: kl|zydatetime - label: duration kind: 14 sortText: kl|zyduration - label: num kind: 14 sortText: kl|zynum +- label: regex + kind: 14 + sortText: kl|zyregex - label: str kind: 14 sortText: kl|zystr diff --git a/libs/wingc/src/lsp/snapshots/completions/struct_definition_types.snap b/libs/wingc/src/lsp/snapshots/completions/struct_definition_types.snap index f7cb5592831..430fae58296 100644 --- a/libs/wingc/src/lsp/snapshots/completions/struct_definition_types.snap +++ b/libs/wingc/src/lsp/snapshots/completions/struct_definition_types.snap @@ -22,12 +22,18 @@ source: libs/wingc/src/lsp/completions.rs - label: bool kind: 14 sortText: kl|zybool +- label: datetime + kind: 14 + sortText: kl|zydatetime - label: duration kind: 14 sortText: kl|zyduration - label: num kind: 14 sortText: kl|zynum +- label: regex + kind: 14 + sortText: kl|zyregex - label: str kind: 14 sortText: kl|zystr diff --git a/libs/wingc/src/lsp/snapshots/completions/struct_literal_value.snap b/libs/wingc/src/lsp/snapshots/completions/struct_literal_value.snap index 82a9bfb1acf..e091a39671b 100644 --- a/libs/wingc/src/lsp/snapshots/completions/struct_literal_value.snap +++ b/libs/wingc/src/lsp/snapshots/completions/struct_literal_value.snap @@ -47,12 +47,18 @@ source: libs/wingc/src/lsp/completions.rs - label: bool kind: 14 sortText: kl|zybool +- label: datetime + kind: 14 + sortText: kl|zydatetime - label: duration kind: 14 sortText: kl|zyduration - label: num kind: 14 sortText: kl|zynum +- label: regex + kind: 14 + sortText: kl|zyregex - label: str kind: 14 sortText: kl|zystr diff --git a/libs/wingc/src/lsp/snapshots/completions/struct_show_values.snap b/libs/wingc/src/lsp/snapshots/completions/struct_show_values.snap index cca4a77f5d1..a06bdc2effc 100644 --- a/libs/wingc/src/lsp/snapshots/completions/struct_show_values.snap +++ b/libs/wingc/src/lsp/snapshots/completions/struct_show_values.snap @@ -54,12 +54,18 @@ source: libs/wingc/src/lsp/completions.rs - label: bool kind: 14 sortText: kl|zybool +- label: datetime + kind: 14 + sortText: kl|zydatetime - label: duration kind: 14 sortText: kl|zyduration - label: num kind: 14 sortText: kl|zynum +- label: regex + kind: 14 + sortText: kl|zyregex - label: str kind: 14 sortText: kl|zystr diff --git a/libs/wingc/src/lsp/snapshots/completions/type_annotation_shows_struct.snap b/libs/wingc/src/lsp/snapshots/completions/type_annotation_shows_struct.snap index 41ebbe87e15..a93204f6b4d 100644 --- a/libs/wingc/src/lsp/snapshots/completions/type_annotation_shows_struct.snap +++ b/libs/wingc/src/lsp/snapshots/completions/type_annotation_shows_struct.snap @@ -16,12 +16,18 @@ source: libs/wingc/src/lsp/completions.rs - label: bool kind: 14 sortText: kl|zybool +- label: datetime + kind: 14 + sortText: kl|zydatetime - label: duration kind: 14 sortText: kl|zyduration - label: num kind: 14 sortText: kl|zynum +- label: regex + kind: 14 + sortText: kl|zyregex - label: str kind: 14 sortText: kl|zystr diff --git a/libs/wingc/src/lsp/snapshots/completions/type_parameter.snap b/libs/wingc/src/lsp/snapshots/completions/type_parameter.snap index 8d625512ae6..4d715c940df 100644 --- a/libs/wingc/src/lsp/snapshots/completions/type_parameter.snap +++ b/libs/wingc/src/lsp/snapshots/completions/type_parameter.snap @@ -10,12 +10,18 @@ source: libs/wingc/src/lsp/completions.rs - label: bool kind: 14 sortText: kl|zybool +- label: datetime + kind: 14 + sortText: kl|zydatetime - label: duration kind: 14 sortText: kl|zyduration - label: num kind: 14 sortText: kl|zynum +- label: regex + kind: 14 + sortText: kl|zyregex - label: str kind: 14 sortText: kl|zystr