Started working on utf-16 index translation

Author: IsaacShelton

src/components/language_server/src/lib.rs

@@ -1,18 +1,24 @@
 mod document;
+mod file_uri;
 mod log;
 mod message;
 mod methods;
 
-use crate::message::{Message, Response};
+use crate::{
+    file_uri::FileUri,
+    message::{Message, Response},
+};
 use daemon::connect_to_daemon;
 pub(crate) use document::*;
 use fingerprint::COMPILER_BUILT_AT;
 use ipc_message::{IpcMessage, IpcMessageId, IpcRequest, IpcResponse};
 pub(crate) use log::*;
 use lsp_types::{
-    CompletionItem, CompletionList, CompletionResponse, DidChangeTextDocumentParams, Uri,
+    CompletionItem, CompletionList, CompletionResponse, DidChangeTextDocumentParams,
+    InitializeParams, Uri,
 };
 use pin_project_lite::pin_project;
+use serde::Deserialize;
 use smol::{
     io::{AsyncWriteExt, WriteHalf},
     net::TcpStream,
@@ -22,8 +28,12 @@ use std::{
     io::{BufReader, BufWriter, Stdin, Stdout, Write},
     pin::pin,
     process::ExitCode,
+    sync::Arc,
+};
+use text_edit::{
+    DocumentChange, TextEditLineColumnUtf16, TextPosition, TextPositionLineColumnUtf16,
+    TextRangeLineColumnUtf16,
 };
-use text_edit::TextPosition;
 use transport::{read_message_raw_async, write_message_raw_async};
 
 pin_project! {
@@ -137,7 +147,6 @@ pub async fn start() -> ExitCode {
                         )
                         .await;
                     }
-                    IpcResponse::Changed => todo!(),
                     IpcResponse::Saved => todo!(),
                     IpcResponse::Completion(items) => {
                         Server::send_to_editor(
@@ -234,6 +243,8 @@ pub async fn start() -> ExitCode {
                         ))
                         .unwrap();
 
+                        let init_params = InitializeParams::deserialize(request.params);
+
                         write_message_raw_async(server.as_mut().project().daemon, &data)
                             .await
                             .unwrap();
@@ -270,33 +281,68 @@ pub async fn start() -> ExitCode {
                 };
             }
             Message::Response(_) => (),
-            Message::Notification(notif) => match notif.method.as_str() {
-                "initialized" => (),
-                "textDocument/didChange" => {
-                    let params =
-                        serde_json::from_value::<DidChangeTextDocumentParams>(notif.params)
-                            .unwrap();
-
-                    dbg!(params);
-
-                    /*
-                    notification.params
-
-                        write_message_raw_async(server.as_mut().project().daemon, &data)
-                            .await
-                            .unwrap();
-                        server.as_mut().project().daemon.flush().await.unwrap();
-                    */
-                }
-                "exit" => {
-                    return if server.did_shutdown {
-                        ExitCode::SUCCESS
-                    } else {
-                        ExitCode::FAILURE
-                    };
+            Message::Notification(notif) => {
+                match notif.method.as_str() {
+                    "initialized" => (),
+                    "textDocument/didChange" => {
+                        let params =
+                            serde_json::from_value::<DidChangeTextDocumentParams>(notif.params)
+                                .unwrap();
+
+                        if let Some("file") = params
+                            .text_document
+                            .uri
+                            .scheme()
+                            .map(|scheme| scheme.as_str())
+                        {
+                            let document_changes =
+                                params.content_changes.into_iter().map(|change| {
+                                    if let Some(range) = change.range {
+                                        assert!(range.start <= range.end, "Invalid range");
+
+                                        DocumentChange::IncrementalUtf16(TextEditLineColumnUtf16 {
+                                            range: TextRangeLineColumnUtf16 {
+                                                start: TextPositionLineColumnUtf16 {
+                                                    line_utf16: range.start.line,
+                                                    column_utf16: range.start.character,
+                                                },
+                                                end: TextPositionLineColumnUtf16 {
+                                                    line_utf16: range.end.line,
+                                                    column_utf16: range.end.character,
+                                                },
+                                            },
+                                            replace_with: Arc::from(change.text),
+                                        })
+                                    } else {
+                                        DocumentChange::Full(Arc::from(change.text))
+                                    }
+                                });
+
+                            eprintln!(
+                                "{:?} {:?}",
+                                &params.text_document.uri.to_file_path(),
+                                &document_changes
+                            );
+                        }
+
+                        /*
+                        notification.params
+                            write_message_raw_async(server.as_mut().project().daemon, &data)
+                                .await
+                                .unwrap();
+                            server.as_mut().project().daemon.flush().await.unwrap();
+                        */
+                    }
+                    "exit" => {
+                        return if server.did_shutdown {
+                            ExitCode::SUCCESS
+                        } else {
+                            ExitCode::FAILURE
+                        };
+                    }
+                    _ => (),
                 }
-                _ => (),
-            },
+            }
         }
     }
 

src/components/language_server/src/methods/mod.rs

@@ -3,14 +3,15 @@ pub mod text_document;
 use crate::{Server, message::Request};
 use lsp_types::{
     CompletionOptions, DiagnosticOptions, DiagnosticServerCapabilities, InitializeResult,
-    ServerCapabilities, ServerInfo, TextDocumentSyncCapability, TextDocumentSyncKind,
-    WorkDoneProgressOptions,
+    PositionEncodingKind, ServerCapabilities, ServerInfo, TextDocumentSyncCapability,
+    TextDocumentSyncKind, WorkDoneProgressOptions,
     request::{Initialize, Request as LspRequest, Shutdown},
 };
 
 pub fn initialize() -> <Initialize as LspRequest>::Result {
     return InitializeResult {
         capabilities: ServerCapabilities {
+            position_encoding: Some(PositionEncodingKind::UTF32),
             completion_provider: Some(CompletionOptions {
                 resolve_provider: None,
                 trigger_characters: None,

src/representations/ipc_message/src/lib.rs

@@ -4,7 +4,7 @@ use std::{
     path::PathBuf,
     sync::Arc,
 };
-use text_edit::{TextEdit, TextPosition};
+use text_edit::{DocumentChange, TextEdit, TextPosition};
 use vfs::Canonical;
 
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
@@ -40,7 +40,6 @@ pub enum IpcRequest {
 pub enum IpcResponse {
     Initialized,
     ShuttingDown,
-    Changed,
     Saved,
     Completion(Vec<String>),
     Diagnostics(Vec<(String, TextPosition)>),
@@ -50,7 +49,7 @@ pub enum IpcResponse {
 pub enum IpcNotification {
     Exit,
     DidOpen(IpcFile),
-    DidChange(IpcFile, Vec<TextEdit>),
+    DidChange(IpcFile, Vec<DocumentChange>),
     DidSave(IpcFile),
 }
 

src/representations/text_edit/src/lib.rs

@@ -123,8 +123,32 @@ impl std::ops::AddAssign<TextLength> for TextPosition {
     }
 }
 
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub enum DocumentChange {
+    IncrementalUtf16(TextEditLineColumnUtf16),
+    Full(Arc<str>),
+}
+
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct TextEdit {
     pub range: TextRange,
     pub replace_with: Arc<str>,
 }
+
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct TextEditLineColumnUtf16 {
+    pub range: TextRangeLineColumnUtf16,
+    pub replace_with: Arc<str>,
+}
+
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct TextRangeLineColumnUtf16 {
+    pub start: TextPositionLineColumnUtf16,
+    pub end: TextPositionLineColumnUtf16,
+}
+
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct TextPositionLineColumnUtf16 {
+    pub line_utf16: u32,
+    pub column_utf16: u32,
+}