Fix case sensitivity issue with intel syntax instruction names (berge…

…rcookie#27)

src/bin/main.rs

@@ -120,10 +120,9 @@ fn main_loop(
                         // format response
                         match word {
                             Ok(word) => {
-                                let (x86_instruction, x86_64_instruction) = (
-                                    names_to_instructions.get(&(Arch::X86, &*word)),
-                                    names_to_instructions.get(&(Arch::X86_64, &*word)),
-                                );
+                                let (x86_instruction, x86_64_instruction) =
+                                    search_for_instr(&word, names_to_instructions);
+
                                 let hover_res: Option<Hover> =
                                     match (x86_instruction.is_some(), x86_64_instruction.is_some())
                                     {

src/lsp.rs

@@ -1,5 +1,5 @@
 use crate::types::Column;
-use crate::{Instruction, TargetConfig};
+use crate::{Arch, Instruction, NameToInstructionMap, TargetConfig};
 use log::{error, info};
 use lsp_types::{InitializeParams, TextDocumentPositionParams, Url};
 use std::fs::File;
@@ -53,6 +53,25 @@ pub fn get_word_from_file_params(
     }
 }
 
+// Note: Have to call .cloned() on the results of .get()
+// here because of compiler issue regarding entangled lifetimes: https://github.com/rust-lang/rust/issues/80389
+pub fn search_for_instr<'a: 'b, 'b>(
+    word: &str,
+    map: &'a NameToInstructionMap<'a>,
+) -> (Option<&'b Instruction>, Option<&'b Instruction>) {
+    let raised_word = word.to_uppercase();
+    let x86_instruction = map
+        .get(&(Arch::X86, word))
+        .or_else(|| map.get(&(Arch::X86, &raised_word)))
+        .cloned();
+    let x86_64_instruction = map
+        .get(&(Arch::X86_64, word))
+        .or_else(|| map.get(&(Arch::X86_64, &raised_word)))
+        .cloned();
+
+    (x86_instruction, x86_64_instruction)
+}
+
 pub fn get_target_config(params: &InitializeParams) -> TargetConfig {
     // 1. if we have workspace folders, then iterate through them and assign the first valid one to
     //    the root path