josh/django-language-server
1
0
Fork 0
mirror of https://github.com/joshuadavidthomas/django-language-server.git synced 2025-09-12 05:16:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

remove unnecessary result

Browse source
This commit is contained in:
Josh Thomas 2025-08-19 23:10:36 -05:00
parent 8213e80ac6
commit 95f3caff4f
1 changed files with 2 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

27
crates/djls-server/src/workspace/fs.rs
View file

@ -61,11 +61,11 @@ impl FileSystem {
/// ```rust,ignore /// ```rust,ignore
/// let fs = FileSystem::new("/path/to/django/project")?; /// let fs = FileSystem::new("/path/to/django/project")?;
/// ``` /// ```
pub fn new<P: AsRef<Path>>(root_path: P) -> VfsResult<Self> { pub fn new<P: AsRef<Path>>(root_path: P) -> Self {
let memory = VfsPath::new(MemoryFS::new()); let memory = VfsPath::new(MemoryFS::new());
let physical = VfsPath::new(PhysicalFS::new(root_path.as_ref())); let physical = VfsPath::new(PhysicalFS::new(root_path.as_ref()));
Ok(FileSystem { memory, physical }) FileSystem { memory, physical }
} }
/// Reads file content as a UTF-8 string, prioritizing unsaved editor changes. /// Reads file content as a UTF-8 string, prioritizing unsaved editor changes.
@ -127,7 +127,6 @@ impl FileSystem {
pub fn write_string(&self, path: &str, content: &str) -> VfsResult<()> { pub fn write_string(&self, path: &str, content: &str) -> VfsResult<()> {
let memory_path = self.memory.join(path)?; let memory_path = self.memory.join(path)?;
// Ensure parent directories exist in memory layer
let parent = memory_path.parent(); let parent = memory_path.parent();
if !parent.is_root() && !parent.exists().unwrap_or(false) { if !parent.is_root() && !parent.exists().unwrap_or(false) {
parent.create_dir_all()?; parent.create_dir_all()?;
@ -167,8 +166,6 @@ impl FileSystem {
Ok(()) Ok(())
} }
} }
/// Implementation of the `vfs::FileSystem` trait for VfsPath compatibility. /// Implementation of the `vfs::FileSystem` trait for VfsPath compatibility.
@ -189,7 +186,6 @@ impl vfs::FileSystem for FileSystem {
// Collect entries from both layers and merge them // Collect entries from both layers and merge them
let mut entries = BTreeSet::new(); let mut entries = BTreeSet::new();
// Add memory layer entries
let memory_path = self.memory.join(path)?; let memory_path = self.memory.join(path)?;
if memory_path.exists().unwrap_or(false) { if memory_path.exists().unwrap_or(false) {
for entry in memory_path.read_dir()? { for entry in memory_path.read_dir()? {
@ -197,7 +193,6 @@ impl vfs::FileSystem for FileSystem {
} }
} }
// Add physical layer entries
let physical_path = self.physical.join(path)?; let physical_path = self.physical.join(path)?;
if physical_path.exists().unwrap_or(false) { if physical_path.exists().unwrap_or(false) {
for entry in physical_path.read_dir()? { for entry in physical_path.read_dir()? {
@ -205,18 +200,15 @@ impl vfs::FileSystem for FileSystem {
} }
} }
// Return merged, deduplicated entries
Ok(Box::new(entries.into_iter())) Ok(Box::new(entries.into_iter()))
} }
fn create_dir(&self, path: &str) -> VfsResult<()> { fn create_dir(&self, path: &str) -> VfsResult<()> {
// Create directory in memory layer only
let memory_path = self.memory.join(path)?; let memory_path = self.memory.join(path)?;
memory_path.create_dir() memory_path.create_dir()
} }
fn open_file(&self, path: &str) -> VfsResult<Box<dyn SeekAndRead + Send>> { fn open_file(&self, path: &str) -> VfsResult<Box<dyn SeekAndRead + Send>> {
// Check memory layer first, then physical
let memory_path = self.memory.join(path)?; let memory_path = self.memory.join(path)?;
if memory_path.exists().unwrap_or(false) { if memory_path.exists().unwrap_or(false) {
return memory_path.open_file(); return memory_path.open_file();
@ -227,10 +219,8 @@ impl vfs::FileSystem for FileSystem {
} }
fn create_file(&self, path: &str) -> VfsResult<Box<dyn SeekAndWrite + Send>> { fn create_file(&self, path: &str) -> VfsResult<Box<dyn SeekAndWrite + Send>> {
// Create file in memory layer only
let memory_path = self.memory.join(path)?; let memory_path = self.memory.join(path)?;
// Ensure parent directories exist in memory layer
let parent = memory_path.parent(); let parent = memory_path.parent();
if !parent.is_root() && !parent.exists().unwrap_or(false) { if !parent.is_root() && !parent.exists().unwrap_or(false) {
parent.create_dir_all()?; parent.create_dir_all()?;
@ -256,7 +246,6 @@ impl vfs::FileSystem for FileSystem {
} }
fn metadata(&self, path: &str) -> VfsResult<VfsMetadata> { fn metadata(&self, path: &str) -> VfsResult<VfsMetadata> {
// Check memory layer first, then physical
let memory_path = self.memory.join(path)?; let memory_path = self.memory.join(path)?;
if memory_path.exists().unwrap_or(false) { if memory_path.exists().unwrap_or(false) {
return memory_path.metadata(); return memory_path.metadata();
@ -267,7 +256,6 @@ impl vfs::FileSystem for FileSystem {
} }
fn exists(&self, path: &str) -> VfsResult<bool> { fn exists(&self, path: &str) -> VfsResult<bool> {
// Check memory layer first, then physical layer
let memory_path = self.memory.join(path)?; let memory_path = self.memory.join(path)?;
if memory_path.exists().unwrap_or(false) { if memory_path.exists().unwrap_or(false) {
return Ok(true); return Ok(true);
@ -278,7 +266,6 @@ impl vfs::FileSystem for FileSystem {
} }
fn remove_file(&self, path: &str) -> VfsResult<()> { fn remove_file(&self, path: &str) -> VfsResult<()> {
// Only remove from memory layer - this aligns with our LSP semantics
let memory_path = self.memory.join(path)?; let memory_path = self.memory.join(path)?;
if memory_path.exists().unwrap_or(false) { if memory_path.exists().unwrap_or(false) {
memory_path.remove_file()?; memory_path.remove_file()?;
@ -287,7 +274,6 @@ impl vfs::FileSystem for FileSystem {
} }
fn remove_dir(&self, path: &str) -> VfsResult<()> { fn remove_dir(&self, path: &str) -> VfsResult<()> {
// Only remove from memory layer - this aligns with our LSP semantics
let memory_path = self.memory.join(path)?; let memory_path = self.memory.join(path)?;
if memory_path.exists().unwrap_or(false) { if memory_path.exists().unwrap_or(false) {
memory_path.remove_dir()?; memory_path.remove_dir()?;
@ -303,15 +289,6 @@ mod tests {
use tempfile::TempDir; use tempfile::TempDir;
use vfs::FileSystem as VfsFileSystem; use vfs::FileSystem as VfsFileSystem;
#[test]
fn test_new_vfs() {
let temp_dir = TempDir::new().unwrap();
let _vfs = FileSystem::new(temp_dir.path()).unwrap();
// FileSystem should be created successfully
// (removed testing of internal-exposing methods)
}
#[test] #[test]
fn test_read_physical_file() { fn test_read_physical_file() {
let temp_dir = TempDir::new().unwrap(); let temp_dir = TempDir::new().unwrap();