@@ -21,6 +21,7 @@ import { LanguageConfiguration } from 'vs/editor/common/modes/languageConfigurat
2121import { IHeapService } from './mainThreadHeapService' ;
2222import { IModeService } from 'vs/editor/common/services/modeService' ;
2323import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers' ;
24+ import { toLanguageSelector } from 'vs/workbench/api/node/extHostTypeConverters' ;
2425
2526@extHostNamedCustomer ( MainContext . MainThreadLanguageFeatures )
2627export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesShape {
@@ -58,7 +59,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
5859 // --- outline
5960
6061 $registerOutlineSupport ( handle : number , selector : vscode . DocumentSelector ) : TPromise < any > {
61- this . _registrations [ handle ] = modes . DocumentSymbolProviderRegistry . register ( selector , < modes . DocumentSymbolProvider > {
62+ this . _registrations [ handle ] = modes . DocumentSymbolProviderRegistry . register ( toLanguageSelector ( selector ) , < modes . DocumentSymbolProvider > {
6263 provideDocumentSymbols : ( model : IReadOnlyModel , token : CancellationToken ) : Thenable < modes . SymbolInformation [ ] > => {
6364 return wireCancellationToken ( token , this . _proxy . $provideDocumentSymbols ( handle , model . uri ) ) ;
6465 }
@@ -85,7 +86,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
8586 provider . onDidChange = emitter . event ;
8687 }
8788
88- this . _registrations [ handle ] = modes . CodeLensProviderRegistry . register ( selector , provider ) ;
89+ this . _registrations [ handle ] = modes . CodeLensProviderRegistry . register ( toLanguageSelector ( selector ) , provider ) ;
8990 return undefined ;
9091 }
9192
@@ -100,7 +101,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
100101 // --- declaration
101102
102103 $registerDeclaractionSupport ( handle : number , selector : vscode . DocumentSelector ) : TPromise < any > {
103- this . _registrations [ handle ] = modes . DefinitionProviderRegistry . register ( selector , < modes . DefinitionProvider > {
104+ this . _registrations [ handle ] = modes . DefinitionProviderRegistry . register ( toLanguageSelector ( selector ) , < modes . DefinitionProvider > {
104105 provideDefinition : ( model , position , token ) : Thenable < modes . Definition > => {
105106 return wireCancellationToken ( token , this . _proxy . $provideDefinition ( handle , model . uri , position ) ) ;
106107 }
@@ -109,7 +110,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
109110 }
110111
111112 $registerImplementationSupport ( handle : number , selector : vscode . DocumentSelector ) : TPromise < any > {
112- this . _registrations [ handle ] = modes . ImplementationProviderRegistry . register ( selector , < modes . ImplementationProvider > {
113+ this . _registrations [ handle ] = modes . ImplementationProviderRegistry . register ( toLanguageSelector ( selector ) , < modes . ImplementationProvider > {
113114 provideImplementation : ( model , position , token ) : Thenable < modes . Definition > => {
114115 return wireCancellationToken ( token , this . _proxy . $provideImplementation ( handle , model . uri , position ) ) ;
115116 }
@@ -118,7 +119,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
118119 }
119120
120121 $registerTypeDefinitionSupport ( handle : number , selector : vscode . DocumentSelector ) : TPromise < any > {
121- this . _registrations [ handle ] = modes . TypeDefinitionProviderRegistry . register ( selector , < modes . TypeDefinitionProvider > {
122+ this . _registrations [ handle ] = modes . TypeDefinitionProviderRegistry . register ( toLanguageSelector ( selector ) , < modes . TypeDefinitionProvider > {
122123 provideTypeDefinition : ( model , position , token ) : Thenable < modes . Definition > => {
123124 return wireCancellationToken ( token , this . _proxy . $provideTypeDefinition ( handle , model . uri , position ) ) ;
124125 }
@@ -129,7 +130,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
129130 // --- extra info
130131
131132 $registerHoverProvider ( handle : number , selector : vscode . DocumentSelector ) : TPromise < any > {
132- this . _registrations [ handle ] = modes . HoverProviderRegistry . register ( selector , < modes . HoverProvider > {
133+ this . _registrations [ handle ] = modes . HoverProviderRegistry . register ( toLanguageSelector ( selector ) , < modes . HoverProvider > {
133134 provideHover : ( model : IReadOnlyModel , position : EditorPosition , token : CancellationToken ) : Thenable < modes . Hover > => {
134135 return wireCancellationToken ( token , this . _proxy . $provideHover ( handle , model . uri , position ) ) ;
135136 }
@@ -140,7 +141,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
140141 // --- occurrences
141142
142143 $registerDocumentHighlightProvider ( handle : number , selector : vscode . DocumentSelector ) : TPromise < any > {
143- this . _registrations [ handle ] = modes . DocumentHighlightProviderRegistry . register ( selector , < modes . DocumentHighlightProvider > {
144+ this . _registrations [ handle ] = modes . DocumentHighlightProviderRegistry . register ( toLanguageSelector ( selector ) , < modes . DocumentHighlightProvider > {
144145 provideDocumentHighlights : ( model : IReadOnlyModel , position : EditorPosition , token : CancellationToken ) : Thenable < modes . DocumentHighlight [ ] > => {
145146 return wireCancellationToken ( token , this . _proxy . $provideDocumentHighlights ( handle , model . uri , position ) ) ;
146147 }
@@ -151,7 +152,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
151152 // --- references
152153
153154 $registerReferenceSupport ( handle : number , selector : vscode . DocumentSelector ) : TPromise < any > {
154- this . _registrations [ handle ] = modes . ReferenceProviderRegistry . register ( selector , < modes . ReferenceProvider > {
155+ this . _registrations [ handle ] = modes . ReferenceProviderRegistry . register ( toLanguageSelector ( selector ) , < modes . ReferenceProvider > {
155156 provideReferences : ( model : IReadOnlyModel , position : EditorPosition , context : modes . ReferenceContext , token : CancellationToken ) : Thenable < modes . Location [ ] > => {
156157 return wireCancellationToken ( token , this . _proxy . $provideReferences ( handle , model . uri , position , context ) ) ;
157158 }
@@ -162,7 +163,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
162163 // --- quick fix
163164
164165 $registerQuickFixSupport ( handle : number , selector : vscode . DocumentSelector ) : TPromise < any > {
165- this . _registrations [ handle ] = modes . CodeActionProviderRegistry . register ( selector , < modes . CodeActionProvider > {
166+ this . _registrations [ handle ] = modes . CodeActionProviderRegistry . register ( toLanguageSelector ( selector ) , < modes . CodeActionProvider > {
166167 provideCodeActions : ( model : IReadOnlyModel , range : EditorRange , token : CancellationToken ) : Thenable < ( modes . Command | modes . CodeAction ) [ ] > => {
167168 return this . _heapService . trackRecursive ( wireCancellationToken ( token , this . _proxy . $provideCodeActions ( handle , model . uri , range ) ) ) ;
168169 }
@@ -173,7 +174,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
173174 // --- formatting
174175
175176 $registerDocumentFormattingSupport ( handle : number , selector : vscode . DocumentSelector ) : TPromise < any > {
176- this . _registrations [ handle ] = modes . DocumentFormattingEditProviderRegistry . register ( selector , < modes . DocumentFormattingEditProvider > {
177+ this . _registrations [ handle ] = modes . DocumentFormattingEditProviderRegistry . register ( toLanguageSelector ( selector ) , < modes . DocumentFormattingEditProvider > {
177178 provideDocumentFormattingEdits : ( model : IReadOnlyModel , options : modes . FormattingOptions , token : CancellationToken ) : Thenable < ISingleEditOperation [ ] > => {
178179 return wireCancellationToken ( token , this . _proxy . $provideDocumentFormattingEdits ( handle , model . uri , options ) ) ;
179180 }
@@ -182,7 +183,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
182183 }
183184
184185 $registerRangeFormattingSupport ( handle : number , selector : vscode . DocumentSelector ) : TPromise < any > {
185- this . _registrations [ handle ] = modes . DocumentRangeFormattingEditProviderRegistry . register ( selector , < modes . DocumentRangeFormattingEditProvider > {
186+ this . _registrations [ handle ] = modes . DocumentRangeFormattingEditProviderRegistry . register ( toLanguageSelector ( selector ) , < modes . DocumentRangeFormattingEditProvider > {
186187 provideDocumentRangeFormattingEdits : ( model : IReadOnlyModel , range : EditorRange , options : modes . FormattingOptions , token : CancellationToken ) : Thenable < ISingleEditOperation [ ] > => {
187188 return wireCancellationToken ( token , this . _proxy . $provideDocumentRangeFormattingEdits ( handle , model . uri , range , options ) ) ;
188189 }
@@ -191,7 +192,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
191192 }
192193
193194 $registerOnTypeFormattingSupport ( handle : number , selector : vscode . DocumentSelector , autoFormatTriggerCharacters : string [ ] ) : TPromise < any > {
194- this . _registrations [ handle ] = modes . OnTypeFormattingEditProviderRegistry . register ( selector , < modes . OnTypeFormattingEditProvider > {
195+ this . _registrations [ handle ] = modes . OnTypeFormattingEditProviderRegistry . register ( toLanguageSelector ( selector ) , < modes . OnTypeFormattingEditProvider > {
195196
196197 autoFormatTriggerCharacters,
197198
@@ -227,7 +228,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
227228 // --- rename
228229
229230 $registerRenameSupport ( handle : number , selector : vscode . DocumentSelector ) : TPromise < any > {
230- this . _registrations [ handle ] = modes . RenameProviderRegistry . register ( selector , < modes . RenameProvider > {
231+ this . _registrations [ handle ] = modes . RenameProviderRegistry . register ( toLanguageSelector ( selector ) , < modes . RenameProvider > {
231232 provideRenameEdits : ( model : IReadOnlyModel , position : EditorPosition , newName : string , token : CancellationToken ) : Thenable < modes . WorkspaceEdit > => {
232233 return wireCancellationToken ( token , this . _proxy . $provideRenameEdits ( handle , model . uri , position , newName ) ) ;
233234 }
@@ -239,7 +240,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
239240
240241 $registerSuggestSupport ( handle : number , selector : vscode . DocumentSelector , triggerCharacters : string [ ] , supportsResolveDetails : boolean ) : TPromise < any > {
241242
242- this . _registrations [ handle ] = modes . SuggestRegistry . register ( selector , < modes . ISuggestSupport > {
243+ this . _registrations [ handle ] = modes . SuggestRegistry . register ( toLanguageSelector ( selector ) , < modes . ISuggestSupport > {
243244 triggerCharacters,
244245 provideCompletionItems : ( model : IReadOnlyModel , position : EditorPosition , context : modes . SuggestContext , token : CancellationToken ) : Thenable < modes . ISuggestResult > => {
245246 return wireCancellationToken ( token , this . _proxy . $provideCompletionItems ( handle , model . uri , position , context ) ) . then ( result => {
@@ -263,7 +264,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
263264 // --- parameter hints
264265
265266 $registerSignatureHelpProvider ( handle : number , selector : vscode . DocumentSelector , triggerCharacter : string [ ] ) : TPromise < any > {
266- this . _registrations [ handle ] = modes . SignatureHelpProviderRegistry . register ( selector , < modes . SignatureHelpProvider > {
267+ this . _registrations [ handle ] = modes . SignatureHelpProviderRegistry . register ( toLanguageSelector ( selector ) , < modes . SignatureHelpProvider > {
267268
268269 signatureHelpTriggerCharacters : triggerCharacter ,
269270
@@ -278,7 +279,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
278279 // --- links
279280
280281 $registerDocumentLinkProvider ( handle : number , selector : vscode . DocumentSelector ) : TPromise < any > {
281- this . _registrations [ handle ] = modes . LinkProviderRegistry . register ( selector , < modes . LinkProvider > {
282+ this . _registrations [ handle ] = modes . LinkProviderRegistry . register ( toLanguageSelector ( selector ) , < modes . LinkProvider > {
282283 provideLinks : ( model , token ) => {
283284 return this . _heapService . trackRecursive ( wireCancellationToken ( token , this . _proxy . $provideDocumentLinks ( handle , model . uri ) ) ) ;
284285 } ,
@@ -293,7 +294,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
293294
294295 $registerDocumentColorProvider ( handle : number , selector : vscode . DocumentSelector ) : TPromise < any > {
295296 const proxy = this . _proxy ;
296- this . _registrations [ handle ] = modes . ColorProviderRegistry . register ( selector , < modes . DocumentColorProvider > {
297+ this . _registrations [ handle ] = modes . ColorProviderRegistry . register ( toLanguageSelector ( selector ) , < modes . DocumentColorProvider > {
297298 provideDocumentColors : ( model , token ) => {
298299 return wireCancellationToken ( token , proxy . $provideDocumentColors ( handle , model . uri ) )
299300 . then ( documentColors => {
0 commit comments