diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index c598a2d..9c4c7b6 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -88,13 +88,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: result-${{ matrix.TARGET }} - path: ./artifacts - merge: - runs-on: ubuntu-latest - needs: build - steps: - - name: Merge Artifacts - uses: actions/upload-artifact/merge@v4 - with: - name: result - pattern: result-* \ No newline at end of file + path: ./artifacts \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 77e6669..47a0bc4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ 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). +## [3.3.1] - 2024-09-29 + +### Fixes + +* Consistent case control settings in `lang` module + ## [3.3.0] - 2024-09-21 ### New Features diff --git a/Cargo.toml b/Cargo.toml index ce52f5f..50c0e27 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "a2kit" -version = "3.3.0" +version = "3.3.1" edition = "2021" readme = "README.md" license = "MIT" diff --git a/src/lang/applesoft/completions.rs b/src/lang/applesoft/completions.rs index f68a2b4..7d5cfe0 100644 --- a/src/lang/applesoft/completions.rs +++ b/src/lang/applesoft/completions.rs @@ -217,10 +217,8 @@ impl StatementCompletionProvider { } fn modify(&self,s: &str) -> String { - if let Some(sev) = self.config.flag.case_sensitive { - if self.config.completions.lower_case && sev != lsp::DiagnosticSeverity::ERROR { - return s.to_lowercase(); - } + if self.config.flag.case_sensitive.is_none() && self.config.completions.lower_case { + return s.to_lowercase(); } return s.to_string(); } diff --git a/src/lang/applesoft/mod.rs b/src/lang/applesoft/mod.rs index 3d35194..0b1c77c 100644 --- a/src/lang/applesoft/mod.rs +++ b/src/lang/applesoft/mod.rs @@ -2,7 +2,7 @@ //! //! This module is used by both the CLI and the language server. //! The Applesoft parser is provided by `tree_sitter_applesoft`. -//! The server compiles to a separate executable, its entry point is in `src/bin/server-applesoft.rs`. +//! The server compiles to a separate executable, its entry point is in `src/bin/server-applesoft/main.rs`. mod token_maps; mod minify_guards; diff --git a/src/lang/applesoft/settings.rs b/src/lang/applesoft/settings.rs index 90c2344..1a164c1 100644 --- a/src/lang/applesoft/settings.rs +++ b/src/lang/applesoft/settings.rs @@ -91,7 +91,7 @@ pub fn parse(json: &str) -> Result { update_json_bool(val,"keywords",&mut ans.hovers.keywords); }, "completions" => { - update_json_bool(val,"lowerCaseCompletions",&mut ans.completions.lower_case); + update_json_bool(val,"lowerCase",&mut ans.completions.lower_case); update_json_bool(val,"negativeAddresses",&mut ans.completions.negative_addresses); }, "detokenizer" => { diff --git a/src/lang/integer/completions.rs b/src/lang/integer/completions.rs index 71e9738..f68e517 100644 --- a/src/lang/integer/completions.rs +++ b/src/lang/integer/completions.rs @@ -213,10 +213,8 @@ impl StatementCompletionProvider { } fn modify(&self,s: &str) -> String { - if let Some(sev) = self.config.flag.case_sensitive { - if self.config.completions.lower_case && sev != lsp::DiagnosticSeverity::ERROR { - return s.to_lowercase(); - } + if self.config.flag.case_sensitive.is_none() && self.config.completions.lower_case { + return s.to_lowercase(); } return s.to_string(); } diff --git a/src/lang/integer/mod.rs b/src/lang/integer/mod.rs index 2196f2a..7fac228 100644 --- a/src/lang/integer/mod.rs +++ b/src/lang/integer/mod.rs @@ -2,7 +2,7 @@ //! //! This module is used by both the CLI and the language server. //! The Integer BASIC parser is provided by `tree_sitter_integerbasic`. -//! The server compiles to a separate executable, its entry point is in `src/bin/server-integerbasic.rs`. +//! The server compiles to a separate executable, its entry point is in `src/bin/server-integerbasic/main.rs`. mod token_maps; #[cfg(test)] diff --git a/src/lang/integer/settings.rs b/src/lang/integer/settings.rs index 55f9630..18dbc4a 100644 --- a/src/lang/integer/settings.rs +++ b/src/lang/integer/settings.rs @@ -94,7 +94,7 @@ pub fn parse(json: &str) -> Result { update_json_bool(val,"keywords",&mut ans.hovers.keywords); }, "completions" => { - update_json_bool(val,"lowerCaseCompletions",&mut ans.completions.lower_case); + update_json_bool(val,"lowerCase",&mut ans.completions.lower_case); }, "detokenizer" => { update_json_i64(val, "maxLineLength", &mut ans.detokenizer.max_line_length); diff --git a/src/lang/merlin/completions.rs b/src/lang/merlin/completions.rs index 29beb3e..21823e0 100644 --- a/src/lang/merlin/completions.rs +++ b/src/lang/merlin/completions.rs @@ -175,10 +175,8 @@ impl CodeCompletionProvider { self.symbols = sym; } fn modify(&self,s: &str,padreq: usize) -> String { - if let Some(sev) = self.config.flag.case_sensitive { - if self.config.completions.lower_case && sev != lsp::DiagnosticSeverity::ERROR { - return [" ".repeat(padreq), s.to_lowercase()].concat(); - } + if self.config.flag.case_sensitive.is_none() && self.config.completions.lower_case { + return [" ".repeat(padreq), s.to_lowercase()].concat(); } return [" ".repeat(padreq), s.to_uppercase()].concat(); } diff --git a/src/lang/merlin/mod.rs b/src/lang/merlin/mod.rs index 8fa8301..915abbc 100644 --- a/src/lang/merlin/mod.rs +++ b/src/lang/merlin/mod.rs @@ -3,7 +3,7 @@ //! This module is used by both the CLI and the language server. //! The Merlin parser is provided by `tree_sitter_merlin6502`. Every file will be parsed as Merlin 16+, //! other Merlin versions are handled via diagnostic filters. -//! The server compiles to a separate executable, its entry point is in `src/bin/server-merlin.rs`. +//! The server compiles to a separate executable, its entry point is in `src/bin/server-merlin/main.rs`. //! //! The analyzer performs functions that begin to resemble assembly, such as resolving //! file relationships and identifying symbols. There is a spot assembler that is used to aid in