first pass of merging in warp (doesn't build)

crates/lsp/src/service.rs

@@ -1,39 +1,33 @@
-use std::{
-    collections::HashMap,
-    path::{Path, PathBuf},
-    sync::{Arc, Mutex},
-};
+use std::collections::HashMap;
+use std::path::{Path, PathBuf};
+use std::sync::{Arc, Mutex};
 
-use crate::{
-    config::{lsp_uri_to_path, path_to_lsp_uri, LanguageId},
-    types::{
-        CodeActionData, CompletionResult, FileEdits, HoverResult, Location, LspDefinitionLocation,
-        PrepareRenameResult, Range, ReferenceLocation, RenameResult, SignatureHelpResult,
-        TextDocumentContentChangeEvent, TextEdit, WatchedFileChangeEvent,
-    },
-    LspServerLogLevel,
-};
 use anyhow::Result;
 use galaxy_util::on_cancel::OnCancelFutureExt;
 use globset::{Glob, GlobMatcher};
 use jsonrpc::{JsonRpcService, RequestId, ServerNotificationEvent};
+use lsp_types::notification::{self, Notification};
+use lsp_types::request::{self, Request};
 use lsp_types::{
-    notification::{self, Notification},
-    request::{self, Request},
-    CancelParams, CodeActionContext, CodeActionParams, CompletionContext, CompletionItem,
-    CompletionParams, CompletionTriggerKind, DidChangeTextDocumentParams,
-    DidChangeWatchedFilesParams, DidChangeWatchedFilesRegistrationOptions,
-    DidCloseTextDocumentParams, DidOpenTextDocumentParams, DocumentFormattingParams,
-    FileChangeType, FileSystemWatcher, FormattingOptions, GlobPattern, GotoDefinitionParams,
-    GotoDefinitionResponse, HoverParams, InitializeParams, InitializedParams, NumberOrString,
-    OneOf, Position, Range as LspRange, ReferenceParams, RegistrationParams, RelativePattern,
-    RenameParams, SignatureHelpParams, TextDocumentIdentifier, TextDocumentItem,
+    CancelParams, DidChangeTextDocumentParams, DidChangeWatchedFilesParams,
+    DidChangeWatchedFilesRegistrationOptions, DidCloseTextDocumentParams,
+    DidOpenTextDocumentParams, DocumentFormattingParams, FileChangeType, FileSystemWatcher,
+    FormattingOptions, GlobPattern, GotoDefinitionParams, GotoDefinitionResponse, HoverParams,
+    InitializeParams, InitializedParams, NumberOrString, OneOf, Position, ReferenceParams,
+    RegistrationParams, RelativePattern, TextDocumentIdentifier, TextDocumentItem,
     TextDocumentPositionParams, UnregistrationParams, VersionedTextDocumentIdentifier, WatchKind,
 };
 use serde_json::Value;
 #[cfg(not(target_arch = "wasm32"))]
 use simple_logger::SimpleLogger;
 
+use crate::config::{lsp_uri_to_path, path_to_lsp_uri, LanguageId};
+use crate::types::{
+    HoverResult, LspDefinitionLocation, ReferenceLocation, TextDocumentContentChangeEvent,
+    TextEdit, WatchedFileChangeEvent,
+};
+use crate::LspServerLogLevel;
+
 /// Tracks the sync state for an open document.
 #[derive(Debug, Clone)]
 pub struct DocumentSyncState {