@@ -56,12 +56,14 @@ export class ParameterHintsModel extends Disposable {
56
56
57
57
private readonly editor : ICodeEditor ;
58
58
private readonly providers : LanguageFeatureRegistry < languages . SignatureHelpProvider > ;
59
+
59
60
private triggerOnType = false ;
60
61
private _state : ParameterHintState . State = ParameterHintState . Default ;
61
62
private _pendingTriggers : TriggerContext [ ] = [ ] ;
63
+
62
64
private readonly _lastSignatureHelpResult = this . _register ( new MutableDisposable < languages . SignatureHelpResult > ( ) ) ;
63
- private triggerChars = new CharacterSet ( ) ;
64
- private retriggerChars = new CharacterSet ( ) ;
65
+ private readonly triggerChars = new CharacterSet ( ) ;
66
+ private readonly retriggerChars = new CharacterSet ( ) ;
65
67
66
68
private readonly throttledDelayer : Delayer < boolean > ;
67
69
private triggerId = 0 ;
@@ -248,9 +250,8 @@ export class ParameterHintsModel extends Disposable {
248
250
private onModelChanged ( ) : void {
249
251
this . cancel ( ) ;
250
252
251
- // Update trigger characters
252
- this . triggerChars = new CharacterSet ( ) ;
253
- this . retriggerChars = new CharacterSet ( ) ;
253
+ this . triggerChars . clear ( ) ;
254
+ this . retriggerChars . clear ( ) ;
254
255
255
256
const model = this . editor . getModel ( ) ;
256
257
if ( ! model ) {
@@ -259,14 +260,19 @@ export class ParameterHintsModel extends Disposable {
259
260
260
261
for ( const support of this . providers . ordered ( model ) ) {
261
262
for ( const ch of support . signatureHelpTriggerCharacters || [ ] ) {
262
- this . triggerChars . add ( ch . charCodeAt ( 0 ) ) ;
263
+ if ( ch . length ) {
264
+ const charCode = ch . charCodeAt ( 0 ) ;
265
+ this . triggerChars . add ( charCode ) ;
263
266
264
- // All trigger characters are also considered retrigger characters
265
- this . retriggerChars . add ( ch . charCodeAt ( 0 ) ) ;
267
+ // All trigger characters are also considered retrigger characters
268
+ this . retriggerChars . add ( charCode ) ;
269
+ }
266
270
}
267
271
268
272
for ( const ch of support . signatureHelpRetriggerCharacters || [ ] ) {
269
- this . retriggerChars . add ( ch . charCodeAt ( 0 ) ) ;
273
+ if ( ch . length ) {
274
+ this . retriggerChars . add ( ch . charCodeAt ( 0 ) ) ;
275
+ }
270
276
}
271
277
}
272
278
}
0 commit comments