Fix completion at beginning and in partial words

Fixes completion at beginning of file by removing a check on abs_position and
by excluding 'QualifiedName' from the results of a completion.

Fixes completion in partial words by replacing remove_char with
remove_word. Leaves remove_char in as a final option for '$facts['
completion

Author: austb

server/lib/puppet-languageserver/completion_provider.rb

@@ -4,7 +4,7 @@ def self.complete(content, line_num, char_num)
       items = []
       incomplete = false
 
-      item = PuppetLanguageServer::PuppetParserHelper.object_under_cursor(content, line_num, char_num, true)
+      item = PuppetLanguageServer::PuppetParserHelper.object_under_cursor(content, line_num, char_num, true, [Puppet::Pops::Model::QualifiedName])
 
       if item.nil?
         # We are in the root of the document.

server/lib/puppet-languageserver/puppet_parser_helper.rb

@@ -1,15 +1,28 @@
 module PuppetLanguageServer
   module PuppetParserHelper
-    def self.remove_char_at(content, line_offsets, line_num, char_num)
+    def self.remove_chars_starting_at(content, line_offsets, line_num, char_num, num_chars_to_remove)
       line_offset = line_offsets[line_num]
       raise if line_offset.nil?
 
       # Remove the offending character
-      new_content = content.slice(0, line_offset + char_num - 1) + content.slice(line_offset + char_num, content.length - 1)
+      new_content = content.slice(0, line_offset + char_num - num_chars_to_remove) + content.slice(line_offset + char_num, content.length - num_chars_to_remove)
 
       new_content
     end
 
+    def self.remove_char_at(content, line_offsets, line_num, char_num)
+      remove_chars_starting_at(content, line_offsets, line_num, char_num, 1)
+    end
+
+    def self.get_char_at(content, line_offsets, line_num, char_num)
+      line_offset = line_offsets[line_num]
+      raise if line_offset.nil?
+
+      absolute_offset = line_offset + (char_num - 1)
+
+      content[absolute_offset]
+    end
+
     def self.insert_text_at(content, line_offsets, line_num, char_num, text)
       # Insert text after where the cursor is
       # This helps due to syntax errors like `$facts[]` or `ensure =>`
@@ -43,7 +56,7 @@ def self.get_line_at(content, line_offsets, line_num)
       end
     end
 
-    def self.object_under_cursor(content, line_num, char_num, multiple_attempts = false)
+    def self.object_under_cursor(content, line_num, char_num, multiple_attempts = false, disallowed_classes = [])
       # Use Puppet to generate the AST
       parser = Puppet::Pops::Parser::Parser.new
 
@@ -53,14 +66,25 @@ def self.object_under_cursor(content, line_num, char_num, multiple_attempts = fa
 
       result = nil
       move_offset = 0
-      %i[noop remove_char try_quotes try_quotes_and_comma].each do |method|
+      %i[noop remove_word try_quotes try_quotes_and_comma remove_char].each do |method|
         new_content = nil
         case method
         when :noop
           new_content = content
         when :remove_char
           new_content = remove_char_at(content, line_offsets, line_num, char_num)
           move_offset = -1
+        when :remove_word
+          next_char = get_char_at(content, line_offsets, line_num, char_num)
+
+          while /[[:word:]]/.match(next_char)
+            move_offset -= 1
+            next_char = get_char_at(content, line_offsets, line_num, char_num + move_offset)
+
+            break if char_num + move_offset < 0
+          end
+
+          new_content = remove_chars_starting_at(content, line_offsets, line_num, char_num, -move_offset)
         when :try_quotes
           # Perhaps try inserting double quotes.  Useful in empty arrays or during variable assignment
           # Grab the line up to the cursor character + 1
@@ -98,7 +122,7 @@ def self.object_under_cursor(content, line_num, char_num, multiple_attempts = fa
       #   If during paring we modified the source we may need to change the cursor location
       abs_offset = result.line_offsets[line_num] + char_num + move_offset
       # Typically we're completing after something was typed, so go back one char
-      abs_offset -= 1 if abs_offset > 0
+      abs_offset -= 1
 
       # Enumerate the AST looking for items that span the line/char we want.
       # Once we have all valid items, sort them by the smallest span.  Typically the smallest span
@@ -107,7 +131,7 @@ def self.object_under_cursor(content, line_num, char_num, multiple_attempts = fa
       # TODO: Should probably walk the AST and only look for the deepest child, but integer sorting
       #       is so much easier and faster.
       valid_models = result.model.eAllContents.select do |item|
-        !item.offset.nil? && !item.length.nil? && abs_offset >= item.offset && abs_offset <= item.offset + item.length
+        !item.offset.nil? && !item.length.nil? && abs_offset >= item.offset && abs_offset <= item.offset + item.length && !disallowed_classes.include?(item.class)
       end
       valid_models.sort! { |a, b| a.length - b.length }
 

server/spec/integration/puppet-languageserver/completion_provider_spec.rb

@@ -36,19 +36,20 @@ class Alice {
       }
 
       describe "When inside the root of the manifest" do
-        let(:line_num) { 8 }
         let(:char_num) { 0 }
         let(:expected_types) { ['keyword','resource_type','function'] }
 
-        it 'should return a list of keyword, resource_type, function' do
-          result = subject.complete(content, line_num, char_num)
+        [0, 8].each do |line_num|
+          it "should return a list of keyword, resource_type, function regardless of cursor location (Testing line #{line_num})" do
+            result = subject.complete(content, line_num, char_num)
 
-          result['items'].each do |item|
-            expect(item).to be_completion_item_with_type(expected_types)
-          end
+            result['items'].each do |item|
+              expect(item).to be_completion_item_with_type(expected_types)
+            end
 
-          expected_types.each do |typename|
-            expect(number_of_completion_item_with_type(result,typename)).to be > 0
+            expected_types.each do |typename|
+              expect(number_of_completion_item_with_type(result,typename)).to be > 0
+            end
           end
         end
       end
@@ -90,6 +91,60 @@ class Alice {
       end
     end
 
+    context "Given a simple manifest mid-typing" do
+      let(:content_empty) { <<-EOT
+c
+EOT
+      }
+
+      let(:content_simple) { <<-EOT
+user { 'Charlie':
+
+  ensure => 'present',
+  name   => 'name',
+}
+
+r
+EOT
+      }
+
+      describe "When typing inside the root of an empty manifest" do
+        let(:line_num) { 0 }
+        let(:char_num) { 1 }
+        let(:expected_types) { ['keyword','resource_type','function'] }
+
+        it "should return a list of keyword, resource_type, function" do
+          result = subject.complete(content_empty, line_num, char_num)
+
+          result['items'].each do |item|
+            expect(item).to be_completion_item_with_type(expected_types)
+          end
+
+          expected_types.each do |typename|
+            expect(number_of_completion_item_with_type(result,typename)).to be > 0
+          end
+        end
+      end
+
+      describe "When typing inside the root of a non-empty manifest" do
+        let(:line_num) { 6 }
+        let(:char_num) { 1 }
+        let(:expected_types) { ['keyword','resource_type','function'] }
+
+        it "should return a list of keyword, resource_type, function" do
+          result = subject.complete(content_simple, line_num, char_num)
+
+          result['items'].each do |item|
+            expect(item).to be_completion_item_with_type(expected_types)
+          end
+
+          expected_types.each do |typename|
+            expect(number_of_completion_item_with_type(result,typename)).to be > 0
+          end
+        end
+      end
+    end
+
     context '$facts variable' do
       describe "With newlines at the beginning of the document and inside the brackets of $facts" do
         let(:content) { <<-EOT