Skip to content

Commit 536ea46

Browse files
authored
Implemented fix for first parameter being a substring of the second p… (microsoft#106432)
* Implemented fix for first parameter being a substring of the second parameter * Addressed PR concern * Included edge cases * Changed to regex expression * Accounted for edge case * Added regex escaping
1 parent 6781d16 commit 536ea46

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

‎src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { IOpenerService } from 'vs/platform/opener/common/opener';
2222
import { editorHoverBackground, editorHoverBorder, textCodeBlockBackground, textLinkForeground, editorHoverForeground } from 'vs/platform/theme/common/colorRegistry';
2323
import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
2424
import { ParameterHintsModel, TriggerContext } from 'vs/editor/contrib/parameterHints/parameterHintsModel';
25-
import { pad } from 'vs/base/common/strings';
25+
import { pad, escapeRegExpCharacters } from 'vs/base/common/strings';
2626
import { registerIcon, Codicon } from 'vs/base/common/codicons';
2727
import { assertIsDefined } from 'vs/base/common/types';
2828
import { ColorScheme } from 'vs/platform/theme/common/theme';
@@ -312,9 +312,11 @@ export class ParameterHintsWidget extends Disposable implements IContentWidget {
312312
} else if (Array.isArray(param.label)) {
313313
return param.label;
314314
} else {
315-
const idx = signature.label.lastIndexOf(param.label);
315+
const regex = new RegExp(`\\b${escapeRegExpCharacters(param.label)}\\b`, 'g');
316+
regex.test(signature.label);
317+
const idx = regex.lastIndex - param.label.length;
316318
return idx >= 0
317-
? [idx, idx + param.label.length]
319+
? [idx, regex.lastIndex]
318320
: [0, 0];
319321
}
320322
}

0 commit comments

Comments
 (0)