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

Merge pull request #2002 from zed-industries/appease-clippy

Browse source 
Appease clippy
This commit is contained in:
Joseph T. Lyons 2023-01-04 16:33:29 -05:00 • committed by GitHub
commit bd223f5a1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 49 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/zed/src/languages/ruby.rs
View file

@ -50,14 +50,14 @@ impl LspAdapter for RubyLanguageServer {
grammar.highlight_id_for_name("type")?
}
lsp::CompletionItemKind::KEYWORD => {
if label.starts_with(":") {
if label.starts_with(':') {
grammar.highlight_id_for_name("string.special.symbol")?
} else {
grammar.highlight_id_for_name("keyword")?
}
}
lsp::CompletionItemKind::VARIABLE => {
if label.starts_with("@") {
if label.starts_with('@') {
grammar.highlight_id_for_name("property")?
} else {
return None;

4
crates/zed/src/main.rs
View file

@ -101,7 +101,7 @@ fn main() {
//Setup settings global before binding actions
cx.set_global(SettingsFile::new(
&*paths::SETTINGS,
&paths::SETTINGS,
settings_file_content.clone(),
fs.clone(),
));
@ -586,7 +586,7 @@ async fn handle_cli_connection(
responses
.send(CliResponse::Exit {
status: if errored { 1 } else { 0 },
status: i32::from(errored),
})
.log_err();
}

6
crates/zed/src/zed.rs
View file

@ -338,11 +338,11 @@ pub fn initialize_workspace(
},
"schemas": [
{
"fileMatch": [schema_file_match(&*paths::SETTINGS)],
"fileMatch": [schema_file_match(&paths::SETTINGS)],
"schema": settings_file_json_schema(theme_names, language_names),
},
{
"fileMatch": [schema_file_match(&*paths::KEYMAP)],
"fileMatch": [schema_file_match(&paths::KEYMAP)],
"schema": keymap_file_json_schema(&action_names),
}
]
@ -646,7 +646,7 @@ fn open_bundled_config_file(
cx: &mut ViewContext<Workspace>,
) {
workspace
.with_local_workspace(&app_state.clone(), cx, |workspace, cx| {
.with_local_workspace(&app_state, cx, |workspace, cx| {
let project = workspace.project().clone();
let buffer = project.update(cx, |project, cx| {
let text = Assets::get(asset_path).unwrap().data;