v0.1.7

.github/workflows/release.yml

@@ -42,7 +42,7 @@ on:
   pull_request:
   push:
     tags:
-      - "**[0-9]+.[0-9]+.[0-9]+*"
+      - '**[0-9]+.[0-9]+.[0-9]+*'
 
 jobs:
   # Run 'cargo dist plan' (or host) to determine what tasks we need to do
@@ -51,7 +51,7 @@ jobs:
     outputs:
       val: ${{ steps.plan.outputs.manifest }}
       tag: ${{ !github.event.pull_request && github.ref_name || '' }}
-      tag-flag: ${{ !github.event.pull_request && format('--tag=wakatime-ls-{0}', github.ref_name) || '' }}
+      tag-flag: ${{ !github.event.pull_request && format('--tag={0}', github.ref_name) || '' }}
       publishing: ${{ !github.event.pull_request }}
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -76,7 +76,7 @@ jobs:
       # but also really annoying to build CI around when it needs secrets to work right.)
       - id: plan
         run: |
-          cargo dist ${{ (!github.event.pull_request && format('host --steps=create --tag=wakatime-ls-{0}', github.ref_name)) || 'plan' }} --output-format=json > plan-dist-manifest.json
+          cargo dist ${{ (!github.event.pull_request && format('host --steps=create --tag={0}', github.ref_name)) || 'plan' }} --output-format=json > plan-dist-manifest.json
           echo "cargo dist ran successfully"
           cat plan-dist-manifest.json
           echo "manifest=$(jq -c "." plan-dist-manifest.json)" >> "$GITHUB_OUTPUT"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wakatime-zed"
-version = "0.1.5"
+version = "0.1.7"
 edition = "2021"
 
 [lib]
@@ -20,14 +20,11 @@ lto = "thin"
 cargo-dist-version = "0.22.0"
 # CI backends to support
 ci = "github"
+# The archive format to use for non-windows builds (defaults .tar.xz)
 unix-archive = ".zip"
+# The archive format to use for windows builds (defaults .zip)
 windows-archive = ".zip"
 # The installers to generate for each app
 installers = []
 # Target platforms to build apps for (Rust target-triple syntax)
-targets = [
-    "aarch64-apple-darwin",
-    "x86_64-apple-darwin",
-    "x86_64-unknown-linux-gnu",
-    "x86_64-pc-windows-msvc",
-]
+targets = ["aarch64-apple-darwin", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-msvc"]

wakatime-ls/Cargo.toml

@@ -1,7 +1,9 @@
 [package]
 name = "wakatime-ls"
-version = "0.1.6"
+version = "0.1.7"
 edition = "2021"
+repository = "https://github.com/bestgopher/wakatime-zed"
+
 
 [dependencies]
 arc-swap = "1.7.1"

wakatime-ls/src/main.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use arc_swap::ArcSwap;
+use arc_swap::{access::Access, ArcSwap};
 use chrono::{DateTime, Local, TimeDelta};
 use clap::{Arg, Command};
 use tokio::{process::Command as TokioCommand, sync::Mutex};
@@ -48,15 +48,17 @@ impl WakatimeLanguageServer {
         let mut command = TokioCommand::new(self.wakatime_path.as_str());
 
         command
-            .arg("--plugin")
-            .arg(self.platform.load().as_str())
             .arg("--time")
             .arg((now.timestamp() as f64).to_string())
             .arg("--write")
             .arg(event.is_write.to_string())
             .arg("--entity")
             .arg(event.uri.as_str());
 
+        if !self.platform.load().is_empty() {
+            command.arg("--plugin").arg(self.platform.load().as_str());
+        }
+
         if let Some(ref key) = self.api_key {
             command.arg("--key").arg(key);
         }
@@ -116,7 +118,14 @@ impl LanguageServer for WakatimeLanguageServer {
             }
 
             platform.push(' ');
-            platform.push_str(self.platform.load().as_str());
+            platform.push_str(
+                format!(
+                    "{}-wakatime/{}",
+                    client_info.name.as_str(),
+                    env!("CARGO_PKG_VERSION")
+                )
+                .as_str(),
+            );
 
             self.platform.store(Arc::new(platform));
         }
@@ -215,7 +224,7 @@ async fn main() {
             client,
             wakatime_path: wakatime_cli.to_string(),
             api_key,
-            platform: ArcSwap::from_pointee(format!("wakatime-ls/{}", env!("CARGO_PKG_VERSION"))),
+            platform: ArcSwap::from_pointee(String::new()),
             current_file: Mutex::new(CurrentFile {
                 uri: String::new(),
                 timestamp: Local::now(),

wakatime/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wakatime"
-version = "0.1.6"
+version = "0.1.7"
 edition = "2021"
 
 [lib]