@@ -13,16 +13,14 @@ import { shouldChangeFromCToCpp } from './utils';
1313
1414export function createProtocolFilter ( ) : Middleware {
1515 // Disabling lint for invoke handlers
16- const defaultHandler : ( data : any , callback : ( data : any ) => Promise < void > ) => Promise < void > = async ( data , callback : ( data : any ) => void ) => { clients . ActiveClient . notifyWhenLanguageClientReady ( ( ) => callback ( data ) ) ; } ;
17- // const invoke1 = async (a: any, next: (a: any) => any) => { await clients.ActiveClient.awaitUntilLanguageClientReady(); return next(a); };
16+ const invoke1 = async ( a : any , next : ( a : any ) => any ) => { await clients . ActiveClient . awaitUntilLanguageClientReady ( ) ; return next ( a ) ; } ;
1817 const invoke2 = async ( a : any , b : any , next : ( a : any , b : any ) => any ) => { await clients . ActiveClient . awaitUntilLanguageClientReady ( ) ; return next ( a , b ) ; } ;
1918 const invoke3 = async ( a : any , b : any , c : any , next : ( a : any , b : any , c : any ) => any ) => { await clients . ActiveClient . awaitUntilLanguageClientReady ( ) ; return next ( a , b , c ) ; } ;
20- const invoke4 = async ( a : any , b : any , c : any , d : any , next : ( a : any , b : any , c : any , d : any ) => any ) => { await clients . ActiveClient . awaitUntilLanguageClientReady ( ) ; return next ( a , b , c , d ) ; } ;
21- // const invoke5 = async (a: any, b: any, c: any, d: any, e: any, next: (a: any, b: any, c: any, d: any, e: any) => any) => { await clients.ActiveClient.awaitUntilLanguageClientReady(); return next(a, b, c, d, e); };
22- /* tslint:enable */
19+ const invoke4 = async ( a : any , b : any , c : any , d : any , next : ( a : any , b : any , c : any , d : any ) => any ) => { await clients . ActiveClient . awaitUntilLanguageClientReady ( ) ; return next ( a , b , c , d ) ; } ; /* tslint:enable */
2320
2421 return {
2522 didOpen : async ( document , sendMessage ) => {
23+ await clients . ActiveClient . awaitUntilLanguageClientReady ( ) ;
2624 const editor : vscode . TextEditor | undefined = vscode . window . visibleTextEditors . find ( e => e . document === document ) ;
2725 if ( editor ) {
2826 // If the file was visible editor when we were activated, we will not get a call to
@@ -34,28 +32,22 @@ export function createProtocolFilter(): Middleware {
3432 clients . timeTelemetryCollector . setDidOpenTime ( document . uri ) ;
3533 if ( clients . checkOwnership ( me , document ) ) {
3634 me . TrackedDocuments . add ( document ) ;
37- const finishDidOpen = ( doc : vscode . TextDocument ) => {
38- me . provideCustomConfiguration ( doc . uri , undefined ) ;
39- sendMessage ( doc ) ;
35+ const finishDidOpen = async ( doc : vscode . TextDocument ) => {
36+ await me . provideCustomConfiguration ( doc . uri , undefined ) ;
37+ await sendMessage ( doc ) ;
4038 me . onDidOpenTextDocument ( doc ) ;
4139 if ( editor && editor === vscode . window . activeTextEditor ) {
4240 onDidChangeActiveTextEditor ( editor ) ;
4341 }
4442 } ;
45- let languageChanged : boolean = false ;
4643 if ( document . languageId === "c" && shouldChangeFromCToCpp ( document ) ) {
4744 const baesFileName : string = path . basename ( document . fileName ) ;
4845 const mappingString : string = baesFileName + "@" + document . fileName ;
4946 me . addFileAssociations ( mappingString , "cpp" ) ;
5047 me . sendDidChangeSettings ( ) ;
51- vscode . languages . setTextDocumentLanguage ( document , "cpp" ) . then ( ( newDoc : vscode . TextDocument ) => {
52- finishDidOpen ( newDoc ) ;
53- } ) ;
54- languageChanged = true ;
55- }
56- if ( ! languageChanged ) {
57- finishDidOpen ( document ) ;
48+ document = await vscode . languages . setTextDocumentLanguage ( document , "cpp" ) ;
5849 }
50+ await finishDidOpen ( document ) ;
5951 }
6052 }
6153 } else {
@@ -69,47 +61,49 @@ export function createProtocolFilter(): Middleware {
6961 }
7062 } ,
7163 didChange : async ( textDocumentChangeEvent , sendMessage ) => {
64+ await clients . ActiveClient . awaitUntilLanguageClientReady ( ) ;
7265 const me : Client = clients . getClientFor ( textDocumentChangeEvent . document . uri ) ;
7366 me . onDidChangeTextDocument ( textDocumentChangeEvent ) ;
74- sendMessage ( textDocumentChangeEvent ) ;
67+ await sendMessage ( textDocumentChangeEvent ) ;
7568 } ,
76- willSave : defaultHandler ,
69+ willSave : invoke1 ,
7770 willSaveWaitUntil : async ( event , sendMessage ) => {
71+ // await clients.ActiveClient.awaitUntilLanguageClientReady();
72+ // Don't use awaitUntilLanguageClientReady.
73+ // Otherwise, the message can be delayed too long.
7874 const me : Client = clients . getClientFor ( event . document . uri ) ;
7975 if ( me . TrackedDocuments . has ( event . document ) ) {
80- // Don't use me.requestWhenReady or notifyWhenLanguageClientReady;
81- // otherwise, the message can be delayed too long.
8276 return sendMessage ( event ) ;
8377 }
84- return Promise . resolve ( [ ] ) ;
78+ return [ ] ;
8579 } ,
86- didSave : defaultHandler ,
80+ didSave : invoke1 ,
8781 didClose : async ( document , sendMessage ) => {
82+ await clients . ActiveClient . awaitUntilLanguageClientReady ( ) ;
8883 const me : Client = clients . getClientFor ( document . uri ) ;
8984 if ( me . TrackedDocuments . has ( document ) ) {
9085 me . onDidCloseTextDocument ( document ) ;
9186 me . TrackedDocuments . delete ( document ) ;
92- sendMessage ( document ) ;
87+ await sendMessage ( document ) ;
9388 }
9489 } ,
95-
9690 provideCompletionItem : invoke4 ,
9791 resolveCompletionItem : invoke2 ,
98- provideHover : ( document , position , token , next : ( document : any , position : any , token : any ) => any ) => {
92+ provideHover : async ( document , position , token , next : ( document : any , position : any , token : any ) => any ) => {
93+ await clients . ActiveClient . awaitUntilLanguageClientReady ( ) ;
9994 const me : Client = clients . getClientFor ( document . uri ) ;
100- if ( clients . checkOwnership ( me , document ) ) {
101- return clients . ActiveClient . requestWhenReady ( ( ) => next ( document , position , token ) ) ;
95+ if ( me . TrackedDocuments . has ( document ) ) {
96+ return next ( document , position , token ) ;
10297 }
10398 return null ;
10499 } ,
105100 provideSignatureHelp : invoke4 ,
106101 provideDefinition : invoke3 ,
107102 provideReferences : invoke4 ,
108103 provideDocumentHighlights : invoke3 ,
109- provideDeclaration : invoke3
110- // I believe the default handler will do the same thing.
111- // workspace: {
112- // didChangeConfiguration: (sections, sendMessage) => sendMessage(sections)
113- // }
104+ provideDeclaration : invoke3 ,
105+ workspace : {
106+ didChangeConfiguration : invoke1
107+ }
114108 } ;
115109}
0 commit comments