From 1a162330385694be4262362e4ac336d9563420a4 Mon Sep 17 00:00:00 2001
From: Markus Westerlind <marwes91@gmail.com>
Date: Fri, 8 Jul 2016 21:12:04 +0200
Subject: [PATCH] fix: Make the default server location more reliable and
 change the publisher

---
 .vscodeignore    | 9 +++++++++
 package.json     | 8 ++++----
 src/extension.ts | 2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 .vscodeignore

diff --git a/.vscodeignore b/.vscodeignore
new file mode 100644
index 00000000..81d97fd2
--- /dev/null
+++ b/.vscodeignore
@@ -0,0 +1,9 @@
+.vscode/**
+typings/**
+out/test/**
+test/**
+target/**
+**/*.map
+.gitignore
+tsconfig.json
+vsc-extension-quickstart.md
diff --git a/package.json b/package.json
index 774c8df3..95a1222e 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
-	"name": "vscode-gluon",
+	"name": "gluon",
 	"description": "Language server for the gluon programming language",
 	"author": "Markus Westerlind",
 	"license": "MIT",
 	"version": "0.0.1",
-	"publisher": "gluon-lang",
+	"publisher": "Marwes",
 	"repository": "https://github.com/Marwes/gluon_language-server",
 	"engines": {
 		"vscode": "^0.10.10"
@@ -38,8 +38,8 @@
 					"description": "Controls the maximum number of problems produced by the server."
 				},
 				"gluon.language-server.path": {
-					"type": ["string", "null"],
-					"default": null,
+					"type": ["string"],
+					"default": "gluon_language-server",
 					"description": "Specifies the path to the language server binary."
 				}
 			}
diff --git a/src/extension.ts b/src/extension.ts
index 37d7a347..f50a0fa2 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -9,7 +9,7 @@ import { Trace } from 'vscode-jsonrpc';
 export function activate(context: ExtensionContext) {
 
 	let config = workspace.getConfiguration("gluon");
-	let serverPath = config.get("language-server.path", 'gluon_language-server');
+	let serverPath = config.get("language-server.path", "gluon_language-server");
 	
 	// If the extension is launched in debug mode then the debug server options are used
 	// Otherwise the run options are used