fix: convert to byte indices

Author: psteinroe

crates/pgt_lsp/tests/server.rs

@@ -747,27 +747,31 @@ async fn test_issue_281() -> Result<()> {
 
     server.load_configuration().await?;
 
-    server.open_document("select a").await?;
-
-    server
-        .change_document(
-            3,
-            vec![TextDocumentContentChangeEvent {
-                range: Some(Range {
-                    start: Position {
-                        line: 0,
-                        character: 7,
-                    },
-                    end: Position {
-                        line: 0,
-                        character: 7,
-                    },
-                }),
-                range_length: Some(0),
-                text: "ы".to_string(),
-            }],
-        )
-        .await?;
+    server.open_document("\n------------- Meta -------------\n\n-- name: GetValueFromMetaKVStore :one\nSELECT value FROM meta_kv\nWHERE key = $1;\n\n-- name: SetValueToMetaKVStore :exec\nINSERT INTO meta_kv (key, value)\nVALUES ($1, $2)\nON CONFLICT (key) DO UPDATE\nSET value = excluded.value;\n\n\nasdsadsad\n\nыывфыв khgk\nasdыdsf\ndsdsjdfnfmdsвтьвыаыdsfsmndf,m\nы\n").await?;
+
+    let chars = ["s", "n", ",", "d", "f", "j", "s", "d", "f", "в"];
+
+    for (i, c) in chars.iter().enumerate() {
+        server
+            .change_document(
+                i as i32 + 4,
+                vec![TextDocumentContentChangeEvent {
+                    range: Some(Range {
+                        start: Position {
+                            line: 20,
+                            character: i as u32,
+                        },
+                        end: Position {
+                            line: 20,
+                            character: i as u32,
+                        },
+                    }),
+                    range_length: Some(0),
+                    text: c.to_string(),
+                }],
+            )
+            .await?;
+    }
 
     server.shutdown().await?;
     reader.abort();

crates/pgt_workspace/src/workspace/server/change.rs

@@ -249,10 +249,19 @@ impl Document {
 
         // if within a statement, we can modify it if the change results in also a single statement
         if affected_indices.len() == 1 {
-            let changed_content = new_content
-                .as_str()
-                .get(usize::from(affected_range.start())..usize::from(affected_range.end()))
-                .unwrap();
+            let start_byte = new_content
+                .char_indices()
+                .nth(usize::from(affected_range.start()))
+                .map(|(i, _)| i)
+                .unwrap_or(new_content.len());
+
+            let end_byte = new_content
+                .char_indices()
+                .nth(usize::from(affected_range.end()))
+                .map(|(i, _)| i)
+                .unwrap_or(new_content.len());
+
+            let changed_content = &new_content[start_byte..end_byte];
 
             let (new_ranges, diags) =
                 document::split_with_diagnostics(changed_content, Some(affected_range.start()));
@@ -305,10 +314,19 @@ impl Document {
         }
 
         // in any other case, parse the full affected range
-        let changed_content = new_content
-            .as_str()
-            .get(usize::from(full_affected_range.start())..usize::from(full_affected_range.end()))
-            .unwrap();
+        let start_byte = new_content
+            .char_indices()
+            .nth(usize::from(full_affected_range.start()))
+            .map(|(i, _)| i)
+            .unwrap_or(new_content.len());
+
+        let end_byte = new_content
+            .char_indices()
+            .nth(usize::from(full_affected_range.end()))
+            .map(|(i, _)| i)
+            .unwrap_or(new_content.len());
+
+        let changed_content = &new_content[start_byte..end_byte];
 
         let (new_ranges, diags) =
             document::split_with_diagnostics(changed_content, Some(full_affected_range.start()));