reflect upstream changes

hashicorp · Nov 10, 2020 · 58daad2 · 58daad2
1 parent 11854ca
commit 58daad2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/internal/terraform/rootmodule/root_module.go b/internal/terraform/rootmodule/root_module.go
@@ -243,7 +243,10 @@ func (rm *rootModule) load(ctx context.Context) error {
 	errs = multierror.Append(errs, err)
 
 	err = rm.findAndSetCoreSchema()
-	errs = multierror.Append(errs, err)
+	if err != nil {
+		rm.logger.Printf("%s: %s - falling back to universal schema",
+			rm.Path(), err)
+	}
 
 	err = rm.UpdateProviderSchemaCache(ctx, rm.pluginLockFile)
 	errs = multierror.Append(errs, err)

diff --git a/langserver/handlers/complete_test.go b/langserver/handlers/complete_test.go
@@ -199,6 +199,26 @@ func TestCompletion_withValidData(t *testing.T) {
 							},
 							"newText": "individual"
 						}
+					},
+					{
+						"label": "version",
+						"kind": 10,
+						"detail": "Optional, string",
+						"documentation": "Specifies a version constraint for the provider, e.g. ~\u003e 1.0",
+						"insertTextFormat": 1,
+						"textEdit": {
+							"range": {
+								"start": {
+									"line": 1,
+									"character": 0
+								},
+								"end": {
+									"line": 1,
+									"character": 0
+								}
+							},
+							"newText": "version"
+						}
 					}
 				]
 			}