File tree Expand file tree Collapse file tree 4 files changed +12
-4
lines changed Expand file tree Collapse file tree 4 files changed +12
-4
lines changed Original file line number Diff line number Diff line change @@ -287,7 +287,10 @@ export class ConnectionManager implements IConnectionManager {
287287
288288 connectionManager . languageClient . sendRequest ( messages . PuppetVersionRequest . type ) . then ( ( versionDetails ) => {
289289 lastVersionResponse = versionDetails
290- if ( versionDetails . factsLoaded && versionDetails . functionsLoaded && versionDetails . typesLoaded ) {
290+ if ( versionDetails . factsLoaded &&
291+ versionDetails . functionsLoaded &&
292+ versionDetails . typesLoaded &&
293+ versionDetails . classesLoaded ) {
291294 clearInterval ( handle ) ;
292295 connectionManager . setConnectionStatus ( lastVersionResponse . puppetVersion , ConnectionStatus . Running ) ;
293296 resolve ( ) ;
@@ -297,7 +300,8 @@ export class ConnectionManager implements IConnectionManager {
297300 if ( versionDetails . factsLoaded ) { progress ++ ; }
298301 if ( versionDetails . functionsLoaded ) { progress ++ ; }
299302 if ( versionDetails . typesLoaded ) { progress ++ ; }
300- progress = Math . round ( progress / 3.0 * 100 ) ;
303+ if ( versionDetails . classesLoaded ) { progress ++ ; }
304+ progress = Math . round ( progress / 4.0 * 100 ) ;
301305
302306 this . setConnectionStatus ( "Loading Puppet (" + progress . toString ( ) + "%)" , ConnectionStatus . Starting ) ;
303307 }
Original file line number Diff line number Diff line change @@ -11,6 +11,7 @@ export interface PuppetVersionDetails {
1111 factsLoaded : boolean ;
1212 functionsLoaded : boolean ;
1313 typesLoaded : boolean ;
14+ classesLoaded : boolean ;
1415}
1516
1617export interface PuppetResourceRequestParams {
Original file line number Diff line number Diff line change @@ -7,6 +7,7 @@ module PuppetVersion
77 # factsLoaded: boolean;
88 # functionsLoaded: boolean;
99 # typesLoaded: boolean;
10+ # classesLoaded: boolean;
1011 # }
1112
1213 def self . create ( options )
@@ -20,7 +21,8 @@ def self.create(options)
2021 result [ 'factsLoaded' ] = options [ 'factsLoaded' ] unless options [ 'factsLoaded' ] . nil?
2122 result [ 'functionsLoaded' ] = options [ 'functionsLoaded' ] unless options [ 'functionsLoaded' ] . nil?
2223 result [ 'typesLoaded' ] = options [ 'typesLoaded' ] unless options [ 'typesLoaded' ] . nil?
23-
24+ result [ 'classesLoaded' ] = options [ 'classesLoaded' ] unless options [ 'classesLoaded' ] . nil?
25+
2426 result [ 'languageServerVersion' ] = PuppetVSCode . version
2527
2628 result
Original file line number Diff line number Diff line change @@ -101,7 +101,8 @@ def receive_request(request)
101101 'facterVersion' => Facter . version ,
102102 'factsLoaded' => PuppetLanguageServer ::FacterHelper . facts_loaded? ,
103103 'functionsLoaded' => PuppetLanguageServer ::PuppetHelper . functions_loaded? ,
104- 'typesLoaded' => PuppetLanguageServer ::PuppetHelper . types_loaded? ) )
104+ 'typesLoaded' => PuppetLanguageServer ::PuppetHelper . types_loaded? ,
105+ 'classesLoaded' => PuppetLanguageServer ::PuppetHelper . classes_loaded? ) )
105106
106107 when 'puppet/getResource'
107108 type_name = request . params [ 'typename' ]
You can’t perform that action at this time.
0 commit comments