Fix #69 Refactor code to depend on dockerfile-utils

Signed-off-by: Remy Suen <remy.suen@gmail.com>
rcjsuen · Jan 17, 2018 · cc4d893 · cc4d893
1 parent 04f6bdb
commit cc4d893
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 4,551 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,16 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [Unreleased]
+### Added
+- create dependency on the dockerfile-utils module ([#79](https://github.com/rcjsuen/dockerfile-language-server-nodejs/issues/79))
+
+### Fixed
+- ignore ARG variables with no default values in an EXPOSE ([#199](https://github.com/rcjsuen/dockerfile-language-server-nodejs/issues/199))
+
+### Removed
+- remove validation code and tests in favor of the dockerfile-utils module ([#196](https://github.com/rcjsuen/dockerfile-language-server-nodejs/issues/196))
+
 ## [0.0.12] - 2018-01-11
 ### Added
 - create dependency on the dockerfile-ast NPM module ([#196](https://github.com/rcjsuen/dockerfile-language-server-nodejs/issues/196))
@@ -264,6 +274,7 @@ All notable changes to this project will be documented in this file.
 - textDocument/formatting
 - textDocument/rangeFormatting
 
+[Unreleased]: https://github.com/rcjsuen/dockerfile-language-server-nodejs/compare/v0.0.12...HEAD
 [0.0.12]: https://github.com/rcjsuen/dockerfile-language-server-nodejs/compare/v0.0.11...v0.0.12
 [0.0.11]: https://github.com/rcjsuen/dockerfile-language-server-nodejs/compare/v0.0.10...v0.0.11
 [0.0.10]: https://github.com/rcjsuen/dockerfile-language-server-nodejs/compare/v0.0.9...v0.0.10

diff --git a/package.json b/package.json
@@ -21,6 +21,7 @@
   },
   "dependencies": {
     "dockerfile-ast": "0.0.1",
+    "dockerfile-utils": "0.0.4",
     "vscode-languageserver": "^3.5.0-next.1"
   },
   "devDependencies": {

diff --git a/src/dockerCommands.ts b/src/dockerCommands.ts
@@ -8,7 +8,7 @@ import {
 	TextDocument, Command, Diagnostic, Range,
 	ExecuteCommandParams, WorkspaceEdit, TextEdit
 } from 'vscode-languageserver';
-import { ValidationCode } from './dockerValidator';
+import { ValidationCode } from 'dockerfile-utils';
 
 export class CommandIds {
 	static readonly LOWERCASE = "docker.command.convertToLowercase";

diff --git a/src/dockerFormatter.ts b/src/dockerFormatter.ts
@@ -93,14 +93,6 @@ export class DockerFormatter {
 		return this.format(document, lines, options);
 	}
 
-	public formatDocument(document: TextDocument, options?: FormattingOptions): TextEdit[] {
-		const lines: number[] = [];
-		for (let i = 0; i < document.lineCount; i++) {
-			lines.push(i);
-		}
-		return this.format(document, lines, options);
-	}
-
 	/**
 	 * Formats the specified lines of the given document based on the
 	 * provided formatting options.