Fix autocomplete character selection (#2304)

microsoftgraph · Jan 12, 2023 · b95426f · b95426f
1 parent 1707286
commit b95426f
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/src/modules/suggestions/utilities/delimiters.ts b/src/modules/suggestions/utilities/delimiters.ts
@@ -27,9 +27,24 @@ const delimiters: Delimiters = {
 function getLastDelimiterInUrl(url: string): Delimiter {
   const symbols = Object.values(delimiters);
   symbols.forEach(key => {
-    key.index = url.lastIndexOf(key.symbol);
+    const prevCharIndex = url.lastIndexOf(key.symbol) - 1;
+    key.index = isSecondLastCharADelimiter(url.charAt(prevCharIndex)) ? url.lastIndexOf(key.symbol)-1 :
+      url.lastIndexOf(key.symbol);
   });
+
   return symbols.reduce((prev, current) => (prev.index > current.index) ? prev : current);
 }
 
+const isSecondLastCharADelimiter = (prevCharacter: string): boolean => {
+  const symbols = Object.values(delimiters);
+  let isSecondLastCharDelimiter = false;
+  for(const symbol of symbols ){
+    if(prevCharacter === symbol.symbol){
+      isSecondLastCharDelimiter = true;
+      break;
+    }
+  }
+  return isSecondLastCharDelimiter;
+}
+
 export { delimiters, getLastDelimiterInUrl }