Merge pull request #101 from glennsarti/fix-function-loading

(GH-98) Fix function and type loading initial fix

Author: austb

server/lib/puppet-languageserver.rb

@@ -118,11 +118,7 @@ def self.init_puppet(options)
   end
 
   def self.init_puppet_worker(options)
-    Puppet.initialize_settings
-
-    log_message(:info, 'Creating puppet function environment...')
-    autoloader = Puppet::Parser::Functions.autoloader
-    autoloader.loadall
+    options[:puppet_settings].nil? ? Puppet.initialize_settings : Puppet.initialize_settings(options[:puppet_settings])
 
     log_message(:info, "Using Facter v#{Facter.version}")
     if options[:preload_puppet]

server/lib/puppet-languageserver/facter_helper.rb

@@ -39,6 +39,7 @@ def self._load_facts
       _reset
       Facter.loadfacts
       @fact_hash = Facter.to_hash
+      PuppetLanguageServer.log_message(:debug, "[FacterHelper::_load_facts] Finished loading #{@fact_hash.keys.count} facts")
     end
     private_class_method :_load_facts
   end

server/lib/puppet-languageserver/puppet_helper.rb

@@ -10,8 +10,10 @@ module PuppetHelper
     @function_module = nil
 
     def self.reset
-      @ops_lock.synchronize do
-        _reset
+      @ops_lock_types.synchronize do
+        @ops_lock_funcs.synchronize do
+          _reset
+        end
       end
     end
 
@@ -60,7 +62,7 @@ def self.type_names
     # Functions
     def self.load_functions
       @ops_lock_funcs.synchronize do
-        _load_functions
+        _load_functions if @function_module.nil?
       end
     end
 
@@ -119,8 +121,17 @@ def self._load_types
       @types_hash = {}
       # This is an expensive call
       # From https://github.com/puppetlabs/puppet/blob/ebd96213cab43bb2a8071b7ac0206c3ed0be8e58/lib/puppet/metatype/manager.rb#L182-L189
-      typeloader = Puppet::Util::Autoload.new(self, 'puppet/type')
-      typeloader.loadall
+
+      autoloader = Puppet::Util::Autoload.new(self, 'puppet/type')
+      autoloader.files_to_load.each do |file|
+        name = file.gsub(autoloader.path + '/','')
+        begin
+          result = autoloader.load(name)
+          PuppetLanguageServer.log_message(:error, "[PuppetHelper::_load_types] type #{file} did not load") unless result
+        rescue StandardError => err
+          PuppetLanguageServer.log_message(:error, "[PuppetHelper::_load_types] Error loading type #{file}: #{err}")
+        end unless autoloader.loaded?(name)
+      end
 
       Puppet::Type.eachtype do |type|
         next if type.name == :component
@@ -129,16 +140,31 @@ def self._load_types
         @types_hash[type.name] = type
       end
 
+      type_count = @types_hash.count
+      PuppetLanguageServer.log_message(:debug, "[PuppetHelper::_load_types] Finished loading #{type_count} types")
+
       nil
     end
     private_class_method :_load_types
 
     def self._load_functions
       autoloader = Puppet::Parser::Functions.autoloader
-      autoloader.loadall
+
+      # This is an expensive call
+      autoloader.files_to_load.each do |file|
+        name = file.gsub(autoloader.path + '/','')
+        begin
+          result = autoloader.load(name)
+          PuppetLanguageServer.log_message(:error, "[PuppetHelper::_load_functions] function #{file} did not load") unless result
+        rescue StandardError => err
+          PuppetLanguageServer.log_message(:error, "[PuppetHelper::_load_functions] Error loading function #{file}: #{err}")
+        end unless autoloader.loaded?(name)
+      end
 
       @function_module = Puppet::Parser::Functions.environment_module(Puppet.lookup(:current_environment))
 
+      function_count = @function_module.all_function_info.keys.map(&:to_s).count
+      PuppetLanguageServer.log_message(:debug, "[PuppetHelper::_load_functions] Finished loading #{function_count} functions")
       nil
     end
     private_class_method :_load_functions

server/spec/fixtures/cache/facts.d/.gitkeep

@@ -0,0 +1,10 @@
+require 'a_bad_gem_that_does_not_exist'
+
+module Puppet::Parser::Functions
+  newfunction(:bad_file, :type => :rvalue, :doc => <<-EOS
+Function that will fail loading
+    EOS
+  ) do |arguments|
+    # Do nothing
+  end
+end

server/spec/fixtures/cache/lib/facter/.gitkeep

@@ -0,0 +1,9 @@
+module Puppet::Parser::Functions
+  newfunction(:bad_function, :type => :rvalue, :doc => <<-EOS
+Function that will fail loading
+    EOS
+  ) do |arguments|
+
+    require 'a_bad_gem_that_does_not_exist'
+  end
+end

server/spec/fixtures/cache/lib/puppet/parser/functions/badfile.rb

@@ -0,0 +1,41 @@
+#
+# concat.rb
+#
+
+module Puppet::Parser::Functions
+  newfunction(:concat, :type => :rvalue, :doc => <<-EOS
+Appends the contents of multiple arrays into array 1.
+
+*Example:*
+
+    concat(['1','2','3'],['4','5','6'],['7','8','9'])
+
+Would result in:
+
+  ['1','2','3','4','5','6','7','8','9']
+    EOS
+  ) do |arguments|
+
+    # Check that more than 2 arguments have been given ...
+    raise(Puppet::ParseError, "concat(): Wrong number of arguments " +
+      "given (#{arguments.size} for < 2)") if arguments.size < 2
+
+    a = arguments[0]
+
+    # Check that the first parameter is an array
+    unless a.is_a?(Array)
+      raise(Puppet::ParseError, 'concat(): Requires array to work with')
+    end
+
+    result = a
+    arguments.shift
+
+    arguments.each do |x|
+      result = result + (x.is_a?(Array) ? x : [x])
+    end
+
+    return result
+  end
+end
+
+# vim: set ts=2 sw=2 et :

server/spec/fixtures/cache/lib/puppet/parser/functions/badfunction.rb

@@ -0,0 +1,7 @@
+# Text fixture puppet.conf which redirects all Puppet configuration into the
+# fixtures directory
+[main]
+environment = test-fixtures
+environmentpath = $codedir/environments
+codedir = $vardir/..
+logdir = $vardir/../logdir