Added clap and fixed off-by-one error

Author: elijah-potter

Cargo.lock

@@ -23,11 +23,18 @@ impl Document {
         let tokens = lex_to_end(&source);
 
         let mut doc = Self { source, tokens };
-        doc.match_quotes();
+        doc.parse();
 
         doc
     }
 
+    /// Re-parse important language constructs.
+    ///
+    /// Should be run after every change to the underlying [`Self::source`].
+    fn parse(&mut self) {
+        self.match_quotes();
+    }
+
     pub fn iter_quote_indices(&self) -> impl Iterator<Item = usize> + '_ {
         self.tokens.iter().enumerate().filter_map(|(idx, token)| {
             if let TokenKind::Punctuation(Punctuation::Quote(_)) = &token.kind {
@@ -145,6 +152,8 @@ impl Document {
                 }
             }
         }
+
+        self.parse();
     }
 }
 

harper-core/src/document.rs

@@ -13,3 +13,4 @@ serde_json = "1.0.111"
 tracing = "0.1.40"
 tracing-subscriber = "0.3.18"
 harper-core = { path = "../harper-core" }
+clap = { version = "4.4.18", features = ["derive"] }

harper-ls/Cargo.toml

@@ -2,7 +2,7 @@ use harper_core::{all_linters, Dictionary, Document, Lint, Span};
 use lsp_types::{Diagnostic, Position, Range, Url};
 use std::fs::read;
 
-pub fn generate_diagnostics(file_uri: Url) -> anyhow::Result<Vec<Diagnostic>> {
+pub fn generate_diagnostics(file_uri: &Url) -> anyhow::Result<Vec<Diagnostic>> {
     let file = read(file_uri.path())?;
     let file_str = String::from_utf8(file)?;
 
@@ -52,7 +52,7 @@ fn index_to_position(source: &[char], index: usize) -> Position {
         .collect();
 
     let lines = newline_indices.len();
-    let cols = index - newline_indices.last().copied().unwrap_or(0);
+    let cols = index - newline_indices.last().copied().unwrap_or(1) - 1;
 
     Position {
         line: lines as u32,

harper-ls/src/generate_diagnostics.rs

@@ -1,19 +1,32 @@
 mod generate_diagnostics;
 mod server;
-
+use clap::Parser;
 use lsp_server::Connection;
 use tracing::Level;
 
 use crate::server::Server;
 
+#[derive(Debug, Parser)]
+struct Args {
+    #[arg(short, long, default_value_t = false)]
+    stdio: bool,
+}
+
 fn main() -> anyhow::Result<()> {
-    let subscriber = tracing_subscriber::FmtSubscriber::builder()
-        .with_max_level(Level::DEBUG)
-        .finish();
+    let args = Args::parse();
+
+    let (connection, io_threads) = if !args.stdio {
+        let subscriber = tracing_subscriber::FmtSubscriber::builder()
+            .with_max_level(Level::DEBUG)
+            .finish();
+
+        tracing::subscriber::set_global_default(subscriber)?;
 
-    tracing::subscriber::set_global_default(subscriber)?;
+        Connection::listen("127.0.0.1:4000")?
+    } else {
+        Connection::stdio()
+    };
 
-    let (connection, io_threads) = Connection::stdio();
     let mut server = Server::new(connection, io_threads)?;
     server.main_loop()?;
     server.join()?;

harper-ls/src/main.rs

@@ -1,15 +1,15 @@
-use anyhow::Ok;
 use lsp_server::{
     Connection, ExtractError, IoThreads, Message, Notification, Request, RequestId, Response,
 };
 use lsp_types::{
     notification::{
-        DidOpenTextDocument, DidSaveTextDocument, Notification as NotificationTrait,
-        PublishDiagnostics,
+        DidChangeTextDocument, DidOpenTextDocument, DidSaveTextDocument,
+        Notification as NotificationTrait, PublishDiagnostics,
     },
     request::GotoDefinition,
-    Diagnostic, DiagnosticOptions, GotoDefinitionResponse, InitializedParams, Location, Position,
-    PublishDiagnosticsParams, Range, ServerCapabilities,
+    CodeActionProviderCapability, Diagnostic, DiagnosticOptions, GotoDefinitionResponse,
+    InitializedParams, Location, Position, PublishDiagnosticsParams, Range, ServerCapabilities,
+    Url,
 };
 use tracing::{error, info};
 
@@ -30,6 +30,7 @@ impl Server {
             diagnostic_provider: Some(lsp_types::DiagnosticServerCapabilities::Options(
                 DiagnosticOptions::default(),
             )),
+            code_action_provider: Some(CodeActionProviderCapability::Simple(true)),
             ..Default::default()
         })
         .unwrap();
@@ -90,21 +91,27 @@ impl Server {
         Ok(self.io_threads.join()?)
     }
 
+    fn handle_save(&self, notif: &Notification) -> anyhow::Result<()> {
+        let params = cast_notif::<DidSaveTextDocument>(notif.clone())?;
+
+        self.publish_diagnostics(&params.text_document.uri)?;
+
+        Ok(())
+    }
+
     fn handle_open(&self, req: &Notification) -> anyhow::Result<()> {
         let params = cast_notif::<DidOpenTextDocument>(req.clone())?;
 
-        dbg!(params);
+        self.publish_diagnostics(&params.text_document.uri)?;
 
         Ok(())
     }
 
-    fn handle_save(&self, req: &Notification) -> anyhow::Result<()> {
-        let params = cast_notif::<DidSaveTextDocument>(req.clone())?;
-
-        let diagnostics = generate_diagnostics(params.text_document.uri.clone())?;
+    fn publish_diagnostics(&self, uri: &Url) -> anyhow::Result<()> {
+        let diagnostics = generate_diagnostics(uri)?;
 
         let result = PublishDiagnosticsParams {
-            uri: params.text_document.uri,
+            uri: uri.clone(),
             diagnostics,
             version: None,
         };
@@ -137,7 +144,7 @@ impl Server {
                 },
             },
         }]));
-        let result = serde_json::to_value(&result).unwrap();
+        let result = serde_json::to_value(result).unwrap();
         let resp = Response {
             id,
             result: Some(result),