From 38300e66dfcc4346652c756bf33623e88af8533d Mon Sep 17 00:00:00 2001 From: Ali Ariff Date: Wed, 14 Dec 2022 10:42:34 +0100 Subject: [PATCH] fix: #25 (#40) --- package-lock.json | 41 +++++++++++++++++++++++++++++++++ package.json | 3 +++ src/formatter/htmlbeautifier.ts | 3 ++- 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index c3d6b38..0124897 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,9 @@ "name": "vscode-erb-beautify", "version": "0.3.6", "license": "MIT", + "dependencies": { + "is-wsl": "^2.2.0" + }, "devDependencies": { "@semantic-release/changelog": "^6.0.2", "@semantic-release/git": "^10.0.1", @@ -3164,6 +3167,20 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-docker": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", + "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", + "bin": { + "is-docker": "cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", @@ -3284,6 +3301,17 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/is-wsl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", + "dependencies": { + "is-docker": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", @@ -11184,6 +11212,11 @@ "has": "^1.0.3" } }, + "is-docker": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", + "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==" + }, "is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", @@ -11262,6 +11295,14 @@ "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", "dev": true }, + "is-wsl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", + "requires": { + "is-docker": "^2.0.0" + } + }, "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", diff --git a/package.json b/package.json index 8cba600..9c417bc 100644 --- a/package.json +++ b/package.json @@ -104,5 +104,8 @@ "semantic-release-vsce": "^5.5.1", "typescript": "^4.3.2", "vscode-test": "^1.5.2" + }, + "dependencies": { + "is-wsl": "^2.2.0" } } diff --git a/src/formatter/htmlbeautifier.ts b/src/formatter/htmlbeautifier.ts index f4c430e..cdadafa 100644 --- a/src/formatter/htmlbeautifier.ts +++ b/src/formatter/htmlbeautifier.ts @@ -1,5 +1,6 @@ import * as vscode from "vscode"; import * as cp from "child_process"; +const isWsl = require("is-wsl"); export default class HtmlBeautifier { public format(data: string): Promise { @@ -59,7 +60,7 @@ export default class HtmlBeautifier { const executePath = config.get("executePath", "htmlbeautifier"); const useBundler = config.get("useBundler", false); const bundlerPath = config.get("bundlerPath", "bundle"); - const ext = process.platform === "win32" ? ".bat" : ""; + const ext = process.platform === "win32" && !isWsl ? ".bat" : ""; return useBundler ? `${bundlerPath}${ext}` : `${executePath}${ext}`; }