Merge pull request #46 from pcmind/master

Fix gopath bin location search and error in error line parsing in windows

src/goCheck.ts

@@ -47,9 +47,9 @@ export function check(filename: string, buildOnSave = true, lintOnSave = true, v
 				var lines = stderr.toString().split('\n');
 				var ret: ICheckResult[] = [];
 				for(var i = 1; i < lines.length; i++) {
-					var match = /(.*):(\d+): (.*)/.exec(lines[i]);
+					var match = /([^:]*):(\d+)(:\d+)?: (.*)/.exec(lines[i]);
 					if(!match) continue;
-					var [_, file, lineStr, msg] = match;
+					var [_, file, lineStr, charStr, msg] = match;
 					var line = +lineStr;
 					ret.push({ file: path.resolve(cwd, file), line, msg, severity: "error" });
 				}

src/goPath.ts

@@ -14,6 +14,7 @@ import { showGoStatus, hideGoStatus } from './goStatus'
 var binPathCache : { [bin: string]: string;} = {}
 
 export function getBinPath(binname) {
+	binname = correctBinname(binname)
 	if(binPathCache[binname]) return binPathCache[binname];
 	var workspaces = getGOPATHWorkspaces();
 	var binpath: string;
@@ -27,6 +28,13 @@ export function getBinPath(binname) {
 	return path.join(process.env["GOPATH"], "bin", binname);
 }
 
+function correctBinname(binname) {
+	if (process.platform === 'win32')
+		return binname + ".exe";
+	else
+		return binname
+}
+
 function getGOPATHWorkspaces() {
 	var seperator : string;
 	switch(os.platform()) {
@@ -75,9 +83,7 @@ export function setupGoPathAndOfferToInstallTools() {
 	}
 	var keys = Object.keys(tools)
 	Promise.all(keys.map(tool => new Promise<string>((resolve, reject) => {
-		let toolPath = path.join(process.env["GOPATH"], 'bin', tool);
-		if (process.platform === 'win32')
-			toolPath = toolPath + ".exe";
+		let toolPath = getBinPath(tool);
 		fs.exists(toolPath, exists => {
 			resolve(exists ? null : tools[tool])
 		});