Update ci

Author: blopker

.github/workflows/ci.yml

@@ -91,6 +91,8 @@ jobs:
           path: ${{ matrix.platform.name }}
   release:
     name: Release
+    permissions:
+      contents: write
     needs:
       - build
       - test
@@ -111,5 +113,3 @@ jobs:
           generate_release_notes: true
           draft: false
           tag_name: ${{ github.ref_name }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Makefile

@@ -5,14 +5,17 @@ export RUST_LOG=info
 test:
 	cargo test
 
-build:
+build: generate_word_list
 	cd codebook-lsp && cargo build
 
-build-release:
+build-release: generate_word_list
 	cd codebook-lsp && cargo build --release
 
 integration_test: build
 	cd integration_tests && bun test
 
 install_ext: build-release
 	cp -f target/release/codebook-lsp "${HOME}/Library/Application Support/Zed/extensions/work/codebook/"
+
+generate_word_list:
+	bun run scripts/generate_combined_wordlist.ts

codebook/src/queries.rs

@@ -70,13 +70,15 @@ pub static LANGUAGE_SETTINGS: [LanguageSetting; 7] = [
         type_: LanguageType::Javascript,
         name: "javascript",
         query: r#"
-            (identifier) @identifier
-            (string) @string
             (comment) @comment
-            (template_string) @string
+            (string_fragment) @string
+            (string) @string
+            (variable_declarator
+                name: (identifier) @identifier)
             (jsx_text) @string
-            (property_identifier) @identifier
             (shorthand_property_identifier) @identifier
+            (function_declaration
+                name: (identifier) @identifier)
             (method_definition
                 name: (property_identifier) @identifier)
             (class_declaration

codebook/tests/test_files.rs

@@ -135,8 +135,6 @@ fn test_example_files() {
                 "Pleese",
                 "additshun",
                 "arra",
-                "ballance",
-                "calculater",
             ],
         ),
         (

word_lists/combined.gen.txt

@@ -301,6 +301,7 @@ ccccff
 ccx
 cd
 cdata
+cdn
 cell
 cellpadding
 cellspacing
@@ -966,6 +967,7 @@ hostname
 hover
 hr
 href
+htm
 html
 htmlelement
 http
@@ -1123,6 +1125,7 @@ jsonobject
 jsontypeinfo
 jsref
 jstree
+jsx
 juju
 jumbotron
 junit
@@ -1198,6 +1201,7 @@ linkcol
 linkedlist
 links
 lint
+linter
 list
 listener
 listeners
@@ -1238,6 +1242,7 @@ longhands
 loop
 loose
 lower
+lsp
 lt
 lucene
 ma
@@ -1781,6 +1786,7 @@ row
 rowcolor
 rows
 rowspan
+rpc
 rr
 rs
 rt
@@ -1880,6 +1886,7 @@ setup
 setvalue
 setvisible
 sf
+sha
 shadow
 shape
 share
@@ -2200,6 +2207,7 @@ try
 trydecodeasnil
 ts
 tsd
+tsx
 tt
 tta
 tuple
@@ -2337,6 +2345,7 @@ we
 web
 webdev
 webkit
+webp
 webpack
 websites
 week