Merge pull request #913 from savetheclocktower/fix-command-palette-ma…

…tch-highlighting [command-palette] Guard against failure to highlight a match
pulsar-edit · Feb 9, 2024 · 732d1d4 · 732d1d4
2 parents d1bb4c2 + 7dbbd7a
commit 732d1d4
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/packages/command-palette/lib/command-palette-view.js b/packages/command-palette/lib/command-palette-view.js
@@ -135,8 +135,9 @@ export default class CommandPaletteView {
   highlightMatchesInElement (text, query, el) {
     const matches = atom.ui.fuzzyMatcher.match(text, query, {recordMatchIndexes: true})
     let matchedChars = []
-    let lastIndex = 0
-    matches.matchIndexes.forEach(matchIndex => {
+    let lastIndex = 0;
+    const matchIndexes = matches ? (matches.matchIndexes ?? []) : []
+    matchIndexes.forEach(matchIndex => {
       const unmatched = text.substring(lastIndex, matchIndex)
       if (unmatched) {
         if (matchedChars.length > 0) {