From c8abdf38ddafa7adb8e24568f8d73900bc7a9df4 Mon Sep 17 00:00:00 2001 From: Chris Rybicki Date: Mon, 9 Sep 2024 16:30:22 -0400 Subject: [PATCH] fix(compiler): regex is not bringable module (#7092) --- packages/@winglang/wingc/src/lib.rs | 4 +--- .../snapshots/completions/bring_suggestions.snap | 5 +---- .../completions/bring_suggestions_partial.snap | 5 +---- tests/invalid/bring.test.w | 6 ++++++ tools/hangar/__snapshots__/invalid.ts.snap | 14 ++++++++++++++ 5 files changed, 23 insertions(+), 11 deletions(-) diff --git a/packages/@winglang/wingc/src/lib.rs b/packages/@winglang/wingc/src/lib.rs index 0044a110178..cebfc6a1fa3 100644 --- a/packages/@winglang/wingc/src/lib.rs +++ b/packages/@winglang/wingc/src/lib.rs @@ -84,21 +84,19 @@ const WINGSDK_HTTP_MODULE: &'static str = "http"; const WINGSDK_MATH_MODULE: &'static str = "math"; const WINGSDK_AWS_MODULE: &'static str = "aws"; const WINGSDK_EXPECT_MODULE: &'static str = "expect"; -const WINGSDK_REGEX_MODULE: &'static str = "regex"; const WINGSDK_FS_MODULE: &'static str = "fs"; const WINGSDK_SIM_MODULE: &'static str = "sim"; const WINGSDK_UI_MODULE: &'static str = "ui"; pub const UTIL_CLASS_NAME: &'static str = "Util"; -const WINGSDK_BRINGABLE_MODULES: [&'static str; 10] = [ +const WINGSDK_BRINGABLE_MODULES: [&'static str; 9] = [ WINGSDK_CLOUD_MODULE, WINGSDK_UTIL_MODULE, WINGSDK_HTTP_MODULE, WINGSDK_MATH_MODULE, WINGSDK_AWS_MODULE, WINGSDK_EXPECT_MODULE, - WINGSDK_REGEX_MODULE, WINGSDK_FS_MODULE, WINGSDK_SIM_MODULE, WINGSDK_UI_MODULE, diff --git a/packages/@winglang/wingc/src/lsp/snapshots/completions/bring_suggestions.snap b/packages/@winglang/wingc/src/lsp/snapshots/completions/bring_suggestions.snap index 872f845d882..3b0ebabb871 100644 --- a/packages/@winglang/wingc/src/lsp/snapshots/completions/bring_suggestions.snap +++ b/packages/@winglang/wingc/src/lsp/snapshots/completions/bring_suggestions.snap @@ -1,5 +1,5 @@ --- -source: libs/wingc/src/lsp/completions.rs +source: packages/@winglang/wingc/src/lsp/completions.rs --- - label: aws kind: 9 @@ -19,9 +19,6 @@ source: libs/wingc/src/lsp/completions.rs - label: math kind: 9 sortText: kk|math -- label: regex - kind: 9 - sortText: kk|regex - label: sim kind: 9 sortText: kk|sim diff --git a/packages/@winglang/wingc/src/lsp/snapshots/completions/bring_suggestions_partial.snap b/packages/@winglang/wingc/src/lsp/snapshots/completions/bring_suggestions_partial.snap index 872f845d882..3b0ebabb871 100644 --- a/packages/@winglang/wingc/src/lsp/snapshots/completions/bring_suggestions_partial.snap +++ b/packages/@winglang/wingc/src/lsp/snapshots/completions/bring_suggestions_partial.snap @@ -1,5 +1,5 @@ --- -source: libs/wingc/src/lsp/completions.rs +source: packages/@winglang/wingc/src/lsp/completions.rs --- - label: aws kind: 9 @@ -19,9 +19,6 @@ source: libs/wingc/src/lsp/completions.rs - label: math kind: 9 sortText: kk|math -- label: regex - kind: 9 - sortText: kk|regex - label: sim kind: 9 sortText: kk|sim diff --git a/tests/invalid/bring.test.w b/tests/invalid/bring.test.w index d37d18299f4..831a0568b66 100644 --- a/tests/invalid/bring.test.w +++ b/tests/invalid/bring.test.w @@ -7,3 +7,9 @@ bring ; //^^^^^ Expected module specification (see https://www.winglang.io/docs/libraries) bring c; //^^^^^^ "c" is not a built-in module + +bring regex; +//^ "Could not find a trusted library "@winglibs/regex" installed" + +bring num; +//^ Could not find a trusted library "@winglibs/num" installed diff --git a/tools/hangar/__snapshots__/invalid.ts.snap b/tools/hangar/__snapshots__/invalid.ts.snap index ce0c40a4885..6a8a5ddb043 100644 --- a/tools/hangar/__snapshots__/invalid.ts.snap +++ b/tools/hangar/__snapshots__/invalid.ts.snap @@ -433,6 +433,20 @@ error: Could not find a trusted library "@winglibs/c" installed. Did you mean to | ^^^^^^^^ +error: Could not find a trusted library "@winglibs/regex" installed. Did you mean to run \`npm i @winglibs/regex\`? + --> ../../../tests/invalid/bring.test.w:11:1 + | +11 | bring regex; + | ^^^^^^^^^^^^ + + +error: Could not find a trusted library "@winglibs/num" installed. Did you mean to run \`npm i @winglibs/num\`? + --> ../../../tests/invalid/bring.test.w:14:1 + | +14 | bring num; + | ^^^^^^^^^^ + + error: Redundant bring of "std" --> ../../../tests/invalid/bring.test.w:1:1 |