Enable completion at trailing empty line near EOF

hashicorp · May 19, 2020 · a397452 · a397452
1 parent 906c368
commit a397452
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 8 deletions.
diff --git a/internal/hcl/hcl.go b/internal/hcl/hcl.go
@@ -52,8 +52,13 @@ func (f *file) blockAtPosition(pos hcllib.Pos) (*hcllib.Block, error) {
 		if body.SrcRange.Empty() && pos != hcllib.InitialPos {
 			return nil, &InvalidHclPosErr{pos, body.SrcRange}
 		}
-		if !body.SrcRange.Empty() && !body.SrcRange.ContainsPos(pos) {
-			return nil, &InvalidHclPosErr{pos, body.SrcRange}
+		if !body.SrcRange.Empty() {
+			if posIsEqual(body.SrcRange.End, pos) {
+				return nil, &NoBlockFoundErr{pos}
+			}
+			if !body.SrcRange.ContainsPos(pos) {
+				return nil, &InvalidHclPosErr{pos, body.SrcRange}
+			}
 		}
 	}
 
@@ -64,3 +69,9 @@ func (f *file) blockAtPosition(pos hcllib.Pos) (*hcllib.Block, error) {
 
 	return block, nil
 }
+
+func posIsEqual(a, b hcllib.Pos) bool {
+	return a.Byte == b.Byte &&
+		a.Column == b.Column &&
+		a.Line == b.Line
+}
diff --git a/internal/hcl/hcl_test.go b/internal/hcl/hcl_test.go
@@ -111,6 +111,20 @@ func TestFile_BlockAtPosition(t *testing.T) {
 			},
 			nil,
 		},
+		{
+			"valid config and EOF position",
+			`provider "aws" {
+
+}
+`,
+			hcl.Pos{
+				Line:   4,
+				Column: 1,
+				Byte:   20,
+			},
+			&NoBlockFoundErr{AtPos: hcl.Pos{Line: 4, Column: 1, Byte: 20}},
+			nil,
+		},
 	}
 
 	opts := cmp.Options{

diff --git a/internal/source/source.go b/internal/source/source.go
@@ -25,18 +25,31 @@ func (l sourceLine) Bytes() []byte {
 
 func MakeSourceLines(filename string, s []byte) []Line {
 	var ret []Line
-	if len(s) == 0 {
-		return ret
-	}
 
+	lastRng := hcl.Range{
+		Filename: filename,
+		Start:    hcl.InitialPos,
+		End:      hcl.InitialPos,
+	}
 	sc := hcl.NewRangeScanner(s, filename, scanLines)
 	for sc.Scan() {
 		ret = append(ret, sourceLine{
 			content: sc.Bytes(),
 			rng:     sc.Range(),
 		})
+		lastRng = sc.Range()
 	}
 
+	// Account for the last (virtual) user-percieved line
+	ret = append(ret, sourceLine{
+		content: []byte{},
+		rng: hcl.Range{
+			Filename: lastRng.Filename,
+			Start:    lastRng.End,
+			End:      lastRng.End,
+		},
+	})
+
 	return ret
 }
 

diff --git a/internal/source/source_test.go b/internal/source/source_test.go
@@ -6,15 +6,15 @@ import (
 
 func TestMakeSourceLines_empty(t *testing.T) {
 	lines := MakeSourceLines("/test.tf", []byte{})
-	if len(lines) != 0 {
-		t.Fatalf("Expected no lines from empty file, %d parsed:\n%#v",
+	if len(lines) != 1 {
+		t.Fatalf("Expected 1 line from empty file, %d parsed:\n%#v",
 			len(lines), lines)
 	}
 }
 
 func TestMakeSourceLines_success(t *testing.T) {
 	lines := MakeSourceLines("/test.tf", []byte("\n\n\n\n"))
-	expectedLines := 4
+	expectedLines := 5
 	if len(lines) != expectedLines {
 		t.Fatalf("Expected exactly %d lines, %d parsed",
 			expectedLines, len(lines))