omg debugging n all the shit that SHOULDVE worked are now FIXED

client/package.json

@@ -6,78 +6,20 @@
     "author": "Noah Santschi-Cooney (Strum355)",
     "license": "MIT",
     "repository": {
+        "type": "git",
         "url": "https://github.com/Strum355/vscode-mc-shader"
     },
     "engines": {
         "vscode": "^1.23.0"
     },
-    "categories": [
-        "Linters",
-        "Programming Languages"
-    ],
-    "activationEvents": [
-        "onLanguage:glsl",
-        "workspaceContains:**/*.fsh",
-        "workspaceContains:**/*.vsh",
-        "workspaceContains:**/*.gsh",
-        "workspaceContains:**/*.glsl"
-    ],
-    "extensionDependencies": [
-        "slevesque.shader"
-    ],
-    "main": "./out/extension",
-    "contributes": {
-        "languages": [
-            {
-                "id": "glsl",
-                "aliases": [
-                    "OpenGL Shading Language"
-                ],
-                "extensions": [
-                    ".fsh",
-                    ".vsh",
-                    ".gsh",
-                    ".glsl"
-                ]
-            }
-        ],
-        "configuration": {
-            "title": "Minecraft GLSL configurations",
-            "properties": {
-                "mcglsl.glslangValidatorPath": {
-                    "type": "string",
-                    "default": "glslangValidator",
-                    "description": "The path to the glslangValidator executable. Default value assumes its in your PATH."
-                },
-                "mcglsl.lintOnType": {
-                    "type": "boolean",
-                    "default": false,
-                    "description": "Whether or not to lint while typing. Can decrease performance."
-                },
-                "mcglsl.minecraftPath": {
-                    "type": "string",
-                    "default": "",
-                    "description": "Absolute path to your Minecraft installation folder. The shaderpacks folder will be derived from this."
-                }
-            }
-        }
-    },
     "scripts": {
-        "vscode:prepublish": "npm run compile",
-        "compile": "tsc -p ./",
-        "watch": "tsc -watch -p ./",
+        "update-vscode": "node ./node_modules/vscode/bin/install",
         "postinstall": "node ./node_modules/vscode/bin/install",
-        "test": "npm run compile && node ./node_modules/vscode/bin/test",
-        "lint": "tslint -c tslint.json 'src/**/*.ts'"
-    },
-    "devDependencies": {
-        "@types/mocha": "^2.2.42",
-        "@types/node": "^7.0.43",
-        "tslint": "^5.8.0",
-        "typescript": "^2.6.1",
-        "vscode": "^1.1.18"
+        "lint": "tslint -c tslint.json 'src/**/*.ts'",
+        "compile": "tsc -p ./"
     },
     "dependencies": {
+        "vscode": "^1.1.18",
         "vscode-languageclient": "^4.1.4"
     }
 }

client/src/extension.ts

@@ -3,9 +3,9 @@ import * as vscodeLang from 'vscode-languageclient'
 import * as path from 'path'
 
 export function activate(context: vscode.ExtensionContext) {
-  const serverModule = context.asAbsolutePath(path.join('server', 'server.js'))
+  const serverModule = context.asAbsolutePath(path.join('server', 'out', 'server.js'))
 
-  const debugOpts = { execArgv: ['--nolazy', '--debug=6009']}
+  const debugOpts = { execArgv: ['--nolazy', '--inspect=6009']}
 
   const serverOpts: vscodeLang.ServerOptions = {
     run: {

client/tsconfig.json

@@ -1,20 +1,16 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "target": "esnext",
-        "outDir": "out",
-        "lib": [
-            "es6"
-        ],
-        "sourceMap": true,
-        "rootDir": "src",
-        "strict": true,
-        "noUnusedLocals": true,
-        "noImplicitReturns": true
-    },
-    "exclude": [
-        "node_modules",
-        ".vscode-test",
-        "test"
-    ]
+{
+	"compilerOptions": {
+		"module": "commonjs",
+		"target": "es6",
+		"outDir": "out",
+		"rootDir": "src",
+		"lib": [ "es6" ],
+		"sourceMap": true
+	},
+	"include": [
+		"src"
+	],
+	"exclude": [
+		"node_modules"
+	]
 }

client/tslint.json

@@ -1,42 +0,0 @@
-{
-    "defaultSeverity": "error",
-    "extends": ["tslint:recommended"],
-    "rules": {
-        "quotemark": [true, "single"],
-        "comment-format": false,
-        "semicolon": false,
-        "ordered-imports": false,
-        "object-literal-sort-keys": false,
-        "interface-name": false,
-        "indent": [true, "spaces", 2],
-        "arrow-parens": false,
-        "max-classes-per-file": false,
-        "no-console": false,
-        "eofline": false,
-        "member-ordering": false,
-        "trailing-comma": false,
-        "no-var-requires": false,
-        "max-line-length": {
-            "severity": "warning",
-            "options": [170]
-        },
-        "radix": false,
-        "no-empty": false,
-        "prefer-const": {
-            "severity": "warning"
-        },
-        "curly": [true, "ignore-same-line"],
-        "whitespace": [
-            true,
-            "check-decl",
-            "check-operator",
-            "check-module",
-            "check-rest-spread",
-            "check-type",
-            "check-typecast",
-            "check-type-operator",
-            "check-preblock",
-            "check-branch"
-        ]
-    }
-}