fixed more coercion issues

Author: ndbroadbent

docs/src/content/docs/self-hosting-demo.mdx

@@ -14,33 +14,37 @@ import Quote from '../../components/Quote.astro';
   In computer programming, self-hosting is the use of a program as part of the toolchain or operating 
   system that produces new versions of that same program—for example, a compiler that can compile 
   its own source code.
-</Quote>  
+</Quote>
 
-Watch Refaktor rename the entire project to `awesome_file_renaming_tool`, run the test suite 
-using it's new name, and then use the new binary to change itself back again:
+Refaktor is capable of "self-hosting". It can rename the entire project to `awesome_file_renaming_tool`, 
+run the entire test suite, and then use the newly compiled binary to rename itself back again:
 
 ```bash
 # Clone and build
 git clone https://github.com/DocSpring/refaktor
 cd refaktor
-cargo build --release
+cargo build
 
 # Use refaktor to rename itself to awesome_file_renaming_tool
-./target/release/refaktor rename refaktor awesome_file_renaming_tool --preview table --yes
+./target/debug/refaktor rename refaktor awesome_file_renaming_tool --preview table --yes
 
-# Remove the old binary, run tests, and rebuild with the new name
+# Make sure the old compiled binary is gone
 rm -rf target
+
+# Run the full test suite
 cargo test
-cargo build --release
 
-# Now use the new renamed binary to rename itself back to refaktor
-./target/release/awesome_file_renaming_tool rename awesome_file_renaming_tool refaktor --preview table --yes
+# Build the "awesome_file_renaming_tool" binary
+cargo build
+
+# Use the new binary to rename itself back to refaktor
+./target/debug/awesome_file_renaming_tool rename awesome_file_renaming_tool refaktor --preview table --yes
 
-# Back to the original
+# Back to the original name
 rm -rf target
 cargo test
-cargo build --release
-./target/release/refaktor --help
+cargo build
+./target/debug/refaktor --help
 
 git status
 # On branch main

refaktor-core/src/scanner.rs

@@ -474,28 +474,56 @@ fn extract_immediate_context(line: &str, match_start: usize, match_end: usize) -
     let mut context_end = char_end;
 
     // Characters that are part of identifiers or compound names
-    let is_identifier_char =
-        |c: char| -> bool { c.is_alphanumeric() || c == '_' || c == '-' || c == '.' };
-
-    // Characters that indicate we should stop extending context but might be part of a path/namespace
-    let is_path_separator = |c: char| -> bool { c == '/' || c == '\\' || c == ':' || c == '@' };
+    let is_identifier_char = |c: char| -> bool { c.is_alphanumeric() || c == '_' || c == '-' };
+
+    // Characters that act as separators - we should NOT extend past these
+    // This includes: /, \, :, @, ., [, ], (, ), {, }, =, quotes, spaces
+    let is_separator = |c: char| -> bool {
+        matches!(
+            c,
+            '/' | '\\'
+                | ':'
+                | '@'
+                | '.'
+                | '['
+                | ']'
+                | '('
+                | ')'
+                | '{'
+                | '}'
+                | '='
+                | '"'
+                | '\''
+                | '`'
+                | ' '
+                | '\t'
+                | '\n'
+                | '\r'
+                | ','
+                | ';'
+        )
+    };
 
-    // Extend backwards to find the start of the identifier/path chain
+    // Extend backwards to find the start of the immediate identifier
+    // Stop at any separator character
     while context_start > 0 {
         let prev_char = chars[context_start - 1];
-        if is_identifier_char(prev_char) || is_path_separator(prev_char) {
+        if is_identifier_char(prev_char) {
             context_start -= 1;
         } else {
+            // Stop at any separator or other character
             break;
         }
     }
 
-    // Extend forwards to find the end of the identifier/path chain
+    // Extend forwards to find the end of the immediate identifier
+    // Stop at any separator character
     while context_end < chars.len() {
         let next_char = chars[context_end];
-        if is_identifier_char(next_char) || is_path_separator(next_char) {
+        if is_identifier_char(next_char) {
             context_end += 1;
         } else {
+            // Stop at any separator or other character
             break;
         }
     }