LS activate events

dfgordon · dfgordon · commit ed4f0dfbaf44 · 2026-01-11T17:22:23.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.1.1] - 2026-01-11
+
+### Fixes
+
+* BASIC servers respond to window activation event
+* Integer BASIC line reference hovers trigger on the number itself
+
 ## [4.1.0] - 2026-01-10
 
 ### Fixes
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "a2kit"
-version = "4.1.0"
+version = "4.1.1"
 edition = "2024"
 readme = "README.md"
 license = "MIT"
diff --git a/src/bin/server-applesoft/request.rs b/src/bin/server-applesoft/request.rs
@@ -7,7 +7,7 @@ use serde_json;
 use std::collections::HashMap;
 use std::sync::Arc;
 use a2kit::lang::server::{send_edit_req,Checkpoint,Tokens};
-use a2kit::lang::disk_server;
+use a2kit::lang::{disk_server,normalize_client_uri_str};
 use a2kit::lang::applesoft;
 use super::logger;
 use super::rpc_error::PARSE_ERROR;
@@ -83,6 +83,22 @@ pub fn handle_request(
         lsp::request::ExecuteCommand::METHOD => {
             if let Ok(params) = serde_json::from_value::<lsp::ExecuteCommandParams>(req.params) {
                 match params.command.as_str() {
+                    "applesoft.activeEditorChanged" => {
+                        if params.arguments.len()==1 {
+                            let uri_res = serde_json::from_value::<String>(params.arguments[0].clone());
+                            if let Ok(uri) = uri_res {
+                                let normalized_uri = normalize_client_uri_str(&uri).expect("could not parse URI");
+                                if let Some(chk) = tools.doc_chkpts.get(&normalized_uri.to_string()) {
+                                    let handle = crate::launch_analysis_thread(
+                                        Arc::clone(&tools.analyzer),
+                                        chk.get_doc()
+                                    );
+                                    tools.thread_handles.push_back(handle);
+                                }
+                                resp = lsp_server::Response::new_ok(req.id,serde_json::Value::Null);
+                            }
+                        }
+                    },
                     "applesoft.semantic.tokens" => {
                         if params.arguments.len()==1 {
                             if let Ok(program) = serde_json::from_value::<String>(params.arguments[0].clone()) {
diff --git a/src/bin/server-integerbasic/request.rs b/src/bin/server-integerbasic/request.rs
@@ -6,7 +6,7 @@ use lsp_server::{Connection,RequestId,Response};
 use serde_json;
 use std::collections::HashMap;
 use a2kit::lang::server::{send_edit_req,Checkpoint,Tokens};
-use a2kit::lang::disk_server;
+use a2kit::lang::{disk_server,normalize_client_uri_str};
 use a2kit::lang::integer;
 use super::logger;
 use super::rpc_error::PARSE_ERROR;
@@ -83,6 +83,22 @@ pub fn handle_request(
         lsp::request::ExecuteCommand::METHOD => {
             if let Ok(params) = serde_json::from_value::<lsp::ExecuteCommandParams>(req.params) {
                 match params.command.as_str() {
+                    "integerbasic.activeEditorChanged" => {
+                        if params.arguments.len()==1 {
+                            let uri_res = serde_json::from_value::<String>(params.arguments[0].clone());
+                            if let Ok(uri) = uri_res {
+                                let normalized_uri = normalize_client_uri_str(&uri).expect("could not parse URI");
+                                if let Some(chk) = tools.doc_chkpts.get(&normalized_uri.to_string()) {
+                                    let handle = crate::launch_analysis_thread(
+                                        Arc::clone(&tools.analyzer),
+                                        chk.get_doc()
+                                    );
+                                    tools.thread_handles.push_back(handle);
+                                }
+                                resp = lsp_server::Response::new_ok(req.id,serde_json::Value::Null);
+                            }
+                        }
+                    },
                     "integerbasic.semantic.tokens" => {
                         if params.arguments.len()==1 {
                             if let Ok(program) = serde_json::from_value::<String>(params.arguments[0].clone()) {
diff --git a/src/cli.rs b/src/cli.rs
@@ -76,14 +76,17 @@ Set RUST_LOG environment variable to control logging level.
 
 Examples:
 ---------
+smart copy:            `a2kit cp myimg.woz/program ./program.bas`
 create DOS image:      `a2kit mkdsk -o dos33 -v 254 -t woz2 -d myimg.woz`
 create ProDOS image:   `a2kit mkdsk -o prodos -v disk.new -t woz2 -d myimg.woz`
-Language line entry:   `a2kit verify -t atxt`
-Language file check:   `a2kit get -f myprog.bas | a2kit verify -t atxt`
-Tokenize to file:      `a2kit get -f prog.bas | a2kit tokenize -a 2049 -t atxt > prog.atok
-Tokenize to image:     `a2kit get -f prog.bas | a2kit tokenize -a 2049 -t atxt \\
+language line entry:   `a2kit verify -t atxt`
+language file check:   `a2kit get -f myprog.bas | a2kit verify -t atxt`
+detokenize from image: `a2kit get -f prog -t atok -d myimg.dsk | a2kit detokenize -t atok
+tokenize to file:      `a2kit get -f prog.bas | a2kit tokenize -a 2049 -t atxt > prog.atok
+tokenize to image:     `a2kit get -f prog.bas | a2kit tokenize -a 2049 -t atxt \\
                            | a2kit put -f prog -t atok -d myimg.dsk`
-Detokenize from image: `a2kit get -f prog -t atok -d myimg.dsk | a2kit detokenize -t atok";
+    ...or smart copy:  `a2kit cp -a 2049 prog.bas myimg.dsk";
+
     let img_types = [
         "d13", "do", "po", "woz1", "woz2", "imd", "img", "2mg", "nib", "td0",
     ];
@@ -151,8 +154,14 @@ Detokenize from image: `a2kit get -f prog -t atok -d myimg.dsk | a2kit detokeniz
 
     main_cmd = main_cmd.subcommand(
         Command::new("cp")
-            .arg(Arg::new("paths").num_args(2..=1000).help("sequence of paths, last path is the destination").value_name("PATHS").required(true))
-            .arg(Arg::new("addr").long("addr").short('a').help("load-address if applicable").value_name("ADDRESS").required(false))
+            .arg(Arg::new("paths").num_args(2..=1000).help("sequence of paths, last path is the destination").value_name("PATHS").required(true)
+                .long_help("Paths inside the disk image always use the forward slash.
+It is OK to have a mixture such as `c:\\path\\to\\disk.img/path/to/file`.
+Recursive glob patterns like `disk.img/**` will expand correctly,
+but the files will all go to the same target directory."))
+            .arg(Arg::new("addr").long("addr").short('a').help("load-address if applicable").value_name("ADDRESS").required(false)
+                .long_help("Specify the load address that is stored with some Apple file types.
+This is only needed for host-to-image copies involving Apple file systems"))
             .arg(pro_arg())
             .arg(method_arg())
             .about("smart copy that formats for the target")
diff --git a/src/lang/integer/hovers/mod.rs b/src/lang/integer/hovers/mod.rs
@@ -98,14 +98,16 @@ impl Navigate for HoverProvider {
                 }
             }
 
-            if ["statement_goto", "statement_gosub", "statement_then_line"].contains(&curs.node().kind()) {
-                if let Some(next) = curs.node().next_named_sibling() {
-                    if let Some(num) = node_integer(&next,&self.line) {
-                        if let Some(docstring) = self.symbols.docstring(num) {
-                            if self.markup.value.len() > 0 {
-                                self.markup.value += "\n\n---\n\n";
+            if curs.node().kind() == "integer" {
+                if let Some(prev) = curs.node().prev_named_sibling() {
+                    if ["statement_goto", "statement_gosub", "statement_then_line"].contains(&prev.kind()) {
+                        if let Some(num) = node_integer(&curs.node(),&self.line) {
+                            if let Some(docstring) = self.symbols.docstring(num) {
+                                if self.markup.value.len() > 0 {
+                                    self.markup.value += "\n\n---\n\n";
+                                }
+                                self.markup.value += &docstring.to_string();
                             }
-                            self.markup.value += &docstring.to_string();
                         }
                     }
                 }
diff --git a/src/lang/merlin/assembly.rs b/src/lang/merlin/assembly.rs
@@ -260,7 +260,6 @@ pub fn eval_conditional(start_node: &tree_sitter::Node, source: &str, pc: Option
                 if let Some(grandchild) = child.child(0) {
                     if grandchild.kind() == "var_mac" || (grandchild.kind() == "var_cnt" && symbols.assembler != MerlinVersion::Merlin8) {
                         // induce a deferred evalution
-                        // TODO: the parser has to be changed to produce var_cnt
                         return Err(Box::new(Error::ExpressionEvaluation));
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -98,14 +98,16 @@ impl Navigate for HoverProvider {`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`
`101`		`- if ["statement_goto", "statement_gosub", "statement_then_line"].contains(&curs.node().kind()) {`
`102`		`- if let Some(next) = curs.node().next_named_sibling() {`
`103`		`- if let Some(num) = node_integer(&next,&self.line) {`
`104`		`- if let Some(docstring) = self.symbols.docstring(num) {`
`105`		`- if self.markup.value.len() > 0 {`
`106`		`- self.markup.value += "\n\n---\n\n";`
	`101`	`+ if curs.node().kind() == "integer" {`
	`102`	`+ if let Some(prev) = curs.node().prev_named_sibling() {`
	`103`	`+ if ["statement_goto", "statement_gosub", "statement_then_line"].contains(&prev.kind()) {`
	`104`	`+ if let Some(num) = node_integer(&curs.node(),&self.line) {`
	`105`	`+ if let Some(docstring) = self.symbols.docstring(num) {`
	`106`	`+ if self.markup.value.len() > 0 {`
	`107`	`+ self.markup.value += "\n\n---\n\n";`
	`108`	`+ }`
	`109`	`+ self.markup.value += &docstring.to_string();`
`107`	`110`	`}`
`108`		`- self.markup.value += &docstring.to_string();`
`109`	`111`	`}`
`110`	`112`	`}`
`111`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,6 @@ pub fn eval_conditional(start_node: &tree_sitter::Node, source: &str, pc: Option`
`260`	`260`	`if let Some(grandchild) = child.child(0) {`
`261`	`261`	`if grandchild.kind() == "var_mac" \|\| (grandchild.kind() == "var_cnt" && symbols.assembler != MerlinVersion::Merlin8) {`
`262`	`262`	`// induce a deferred evalution`
`263`		`- // TODO: the parser has to be changed to produce var_cnt`
`264`	`263`	`return Err(Box::new(Error::ExpressionEvaluation));`
`265`	`264`	`}`
`266`	`265`	`}`