Merge branch 'main' into release-vsce-1.11

.changes/v0.17.0.md

@@ -0,0 +1,13 @@
+## v0.17.0 (2024-09-10)
+
+### Notice
+
+* We've reworked the `Web` (a beta feature) context provider into the `Developer Docs` context provider. Previously added context in the `Web` tab has been cleared and needs to be manually migrated to `Developer Docs`.
+
+### Features
+
+* Extensive rework has been done in the answer engine search box.
+  - Developer Docs / Web search is now triggered by `@`.
+  - Repository Context is now selected using `#`.
+
+* Supports OCaml

.tmuxinator/tabby.yml

@@ -0,0 +1,12 @@
+name: tabby
+root: ./
+
+windows:
+  - caddy:
+      panes:
+        - caddy run --watch --config ee/tabby-webserver/development/Caddyfile
+  - server:
+      layout: even-horizontal
+      panes:
+        - cargo run serve --port 8081
+        - cd ee/tabby-ui && pnpm dev

CHANGELOG.md

@@ -5,6 +5,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
+## v0.17.0 (2024-09-10)
+
+### Notice
+
+* We've reworked the `Web` (a beta feature) context provider into the `Developer Docs` context provider. Previously added context in the `Web` tab has been cleared and needs to be manually migrated to `Developer Docs`.
+
+### Features
+
+* Extensive rework has been done in the answer engine search box.
+  - Developer Docs / Web search is now triggered by `@`.
+  - Repository Context is now selected using `#`.
+
+* Supports OCaml
+
 ## v0.16.1 (2024-08-27)
 
 ### Notice

Cargo.toml

@@ -19,10 +19,11 @@ members = [
     "ee/tabby-db",
     "ee/tabby-db-macros",
     "ee/tabby-schema",
+    "crates/hash-ids",
 ]
 
 [workspace.package]
-version = "0.17.0-dev.0"
+version = "0.18.0-dev.0"
 edition = "2021"
 authors = ["TabbyML Team"]
 homepage = "https://github.com/TabbyML/tabby"
@@ -55,7 +56,7 @@ juniper = "0.16"
 chrono = "0.4"
 reqwest-eventsource = "0.6"
 serial_test = "3.0.0"
-hash-ids = "0.2.1"
+hash-ids = { path = "./crates/hash-ids" }
 ignore = "0.4.20"
 nucleo = "0.5.0"
 url = "2.5.0"

Makefile

@@ -17,9 +17,9 @@ update-db-schema:
 	dot -Tsvg schema.dot > ee/tabby-db/schema/schema.svg
 	rm schema.dot
 
-caddy:
-	caddy run --watch --config ee/tabby-webserver/development/Caddyfile
-
+dev:
+	tmuxinator start -p .tmuxinator/tabby.yml
+		
 bump-version:
 	cargo ws version --force "*" --no-individual-tags --allow-branch "main"
 

clients/eclipse/feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="com.tabbyml.features.tabby4eclipse"
       label="Tabby"
-      version="0.0.1.15"
+      version="0.0.1.19"
       provider-name="com.tabbyml">
 
    <description url="http://www.example.com/description">
@@ -19,6 +19,6 @@
 
    <plugin
          id="com.tabbyml.tabby4eclipse"
-         version="0.0.1.15"/>
+         version="0.0.1.19"/>
 
 </feature>

clients/eclipse/plugin/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tabby Plugin for Eclipse
 Bundle-SymbolicName: com.tabbyml.tabby4eclipse;singleton:=true
-Bundle-Version: 0.0.1.15
+Bundle-Version: 0.0.1.19
 Bundle-Activator: com.tabbyml.tabby4eclipse.Activator
 Bundle-Vendor: com.tabbyml
 Require-Bundle: org.eclipse.ui,

clients/eclipse/plugin/src/com/tabbyml/tabby4eclipse/Images.java

@@ -8,8 +8,6 @@
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.ui.PlatformUI;
 import org.osgi.framework.Bundle;
 
 public class Images {

clients/eclipse/plugin/src/com/tabbyml/tabby4eclipse/Logger.java

@@ -4,6 +4,9 @@
 import org.eclipse.core.runtime.Status;
 
 public class Logger {
+	private static String TABBY4ECLIPSE_LOG_DEBUG = System.getenv("TABBY4ECLIPSE_LOG_DEBUG");
+	private static boolean LOG_DEBUG = TABBY4ECLIPSE_LOG_DEBUG != null && !TABBY4ECLIPSE_LOG_DEBUG.isEmpty();
+
 	private String tag;
 
 	public Logger(String tag) {
@@ -17,6 +20,9 @@ public void trace(String message, Object obj) {
 
 	public void debug(String message) {
 		System.out.println(tagString(message));
+		if (LOG_DEBUG) {
+			logStatus(IStatus.INFO, String.format("[DEBUG] %s", message), null);
+		}
 	}
 
 	public void info(String message) {

clients/eclipse/plugin/src/com/tabbyml/tabby4eclipse/Startup.java

@@ -2,7 +2,7 @@
 
 import org.eclipse.ui.IStartup;
 
-import com.tabbyml.tabby4eclipse.editor.EditorListener;
+import com.tabbyml.tabby4eclipse.editor.WorkbenchPartListener;
 import com.tabbyml.tabby4eclipse.lsp.LanguageServerService;
 
 public class Startup implements IStartup {
@@ -12,10 +12,10 @@ public class Startup implements IStartup {
 	@Override
 	public void earlyStartup() {
 		logger.info("Running startup actions.");
-		LanguageServerService lsManager = LanguageServerService.getInstance();
-		lsManager.init();
-		EditorListener editorManager = EditorListener.getInstance();
-		editorManager.init();
+		LanguageServerService lsService = LanguageServerService.getInstance();
+		lsService.init();
+		WorkbenchPartListener workbenchPartListener = WorkbenchPartListener.getInstance();
+		workbenchPartListener.init();
 		logger.info("Finished running startup actions.");
 	}
 }

clients/eclipse/plugin/src/com/tabbyml/tabby4eclipse/Utils.java

@@ -0,0 +1,7 @@
+package com.tabbyml.tabby4eclipse;
+
+public class Utils {
+	public static boolean isWindows() {
+		return System.getProperty("os.name").toLowerCase().contains("win");
+	}
+}

clients/eclipse/plugin/src/com/tabbyml/tabby4eclipse/chat/ChatMessage.java

@@ -50,6 +50,7 @@ public void setActiveContext(FileContext activeContext) {
 	}
 
 	public static class FileContext {
+		@SuppressWarnings("unused")
 		private String kind = "file";
 		private LineRange range;
 		private String filepath;