Merge pull request #273 from glennsarti/spike-fix-broken-stuff

(GH-272) Puppet Lint and document symbol sometimes not working

Author: jpogran

lib/puppet-languageserver/manifest/document_symbol_provider.rb

@@ -176,7 +176,7 @@ def self.recurse_document_symbols(object, path, parentsymbol, symbollist)
               'selectionRange' => create_range(param.offset, param.length, param.locator),
               'children'       => []
             )
-            this_symbol['children'].push(param_symbol)
+            this_symbol.children.push(param_symbol)
           end
 
         when 'Puppet::Pops::Model::AssignmentExpression'
@@ -209,7 +209,7 @@ def self.recurse_document_symbols(object, path, parentsymbol, symbollist)
               'selectionRange' => create_range(param.offset, param.length, param.locator),
               'children'       => []
             )
-            this_symbol['children'].push(param_symbol)
+            this_symbol.children.push(param_symbol)
           end
         end
 

lib/puppet-languageserver/manifest/validation_provider.rb

@@ -45,7 +45,12 @@ def self.validate(session_state, content, options = {})
         if module_root.nil?
           linter_options = PuppetLint::OptParser.build
         else
-          Dir.chdir(module_root.to_s) { linter_options = PuppetLint::OptParser.build }
+          begin
+            Dir.chdir(module_root.to_s) { linter_options = PuppetLint::OptParser.build }
+          rescue OptionParser::InvalidOption => e
+            PuppetLanguageServer.log_message(:error, "(#{name}) Error reading Puppet Lint configuration.  Using default: #{e}")
+            linter_options = PuppetLint::OptParser.build
+          end
         end
         linter_options.parse!([])