zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-19 18:41:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert unnecessary style changes

Browse Source
This commit is contained in:
Kirill Bulatov 2023-10-12 16:15:42 +03:00
parent 09ef3ccf67
commit 7aea95704e
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/fs/src/fs.rs
View File

@ -229,12 +229,11 @@ impl Fs for RealFs {
} else { } else {
symlink_metadata symlink_metadata
}; };
let file_type_metadata = metadata.file_type();
Ok(Some(Metadata { Ok(Some(Metadata {
inode: metadata.ino(), inode: metadata.ino(),
mtime: metadata.modified().unwrap(), mtime: metadata.modified().unwrap(),
is_symlink, is_symlink,
is_dir: file_type_metadata.is_dir(), is_dir: metadata.file_type().is_dir(),
})) }))
} }

4
crates/language/src/buffer.rs
View File

@ -317,8 +317,8 @@ pub struct Chunk<'a> {
pub struct Diff { pub struct Diff {
pub(crate) base_version: clock::Global, pub(crate) base_version: clock::Global,
pub(crate) line_ending: LineEnding, line_ending: LineEnding,
pub(crate) edits: Vec<(Range<usize>, Arc<str>)>, edits: Vec<(Range<usize>, Arc<str>)>,
} }
#[derive(Clone, Copy)] #[derive(Clone, Copy)]

2
crates/rpc/proto/zed.proto
View File

@ -170,7 +170,7 @@ message Envelope {
LinkChannel link_channel = 140; LinkChannel link_channel = 140;
UnlinkChannel unlink_channel = 141; UnlinkChannel unlink_channel = 141;
MoveChannel move_channel = 142; // Current max: 144 MoveChannel move_channel = 142; // current max: 144
} }
} }

4
crates/rpc/src/proto.rs
View File

@ -349,7 +349,7 @@ request_messages!(
(UpdateProject, Ack), (UpdateProject, Ack),
(UpdateWorktree, Ack), (UpdateWorktree, Ack),
(JoinChannelBuffer, JoinChannelBufferResponse), (JoinChannelBuffer, JoinChannelBufferResponse),
(LeaveChannelBuffer, Ack), (LeaveChannelBuffer, Ack)
); );
entity_messages!( entity_messages!(
@ -400,7 +400,7 @@ entity_messages!(
UpdateProjectCollaborator, UpdateProjectCollaborator,
UpdateWorktree, UpdateWorktree,
UpdateWorktreeSettings, UpdateWorktreeSettings,
UpdateDiffBase, UpdateDiffBase
); );
entity_messages!( entity_messages!(

1
crates/zed/src/languages/php.rs
View File

@ -100,7 +100,6 @@ impl LspAdapter for IntelephenseLspAdapter {
async fn initialization_options(&self) -> Option<serde_json::Value> { async fn initialization_options(&self) -> Option<serde_json::Value> {
None None
} }
async fn language_ids(&self) -> HashMap<String, String> { async fn language_ids(&self) -> HashMap<String, String> {
HashMap::from_iter([("PHP".into(), "php".into())]) HashMap::from_iter([("PHP".into(), "php".into())])
} }