File tree Expand file tree Collapse file tree 1 file changed +9
-9
lines changed Expand file tree Collapse file tree 1 file changed +9
-9
lines changed Original file line number Diff line number Diff line change @@ -195,7 +195,7 @@ impl State {
195
195
196
196
fn get_workspace_settings ( & self , root : & str ) -> Result < Value > {
197
197
if !self . loadSettings {
198
- return Ok ( json ! ( { } ) ) ;
198
+ return Ok ( Value :: Null ) ;
199
199
}
200
200
201
201
let buffer = read_to_string ( Path :: new ( root) . join ( self . settingsPath . clone ( ) ) ) ?;
@@ -2502,14 +2502,14 @@ impl State {
2502
2502
self . initialized ( & params) ?;
2503
2503
2504
2504
let root = self . roots . get ( & languageId) . cloned ( ) . unwrap_or_default ( ) ;
2505
- let settings = self . get_workspace_settings ( & root) ;
2506
- if let Err ( ref err ) = settings {
2507
- warn ! ( "Failed to get workspace settings: {}" , err ) ;
2508
- }
2509
- self . workspace_didChangeConfiguration ( & json ! ( {
2510
- VimVar :: LanguageId . to_key ( ) : languageId ,
2511
- "settings" : settings . unwrap_or_else ( |_| json! ( { } ) ) ,
2512
- } ) . to_params ( ) ? ) ? ;
2505
+ match self . get_workspace_settings ( & root) {
2506
+ Ok ( Value :: Null ) => ( ) ,
2507
+ Ok ( settings) => self . workspace_didChangeConfiguration ( & json ! ( {
2508
+ VimVar :: LanguageId . to_key ( ) : languageId ,
2509
+ "settings" : settings ,
2510
+ } ) . to_params ( ) ? ) ? ,
2511
+ Err ( err ) => warn ! ( "Failed to get workspace settings: {}" , err ) ,
2512
+ }
2513
2513
2514
2514
self . textDocument_didOpen ( & params) ?;
2515
2515
self . textDocument_didChange ( & params) ?;
You can’t perform that action at this time.
0 commit comments