clippy lint

Author: joshuadavidthomas

crates/djls-server/src/documents.rs

@@ -23,23 +23,21 @@ impl Store {
     pub fn handle_did_open(
         &mut self,
         db: &dyn Database,
-        params: DidOpenTextDocumentParams,
-    ) -> Result<()> {
+        params: &DidOpenTextDocumentParams,
+    ) {
         let uri = params.text_document.uri.to_string();
         let version = params.text_document.version;
 
-        let document = TextDocument::from_did_open_params(db, &params);
+        let document = TextDocument::from_did_open_params(db, params);
 
         self.add_document(document, uri.clone());
         self.versions.insert(uri, version);
-
-        Ok(())
     }
 
     pub fn handle_did_change(
         &mut self,
         db: &dyn Database,
-        params: DidChangeTextDocumentParams,
+        params: &DidChangeTextDocumentParams,
     ) -> Result<()> {
         let uri = params.text_document.uri.as_str().to_string();
         let version = params.text_document.version;
@@ -56,10 +54,8 @@ impl Store {
         Ok(())
     }
 
-    pub fn handle_did_close(&mut self, params: DidCloseTextDocumentParams) -> Result<()> {
+    pub fn handle_did_close(&mut self, params: &DidCloseTextDocumentParams) {
         self.remove_document(params.text_document.uri.as_str());
-
-        Ok(())
     }
 
     fn add_document(&mut self, document: TextDocument, uri: String) {
@@ -173,7 +169,7 @@ pub struct TextDocument {
 impl TextDocument {
     pub fn from_did_open_params(db: &dyn Database, params: &DidOpenTextDocumentParams) -> Self {
         let uri = params.text_document.uri.to_string();
-        let contents = params.text_document.text.clone();
+        let contents = params.text_document.text.clone(); // Need to clone here since we don't own params
         let version = params.text_document.version;
         let language_id = LanguageId::from(params.text_document.language_id.as_str());
 
@@ -182,7 +178,7 @@ impl TextDocument {
     }
 
     pub fn with_changes(
-        &self,
+        self,
         db: &dyn Database,
         changes: &[TextDocumentContentChangeEvent],
         new_version: i32,
@@ -209,7 +205,7 @@ impl TextDocument {
                 }
             } else {
                 // Full document update
-                new_contents = change.text.clone();
+                new_contents.clone_from(&change.text);
             }
         }
 
@@ -225,20 +221,20 @@ impl TextDocument {
     }
 
     #[allow(dead_code)]
-    pub fn get_text(&self, db: &dyn Database) -> String {
+    pub fn get_text(self, db: &dyn Database) -> String {
         self.contents(db).to_string()
     }
 
     #[allow(dead_code)]
-    pub fn get_text_range(&self, db: &dyn Database, range: Range) -> Option<String> {
+    pub fn get_text_range(self, db: &dyn Database, range: Range) -> Option<String> {
         let index = self.index(db);
         let start = index.offset(range.start)? as usize;
         let end = index.offset(range.end)? as usize;
         let contents = self.contents(db);
         Some(contents[start..end].to_string())
     }
 
-    pub fn get_line(&self, db: &dyn Database, line: u32) -> Option<String> {
+    pub fn get_line(self, db: &dyn Database, line: u32) -> Option<String> {
         let index = self.index(db);
         let start = index.line_starts.get(line as usize)?;
         let end = index
@@ -252,12 +248,12 @@ impl TextDocument {
     }
 
     #[allow(dead_code)]
-    pub fn line_count(&self, db: &dyn Database) -> usize {
+    pub fn line_count(self, db: &dyn Database) -> usize {
         self.index(db).line_starts.len()
     }
 
     pub fn get_template_tag_context(
-        &self,
+        self,
         db: &dyn Database,
         position: Position,
     ) -> Option<TemplateTagContext> {
@@ -300,7 +296,7 @@ impl LineIndex {
         let mut pos = 0;
 
         for c in text.chars() {
-            pos += c.len_utf8() as u32;
+            pos += u32::try_from(c.len_utf8()).unwrap_or(0);
             if c == '\n' {
                 line_starts.push(pos);
             }
@@ -328,7 +324,7 @@ impl LineIndex {
         let line_start = self.line_starts[line];
         let character = offset - line_start;
 
-        Position::new(line as u32, character)
+        Position::new(u32::try_from(line).unwrap_or(0), character)
     }
 }
 

crates/djls-server/src/server.rs

@@ -86,6 +86,7 @@ impl LanguageServer for DjangoLanguageServer {
         })
     }
 
+    #[allow(clippy::too_many_lines)]
     async fn initialized(&self, _params: InitializedParams) {
         self.client
             .log_message(
@@ -240,16 +241,11 @@ impl LanguageServer for DjangoLanguageServer {
             )
             .await;
 
-        let result = self
-            .with_session_mut(|session| {
+        self.with_session_mut(|session| {
                 let db = session.db_handle().db();
-                session.documents_mut().handle_did_open(&db, params.clone())
+                session.documents_mut().handle_did_open(&db, &params);
             })
             .await;
-
-        if let Err(e) = result {
-            eprintln!("Error handling document open: {e}");
-        }
     }
 
     async fn did_change(&self, params: DidChangeTextDocumentParams) {
@@ -260,18 +256,13 @@ impl LanguageServer for DjangoLanguageServer {
             )
             .await;
 
-        let result = self
-            .with_session_mut(|session| {
+        self.with_session_mut(|session| {
                 let db = session.db_handle().db();
-                session
+                let _ = session
                     .documents_mut()
-                    .handle_did_change(&db, params.clone())
+                    .handle_did_change(&db, &params);
             })
             .await;
-
-        if let Err(e) = result {
-            eprintln!("Error handling document change: {e}");
-        }
     }
 
     async fn did_close(&self, params: DidCloseTextDocumentParams) {
@@ -282,13 +273,10 @@ impl LanguageServer for DjangoLanguageServer {
             )
             .await;
 
-        let result = self
-            .with_session_mut(|session| session.documents_mut().handle_did_close(params.clone()))
+        self.with_session_mut(|session| {
+                session.documents_mut().handle_did_close(&params);
+            })
             .await;
-
-        if let Err(e) = result {
-            eprintln!("Error handling document close: {e}");
-        }
     }
 
     async fn completion(&self, params: CompletionParams) -> LspResult<Option<CompletionResponse>> {

crates/djls-server/src/session.rs

@@ -25,8 +25,8 @@ impl Session {
         }
     }
 
-    pub fn client_capabilities(&self) -> &Option<ClientCapabilities> {
-        &self.client_capabilities
+    pub fn client_capabilities(&self) -> Option<&ClientCapabilities> {
+        self.client_capabilities.as_ref()
     }
 
     pub fn client_capabilities_mut(&mut self) -> &mut Option<ClientCapabilities> {