@@ -115,58 +115,10 @@ export function legacySettings(): Map<string, Object> {
115115 let value : Object = undefined ;
116116
117117 // puppet.editorService.modulePath
118- value = getSafeWorkspaceConfig ( workspaceConfig , [ 'editorService' , 'modulePath' ] ) ;
119- if ( value !== undefined ) {
120- settings . set ( 'puppet.editorService.modulePath' , value ) ;
121- }
122-
123- // puppet.languageclient.minimumUserLogLevel
124- value = getSafeWorkspaceConfig ( workspaceConfig , [ 'languageclient' , 'minimumUserLogLevel' ] ) ;
125- if ( value !== undefined ) {
126- settings . set ( 'puppet.languageclient.minimumUserLogLevel' , value ) ;
127- }
128-
129- // puppet.languageclient.protocol
130- value = getSafeWorkspaceConfig ( workspaceConfig , [ 'languageclient' , 'protocol' ] ) ;
131- if ( value !== undefined ) {
132- settings . set ( 'puppet.languageclient.protocol' , value ) ;
133- }
134-
135- // puppet.languageserver.address
136- value = getSafeWorkspaceConfig ( workspaceConfig , [ 'languageserver' , 'address' ] ) ;
137- if ( value !== undefined ) {
138- settings . set ( 'puppet.languageserver.address' , value ) ;
139- }
140-
141- // puppet.languageserver.debugFilePath
142- value = getSafeWorkspaceConfig ( workspaceConfig , [ 'languageserver' , 'debugFilePath' ] ) ;
143- if ( value !== undefined ) {
144- settings . set ( 'puppet.languageserver.debugFilePath' , value ) ;
145- }
146-
147- // puppet.languageserver.filecache.enable
148- value = getSafeWorkspaceConfig ( workspaceConfig , [ 'languageserver' , 'filecache' , 'enable' ] ) ;
149- if ( value !== undefined ) {
150- settings . set ( 'puppet.languageserver.filecache.enable' , value ) ;
151- }
152-
153- // puppet.languageserver.port
154- value = getSafeWorkspaceConfig ( workspaceConfig , [ 'languageserver' , 'port' ] ) ;
155- if ( value !== undefined ) {
156- settings . set ( 'puppet.languageserver.port' , value ) ;
157- }
158-
159- // puppet.languageserver.timeout
160- value = getSafeWorkspaceConfig ( workspaceConfig , [ 'languageserver' , 'timeout' ] ) ;
161- if ( value !== undefined ) {
162- settings . set ( 'puppet.languageserver.timeout' , value ) ;
163- }
164-
165- // puppet.puppetAgentDir
166- value = getSafeWorkspaceConfig ( workspaceConfig , [ 'puppetAgentDir' ] ) ;
167- if ( value !== undefined ) {
168- settings . set ( 'puppet.puppetAgentDir' , value ) ;
169- }
118+ // value = getSafeWorkspaceConfig(workspaceConfig, ['editorService', 'modulePath']);
119+ // if (value !== undefined) {
120+ // settings.set('puppet.editorService.modulePath', value);
121+ // }
170122
171123 return settings ;
172124}
@@ -245,43 +197,9 @@ export function SettingsFromWorkspace(): ISettings {
245197 // Translate the legacy settings into the new setting names
246198 for ( const [ settingName , value ] of oldSettings ) {
247199 switch ( settingName ) {
248- case 'puppet.editorService.modulePath' : // --> puppet.editorService.puppet.modulePath
249- settings . editorService . puppet . modulePath = < string > value ;
250- break ;
251-
252- case 'puppet.languageclient.minimumUserLogLevel' : // --> puppet.editorService.loglevel
253- settings . editorService . loglevel = < string > value ;
254- break ;
255-
256- case 'puppet.languageclient.protocol' : // --> puppet.editorService.protocol
257- settings . editorService . protocol = < ProtocolType > value ;
258- break ;
259-
260- case 'puppet.languageserver.address' : // --> puppet.editorService.tcp.address
261- settings . editorService . tcp . address = < string > value ;
262- break ;
263-
264- case 'puppet.languageserver.debugFilePath' : // --> puppet.editorService.debugFilePath
265- settings . editorService . debugFilePath = < string > value ;
266- break ;
267-
268- case 'puppet.languageserver.filecache.enable' : // --> puppet.editorService.featureflags['filecache']
269- if ( value === true ) {
270- settings . editorService . featureFlags . push ( 'filecache' ) ;
271- }
272- break ;
273-
274- case 'puppet.languageserver.port' : // --> puppet.editorService.tcp.port
275- settings . editorService . tcp . port = < number > value ;
276- break ;
277-
278- case 'puppet.languageserver.timeout' : // --> puppet.editorService.timeout
279- settings . editorService . timeout = < number > value ;
280- break ;
281-
282- case 'puppet.puppetAgentDir' : // --> puppet.installDirectory
283- settings . installDirectory = < string > value ;
284- break ;
200+ // case 'puppet.puppetAgentDir': // --> puppet.installDirectory
201+ // settings.installDirectory = <string>value;
202+ // break;
285203 }
286204 }
287205
0 commit comments