Sort completions by type

Author: GearsDatapacks

compiler-core/src/language_server/completer.rs

@@ -272,15 +272,15 @@ where
                 None => return Ok(None),
             };
 
-            let completer = Completer::new(&src, &params, &this.compiler, module);
+            let mut completer = Completer::new(&src, &params, &this.compiler, module);
             let byte_index = completer.module_line_numbers.byte_index(params.position);
 
             // If in comment context, do not provide completions
             if module.extra.is_within_comment(byte_index) {
                 return Ok(None);
             }
 
-            // Check current filercontents if the user is writing an import
+            // Check current file contents if the user is writing an import
             // and handle separately from the rest of the completion flow
             // Check if an import is being written
             if let Some(value) = completer.import_completions() {
@@ -310,9 +310,10 @@ where
                     Some(completions)
                 }
                 Located::Expression {
-                    expression: TypedExpr::RecordAccess { record, .. },
+                    expression: TypedExpr::RecordAccess { record, type_, .. },
                     ..
                 } => {
+                    completer.expected_type = Some(type_.clone());
                     let mut completions = vec![];
                     completions.append(&mut completer.completion_values());
                     completions.append(&mut completer.completion_field_accessors(record.type_()));
@@ -333,9 +334,11 @@ where
                     );
                     Some(completions)
                 }
-                Located::Statement(_) | Located::Expression { .. } => {
+                Located::Expression { expression, .. } => {
+                    completer.expected_type = Some(expression.type_());
                     Some(completer.completion_values())
                 }
+                Located::Statement(_) => Some(completer.completion_values()),
                 Located::ModuleStatement(Definition::Function(_)) => {
                     Some(completer.completion_types())
                 }
@@ -354,7 +357,12 @@ where
                         completer.unqualified_completions_from_module(importing_module, true)
                     }),
 
-                Located::ModuleStatement(Definition::ModuleConstant(_)) | Located::Constant(_) => {
+                Located::ModuleStatement(Definition::ModuleConstant(constant)) => {
+                    completer.expected_type = Some(constant.type_.clone());
+                    Some(completer.completion_values())
+                }
+                Located::Constant(constant) => {
+                    completer.expected_type = Some(constant.type_());
                     Some(completer.completion_values())
                 }
 

compiler-core/src/language_server/engine.rs

@@ -2252,3 +2252,17 @@ const x = "io."
     );
     assert_eq!(completions, vec![],);
 }
+
+#[test]
+fn prefer_values_matching_expected_type() {
+    let code = "
+pub fn main() -> Bool {
+  let wibble = 123
+  let wubble = True
+  let Wobble = 1.5
+  w
+}
+";
+
+    assert_completion!(TestProject::for_source(code), Position::new(5, 3));
+}

compiler-core/src/language_server/tests/completion.rs

@@ -17,8 +17,8 @@ fn fun() {
 wibble
   kind:   Field
   detail: Int
-  sort:   1_wibble
+  sort:   01_wibble
 wobble
   kind:   Field
   detail: Int
-  sort:   1_wobble
+  sort:   01_wobble

compiler-core/src/language_server/tests/snapshots/gleam_core__language_server__tests__completion__completions_for_private_record_access.snap

@@ -17,8 +17,8 @@ fn fun() {
 wibble
   kind:   Field
   detail: Int
-  sort:   1_wibble
+  sort:   01_wibble
 wobble
   kind:   Field
   detail: Int
-  sort:   1_wobble
+  sort:   01_wobble

compiler-core/src/language_server/tests/snapshots/gleam_core__language_server__tests__completion__completions_for_record_access.snap

@@ -19,16 +19,16 @@ fn fun(some_wibble: Wibble) {
 a
   kind:   Field
   detail: Int
-  sort:   1_a
+  sort:   01_a
 b
   kind:   Field
   detail: Int
-  sort:   1_b
+  sort:   01_b
 c
   kind:   Field
   detail: Int
-  sort:   1_c
+  sort:   01_c
 d
   kind:   Field
   detail: Int
-  sort:   1_d
+  sort:   01_d

compiler-core/src/language_server/tests/snapshots/gleam_core__language_server__tests__completion__completions_for_record_access_known_variant.snap

@@ -16,4 +16,4 @@ fn fun(some_wibble: Wibble) {
 a
   kind:   Field
   detail: Int
-  sort:   1_a
+  sort:   01_a

compiler-core/src/language_server/tests/snapshots/gleam_core__language_server__tests__completion__completions_for_record_access_unknown_variant.snap

@@ -39,7 +39,7 @@ main
 wibble
   kind:   Variable
   detail: Int
-  sort:   2_wibble
+  sort:   02_wibble
   desc:   app
   docs:   "A locally defined variable."
   edits:

compiler-core/src/language_server/tests/snapshots/gleam_core__language_server__tests__completion__local_variable_anonymous_function.snap

@@ -51,15 +51,15 @@ main
 wabble
   kind:   Variable
   detail: Int
-  sort:   2_wabble
+  sort:   02_wabble
   desc:   app
   docs:   "A locally defined variable."
   edits:
     [5:4-5:4]: "wabble"
 wibble
   kind:   Variable
   detail: Int
-  sort:   2_wibble
+  sort:   02_wibble
   desc:   app
   docs:   "A locally defined variable."
   edits:

compiler-core/src/language_server/tests/snapshots/gleam_core__language_server__tests__completion__local_variable_ignore_anonymous_function_args_nested.snap

@@ -50,15 +50,15 @@ main
 wabble
   kind:   Variable
   detail: Int
-  sort:   2_wabble
+  sort:   02_wabble
   desc:   app
   docs:   "A locally defined variable."
   edits:
     [5:4-5:4]: "wabble"
 wibble
   kind:   Variable
   detail: Int
-  sort:   2_wibble
+  sort:   02_wibble
   desc:   app
   docs:   "A locally defined variable."
   edits: