Merge pull request #2 from adamvoss/typescriptCompliationErrors

Fix TypeScript compliation errors
adamvoss · Jun 30, 2017 · a3b125c · a3b125c
2 parents d6b4782 + f4ca825
commit a3b125c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 out
-node_modules
+node_modules
+npm-debug.log
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+## Unreleased
+- Update upstream language service dependencies
+
 ## 0.0.2
 - **Format Document** now works when there are multiple documents in the file.  Multiple documents in a single file is still generally unsupported.
 

diff --git a/server/src/yamlServerMain.ts b/server/src/yamlServerMain.ts
@@ -76,7 +76,7 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
 			// Tell the client that the server works in FULL text document sync mode
 			textDocumentSync: documents.syncKind,
 			// Disabled because too JSON centric
-			completionProvider: false,
+			completionProvider: { resolveProvider: false },
 			hoverProvider: true,
 			documentSymbolProvider: true,
 			documentFormattingProvider: false

diff --git a/server/vscode-yaml-languageservice b/server/vscode-yaml-languageservice