Skip to content

Only show completions for prelude items when not in a module qualifier #4443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 4, 2025
Merged

Only show completions for prelude items when not in a module qualifier #4443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,10 @@
code when the piped argument was a binary operation.
([Giacomo Cavalieri](https://github.com/giacomocavalieri))

- Fixed a bug where prelude types and values would be suggested in autocomplete
when part of a module select.
([Surya Rose](https://github.com/GearsDatapacks))

## v1.9.1 - 2025-03-10

### Formatter
Expand Down
104 changes: 52 additions & 52 deletions compiler-core/src/language_server/completer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,22 +402,10 @@ where

let (insert_range, module_select) = surrounding_completion;

// Prelude types
for type_ in PreludeType::iter() {
let label: String = type_.name().into();
let sort_text = Some(sort_text(CompletionKind::Prelude, &label));
completions.push(CompletionItem {
label,
detail: Some("Type".into()),
kind: Some(CompletionItemKind::CLASS),
sort_text,
..Default::default()
});
}

// Module types
// Module and prelude types
// Do not complete direct module types if the user has already started typing a module select.
// e.x. when the user has typed mymodule.| we know local module types are no longer relevant
// e.x. when the user has typed mymodule.| we know local module types and prelude types are no
// longer relevant.
if module_select.is_none() {
for (name, type_) in &self.module.ast.type_info.types {
completions.push(type_completion(
Expand All @@ -429,6 +417,18 @@ where
CompletionKind::LocallyDefined,
));
}

for type_ in PreludeType::iter() {
let label: String = type_.name().into();
let sort_text = Some(sort_text(CompletionKind::Prelude, &label));
completions.push(CompletionItem {
label,
detail: Some("Type".into()),
kind: Some(CompletionItemKind::CLASS),
sort_text,
..Default::default()
});
}
}

// Imported modules
Expand Down Expand Up @@ -549,44 +549,10 @@ where

let (insert_range, module_select) = surrounding_completion;

let mut push_prelude_completion = |label: &str, kind| {
let label = label.to_string();
let sort_text = Some(sort_text(CompletionKind::Prelude, &label));
completions.push(CompletionItem {
label,
detail: Some(PRELUDE_MODULE_NAME.into()),
kind: Some(kind),
sort_text,
..Default::default()
});
};

// Prelude values
for type_ in PreludeType::iter() {
match type_ {
PreludeType::Bool => {
push_prelude_completion("True", CompletionItemKind::ENUM_MEMBER);
push_prelude_completion("False", CompletionItemKind::ENUM_MEMBER);
}
PreludeType::Nil => {
push_prelude_completion("Nil", CompletionItemKind::ENUM_MEMBER);
}
PreludeType::Result => {
push_prelude_completion("Ok", CompletionItemKind::CONSTRUCTOR);
push_prelude_completion("Error", CompletionItemKind::CONSTRUCTOR);
}
PreludeType::BitArray
| PreludeType::Float
| PreludeType::Int
| PreludeType::List
| PreludeType::String
| PreludeType::UtfCodepoint => {}
}
}

// Module values
// Module and prelude values
// Do not complete direct module values if the user has already started typing a module select.
// e.x. when the user has typed mymodule.| we know local module values are no longer relevant
// e.x. when the user has typed mymodule.| we know local module and prelude values are no longer
// relevant.
if module_select.is_none() {
let cursor = self
.src_line_numbers
Expand Down Expand Up @@ -616,6 +582,40 @@ where
CompletionKind::LocallyDefined,
));
}

let mut push_prelude_completion = |label: &str, kind| {
let label = label.to_string();
let sort_text = Some(sort_text(CompletionKind::Prelude, &label));
completions.push(CompletionItem {
label,
detail: Some(PRELUDE_MODULE_NAME.into()),
kind: Some(kind),
sort_text,
..Default::default()
});
};

for type_ in PreludeType::iter() {
match type_ {
PreludeType::Bool => {
push_prelude_completion("True", CompletionItemKind::ENUM_MEMBER);
push_prelude_completion("False", CompletionItemKind::ENUM_MEMBER);
}
PreludeType::Nil => {
push_prelude_completion("Nil", CompletionItemKind::ENUM_MEMBER);
}
PreludeType::Result => {
push_prelude_completion("Ok", CompletionItemKind::CONSTRUCTOR);
push_prelude_completion("Error", CompletionItemKind::CONSTRUCTOR);
}
PreludeType::BitArray
| PreludeType::Float
| PreludeType::Int
| PreludeType::List
| PreludeType::String
| PreludeType::UtfCodepoint => {}
}
}
}

// Imported modules
Expand Down
20 changes: 0 additions & 20 deletions ...leam_core__language_server__tests__completion__completions_for_private_record_access.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,6 @@ fn fun() {


----- Completion content -----
Error
kind: Constructor
detail: gleam
sort: 4_Error
False
kind: EnumMember
detail: gleam
sort: 4_False
Nil
kind: EnumMember
detail: gleam
sort: 4_Nil
Ok
kind: Constructor
detail: gleam
sort: 4_Ok
True
kind: EnumMember
detail: gleam
sort: 4_True
wibble
kind: Field
detail: Int
Expand Down
20 changes: 0 additions & 20 deletions ...pshots/gleam_core__language_server__tests__completion__completions_for_record_access.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,6 @@ fn fun() {


----- Completion content -----
Error
kind: Constructor
detail: gleam
sort: 4_Error
False
kind: EnumMember
detail: gleam
sort: 4_False
Nil
kind: EnumMember
detail: gleam
sort: 4_Nil
Ok
kind: Constructor
detail: gleam
sort: 4_Ok
True
kind: EnumMember
detail: gleam
sort: 4_True
wibble
kind: Field
detail: Int
Expand Down
20 changes: 0 additions & 20 deletions ...ore__language_server__tests__completion__completions_for_record_access_known_variant.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,6 @@ fn fun(some_wibble: Wibble) {


----- Completion content -----
Error
kind: Constructor
detail: gleam
sort: 4_Error
False
kind: EnumMember
detail: gleam
sort: 4_False
Nil
kind: EnumMember
detail: gleam
sort: 4_Nil
Ok
kind: Constructor
detail: gleam
sort: 4_Ok
True
kind: EnumMember
detail: gleam
sort: 4_True
a
kind: Field
detail: Int
Expand Down
20 changes: 0 additions & 20 deletions ...e__language_server__tests__completion__completions_for_record_access_unknown_variant.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,6 @@ fn fun(some_wibble: Wibble) {


----- Completion content -----
Error
kind: Constructor
detail: gleam
sort: 4_Error
False
kind: EnumMember
detail: gleam
sort: 4_False
Nil
kind: EnumMember
detail: gleam
sort: 4_Nil
Ok
kind: Constructor
detail: gleam
sort: 4_Ok
True
kind: EnumMember
detail: gleam
sort: 4_True
a
kind: Field
detail: Int
Expand Down
36 changes: 0 additions & 36 deletions ...shots/gleam_core__language_server__tests__completion__imported_type_cursor_after_dot.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,42 +12,6 @@ pub fn wibble(


----- Completion content -----
BitArray
kind: Class
detail: Type
sort: 4_BitArray
Bool
kind: Class
detail: Type
sort: 4_Bool
Float
kind: Class
detail: Type
sort: 4_Float
Int
kind: Class
detail: Type
sort: 4_Int
List
kind: Class
detail: Type
sort: 4_List
Nil
kind: Class
detail: Type
sort: 4_Nil
Result
kind: Class
detail: Type
sort: 4_Result
String
kind: Class
detail: Type
sort: 4_String
UtfCodepoint
kind: Class
detail: Type
sort: 4_UtfCodepoint
dep.Zoo
kind: Class
detail: Type
Expand Down
36 changes: 0 additions & 36 deletions ...age_server__tests__completion__imported_type_cursor_after_dot_other_matching_modules.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,42 +13,6 @@ pub fn wibble(


----- Completion content -----
BitArray
kind: Class
detail: Type
sort: 4_BitArray
Bool
kind: Class
detail: Type
sort: 4_Bool
Float
kind: Class
detail: Type
sort: 4_Float
Int
kind: Class
detail: Type
sort: 4_Int
List
kind: Class
detail: Type
sort: 4_List
Nil
kind: Class
detail: Type
sort: 4_Nil
Result
kind: Class
detail: Type
sort: 4_Result
String
kind: Class
detail: Type
sort: 4_String
UtfCodepoint
kind: Class
detail: Type
sort: 4_UtfCodepoint
dep.Zoo
kind: Class
detail: Type
Expand Down
36 changes: 0 additions & 36 deletions ...re__language_server__tests__completion__imported_type_cursor_after_dot_other_modules.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,42 +12,6 @@ pub fn wibble(


----- Completion content -----
BitArray
kind: Class
detail: Type
sort: 4_BitArray
Bool
kind: Class
detail: Type
sort: 4_Bool
Float
kind: Class
detail: Type
sort: 4_Float
Int
kind: Class
detail: Type
sort: 4_Int
List
kind: Class
detail: Type
sort: 4_List
Nil
kind: Class
detail: Type
sort: 4_Nil
Result
kind: Class
detail: Type
sort: 4_Result
String
kind: Class
detail: Type
sort: 4_String
UtfCodepoint
kind: Class
detail: Type
sort: 4_UtfCodepoint
dep.Zoo
kind: Class
detail: Type
Expand Down
Loading
Loading