terraform/lang: Extract types into a separate file

Author: radeksimko

internal/terraform/lang/config_block.go

@@ -10,12 +10,6 @@ import (
 	lsp "github.com/sourcegraph/go-lsp"
 )
 
-type ConfigBlock interface {
-	CompletionItemsAtPos(pos hcl.Pos) (lsp.CompletionList, error)
-	Name() string
-	BlockType() string
-}
-
 type configBlockFactory interface {
 	New(*hclsyntax.Block) (ConfigBlock, error)
 }

internal/terraform/lang/hcl_attribute.go

@@ -6,11 +6,6 @@ import (
 	tfjson "github.com/hashicorp/terraform-json"
 )
 
-type Attribute struct {
-	schema       *tfjson.SchemaAttribute
-	hclAttribute *hcl.Attribute
-}
-
 func (a *Attribute) Schema() *tfjson.SchemaAttribute {
 	return a.schema
 }

internal/terraform/lang/hcl_block_type.go

@@ -6,11 +6,6 @@ import (
 	tfjson "github.com/hashicorp/terraform-json"
 )
 
-type BlockType struct {
-	BlockList []Block
-	schema    *tfjson.SchemaBlockType
-}
-
 func (b *BlockType) Schema() *tfjson.SchemaBlockType {
 	return b.schema
 }

internal/terraform/lang/hcl_parser.go

@@ -8,17 +8,6 @@ import (
 	tfjson "github.com/hashicorp/terraform-json"
 )
 
-// Block implements an abstraction above HCL block
-// and both tfjson's SchemaBlock & SchemaBlockType
-type Block interface {
-	BlockAtPos(pos hcl.Pos) (Block, bool)
-	Range() hcl.Range
-	PosInBody(pos hcl.Pos) bool
-	PosInAttribute(pos hcl.Pos) bool
-	Attributes() map[string]*Attribute
-	BlockTypes() map[string]*BlockType
-}
-
 // ParseBlock parses HCL configuration based on tfjson's SchemaBlock
 // and keeps hold of all tfjson schema details on block or attribute level
 func ParseBlock(block *hclsyntax.Block, schema *tfjson.SchemaBlock) Block {

internal/terraform/lang/parser.go

@@ -23,13 +23,6 @@ import (
 // (e.g. meta-parameters)
 const parserVersionConstraint = ">= 0.12.0"
 
-type Parser interface {
-	SetLogger(*log.Logger)
-	SetCapabilities(lsp.TextDocumentClientCapabilities)
-	SetSchemaReader(schema.Reader)
-	ParseBlockFromHCL(*hcl.Block) (ConfigBlock, error)
-}
-
 type parser struct {
 	logger *log.Logger
 	caps   lsp.TextDocumentClientCapabilities

internal/terraform/lang/types.go

@@ -0,0 +1,48 @@
+package lang
+
+import (
+	"log"
+
+	hcl "github.com/hashicorp/hcl/v2"
+	tfjson "github.com/hashicorp/terraform-json"
+	"github.com/hashicorp/terraform-ls/internal/terraform/schema"
+	lsp "github.com/sourcegraph/go-lsp"
+)
+
+// Parser implements a parser which can turn raw HCL block
+// into ConfigBlock with the help of a schema reader
+type Parser interface {
+	SetLogger(*log.Logger)
+	SetCapabilities(lsp.TextDocumentClientCapabilities)
+	SetSchemaReader(schema.Reader)
+	ParseBlockFromHCL(*hcl.Block) (ConfigBlock, error)
+}
+
+// ConfigBlock implements an abstraction above HCL block
+// which provides any LSP capabilities (e.g. completion)
+type ConfigBlock interface {
+	CompletionItemsAtPos(pos hcl.Pos) (lsp.CompletionList, error)
+	Name() string
+	BlockType() string
+}
+
+// Block represents a decoded HCL block (by a Parser)
+// which keeps track of the related schema
+type Block interface {
+	BlockAtPos(pos hcl.Pos) (Block, bool)
+	Range() hcl.Range
+	PosInBody(pos hcl.Pos) bool
+	PosInAttribute(pos hcl.Pos) bool
+	Attributes() map[string]*Attribute
+	BlockTypes() map[string]*BlockType
+}
+
+type BlockType struct {
+	BlockList []Block
+	schema    *tfjson.SchemaBlockType
+}
+
+type Attribute struct {
+	schema       *tfjson.SchemaAttribute
+	hclAttribute *hcl.Attribute
+}