Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

inline completion: Merge disabled_globs setting with default values (#24122)

Browse source 
This ensures that the following files are always ignored:

```
"**/.env*"
"**/*.pem"
"**/*.key"
"**/*.cert"
"**/*.crt"
"**/secrets.yml"
```

Release Notes:

- N/A
This commit is contained in:
Bennet Bo Fenner 2025-02-03 10:37:46 +01:00 • committed by GitHub
parent eb820ab800
commit 8edcaec1bf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/language/src/language_settings.rs
View file

@ -998,10 +998,11 @@ impl settings::Settings for AllLanguageSettings {
.features .features
.as_ref() .as_ref()
.and_then(|f| f.inline_completion_provider); .and_then(|f| f.inline_completion_provider);
let mut completion_globs = default_value let mut completion_globs: HashSet<&String> = default_value
.inline_completions .inline_completions
.as_ref() .as_ref()
.and_then(|c| c.disabled_globs.as_ref()) .and_then(|c| c.disabled_globs.as_ref())
.map(|globs| globs.iter().collect())
.ok_or_else(Self::missing_default)?; .ok_or_else(Self::missing_default)?;
let mut file_types: HashMap<Arc<str>, GlobSet> = HashMap::default(); let mut file_types: HashMap<Arc<str>, GlobSet> = HashMap::default();
@ -1032,7 +1033,7 @@ impl settings::Settings for AllLanguageSettings {
.as_ref() .as_ref()
.and_then(|f| f.disabled_globs.as_ref()) .and_then(|f| f.disabled_globs.as_ref())
{ {
completion_globs = globs; completion_globs.extend(globs.iter());
} }
// A user's global settings override the default global settings and // A user's global settings override the default global settings and