Rebrand to Galaxy, major improvements to Bedrock support, still needs some TLC though
This commit is contained in:
@@ -199,7 +199,7 @@ pub async fn install_from_github(
|
||||
|
||||
// Create the destination directory: {data_dir}/{server_name}/{version}
|
||||
// If it already exists, remove it first to ensure a clean installation
|
||||
let install_dir = warp_core::paths::data_dir()
|
||||
let install_dir = galaxy_core::paths::data_dir()
|
||||
.join(server_name)
|
||||
.join(&metadata.version);
|
||||
if install_dir.exists() {
|
||||
|
||||
@@ -56,8 +56,8 @@ use anyhow::Result;
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
use simple_logger::SimpleLogger;
|
||||
use std::sync::Arc;
|
||||
use warpui::r#async::executor::Background;
|
||||
use warpui::AppContext;
|
||||
use galaxyui::r#async::executor::Background;
|
||||
use galaxyui::AppContext;
|
||||
|
||||
pub struct LspServiceInitializationResult {
|
||||
pub service: LspService,
|
||||
|
||||
@@ -7,7 +7,7 @@ use crate::{
|
||||
config::LanguageId, model::LanguageServerId, supported_servers::LSPServerType, LspEvent,
|
||||
LspServerConfig, LspServerModel,
|
||||
};
|
||||
use warpui::{AppContext, Entity, ModelContext, ModelHandle, SingletonEntity};
|
||||
use galaxyui::{AppContext, Entity, ModelContext, ModelHandle, SingletonEntity};
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum LspManagerModelEvent {
|
||||
|
||||
@@ -31,10 +31,10 @@ use jsonrpc::ServerNotificationEvent;
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
use simple_logger::manager::LogManager;
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
use warp_core::features::FeatureFlag;
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
use warpui::SingletonEntity;
|
||||
use warpui::{r#async::executor::Background, Entity, ModelContext};
|
||||
use galaxyui::SingletonEntity;
|
||||
use galaxyui::{r#async::executor::Background, Entity, ModelContext};
|
||||
|
||||
static NEXT_LANGUAGE_SERVER_ID: AtomicUsize = AtomicUsize::new(0);
|
||||
|
||||
|
||||
@@ -6,8 +6,8 @@ use repo_metadata::{
|
||||
repository::{RepositorySubscriber, SubscriberId},
|
||||
DirectoryWatcher, Repository, RepositoryUpdate,
|
||||
};
|
||||
use warp_util::standardized_path::StandardizedPath;
|
||||
use warpui::{ModelContext, SingletonEntity, WeakModelHandle};
|
||||
use galaxy_util::standardized_path::StandardizedPath;
|
||||
use galaxyui::{ModelContext, SingletonEntity, WeakModelHandle};
|
||||
|
||||
use crate::{model::LspServerModel, types::WatchedFileChangeEvent, LspServerConfig};
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ impl ClangdCandidate {
|
||||
|
||||
#[cfg(feature = "local_fs")]
|
||||
pub async fn find_installed_binary_in_data_dir() -> Option<PathBuf> {
|
||||
let install_root = warp_core::paths::data_dir().join(SERVER_NAME);
|
||||
let install_root = galaxy_core::paths::data_dir().join(SERVER_NAME);
|
||||
if !install_root.is_dir() {
|
||||
return None;
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@ impl PyrightCandidate {
|
||||
pub async fn find_installed_binary_config(
|
||||
path_env_var: Option<&str>,
|
||||
) -> Option<CustomBinaryConfig> {
|
||||
let install_dir = warp_core::paths::data_dir().join("pyright");
|
||||
let install_dir = galaxy_core::paths::data_dir().join("pyright");
|
||||
let langserver_js = install_dir.join(Self::LANGSERVER_JS_PATH);
|
||||
|
||||
// Check if the JS file exists
|
||||
@@ -137,7 +137,7 @@ impl LanguageServerCandidate for PyrightCandidate {
|
||||
) -> anyhow::Result<()> {
|
||||
log::info!("Installing pyright version {}", metadata.version);
|
||||
|
||||
let install_dir = warp_core::paths::data_dir().join("pyright");
|
||||
let install_dir = galaxy_core::paths::data_dir().join("pyright");
|
||||
|
||||
// Create the installation directory
|
||||
async_fs::create_dir_all(&install_dir)
|
||||
|
||||
@@ -70,7 +70,7 @@ impl RustAnalyzerCandidate {
|
||||
pub async fn find_installed_binary_in_data_dir() -> Option<std::path::PathBuf> {
|
||||
use tokio::process::Command;
|
||||
|
||||
let install_dir = warp_core::paths::data_dir().join(SERVER_NAME);
|
||||
let install_dir = galaxy_core::paths::data_dir().join(SERVER_NAME);
|
||||
if !install_dir.exists() {
|
||||
return None;
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@ impl TypeScriptLanguageServerCandidate {
|
||||
pub async fn find_installed_binary_config(
|
||||
path_env_var: Option<&str>,
|
||||
) -> Option<CustomBinaryConfig> {
|
||||
let install_dir = warp_core::paths::data_dir().join("typescript-language-server");
|
||||
let install_dir = galaxy_core::paths::data_dir().join("typescript-language-server");
|
||||
|
||||
// Check for the JS file - prefer new path (cli.mjs) over old path (cli.js)
|
||||
let server_js = {
|
||||
@@ -140,7 +140,7 @@ impl LanguageServerCandidate for TypeScriptLanguageServerCandidate {
|
||||
metadata.version
|
||||
);
|
||||
|
||||
let install_dir = warp_core::paths::data_dir().join("typescript-language-server");
|
||||
let install_dir = galaxy_core::paths::data_dir().join("typescript-language-server");
|
||||
|
||||
// Create the installation directory
|
||||
async_fs::create_dir_all(&install_dir)
|
||||
|
||||
@@ -29,7 +29,7 @@ use lsp_types::{
|
||||
use serde_json::Value;
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
use simple_logger::SimpleLogger;
|
||||
use warp_util::on_cancel::OnCancelFutureExt;
|
||||
use galaxy_util::on_cancel::OnCancelFutureExt;
|
||||
|
||||
/// Tracks the sync state for an open document.
|
||||
#[derive(Debug, Clone)]
|
||||
@@ -360,7 +360,7 @@ impl WatchedFilesRegistry {
|
||||
return false;
|
||||
};
|
||||
|
||||
let path_relative = warp_util::path::normalize_relative_path_for_glob(path_relative);
|
||||
let path_relative = galaxy_util::path::normalize_relative_path_for_glob(path_relative);
|
||||
|
||||
self.registrations
|
||||
.values()
|
||||
@@ -418,7 +418,7 @@ impl WatchedFilesRegistry {
|
||||
};
|
||||
|
||||
// Normalize to forward slashes so glob patterns and event paths are comparable across platforms (esp. Windows).
|
||||
let prefix = warp_util::path::normalize_relative_path_for_glob(base_relative);
|
||||
let prefix = galaxy_util::path::normalize_relative_path_for_glob(base_relative);
|
||||
|
||||
if prefix.is_empty() {
|
||||
Some(pattern)
|
||||
|
||||
@@ -10,7 +10,7 @@ use futures::{
|
||||
};
|
||||
use jsonrpc::Transport;
|
||||
use simple_logger::SimpleLogger;
|
||||
use warpui::r#async::{
|
||||
use galaxyui::r#async::{
|
||||
executor::{Background, BackgroundTask},
|
||||
Timer,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user