Add editorconfig, fix stylistic issues

Author: felixfbecker

.editorconfig

@@ -0,0 +1,7 @@
+
+[*]
+insert_spaces = true
+indent_size = 4
+
+[*.json]
+indent_size = 2

.vscode/launch.json

@@ -1,48 +1,28 @@
 {
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Debug adapter",
-            "type": "node",
-            "request": "launch",
-            "runtimeArgs": [
-                "--harmony"
-            ],
-            "program": "${workspaceRoot}/src/phpDebug.ts",
-            "stopOnEntry": false,
-            "args": [
-                "--server=4711"
-            ],
-            "env": {
-                "NODE_ENV": "development"
-            },
-            "sourceMaps": true,
-            "outDir": "${workspaceRoot}/out"
-        },
-        {
-            "name": "Launch Extension",
-            "type": "extensionHost",
-            "request": "launch",
-            "runtimeExecutable": "${execPath}",
-            "args": [
-                "--extensionDevelopmentPath=${workspaceRoot}"
-            ],
-            "sourceMaps": true,
-            "outDir": "${workspaceRoot}/out"
-        },
-        {
-            "name": "Run Tests",
-            "type": "node",
-            "request": "launch",
-            "program": "${workspaceRoot}node_modules/mocha/bin/_mocha",
-            "args": [
-                "./out/tests",
-                "--timeout",
-                "999999",
-                "--colors"
-            ],
-            "sourceMaps": true,
-            "outDir": "${workspaceRoot}/out"
-        }
-    ]
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Debug adapter",
+      "type": "node",
+      "request": "launch",
+      "runtimeArgs": ["--harmony"],
+      "program": "${workspaceRoot}/src/phpDebug.ts",
+      "stopOnEntry": false,
+      "args": ["--server=4711"],
+      "env": {
+        "NODE_ENV": "development"
+      },
+      "sourceMaps": true,
+      "outDir": "${workspaceRoot}/out"
+    },
+    {
+      "name": "Launch Extension",
+      "type": "extensionHost",
+      "request": "launch",
+      "runtimeExecutable": "${execPath}",
+      "args": ["--extensionDevelopmentPath=${workspaceRoot}"],
+      "sourceMaps": true,
+      "outDir": "${workspaceRoot}/out"
+    }
+  ]
 }

.vscode/tasks.json

@@ -1,19 +1,19 @@
 {
-    "version": "0.1.0",
-    "command": "npm",
-    "isShellCommand": true,
-    "args": ["run"],
-    "showOutput": "silent",
-    "tasks": [
-		{
-			"taskName": "watch",
-			"isWatching": true,
-    		"problemMatcher": "$tsc-watch"
-		},
-		{
-			"taskName": "compile",
-            "isBuildCommand": true,
-    		"problemMatcher": "$tsc"
-		}
-	]
+  "version": "0.1.0",
+  "command": "npm",
+  "isShellCommand": true,
+  "args": ["run"],
+  "showOutput": "silent",
+  "tasks": [
+    {
+      "taskName": "watch",
+      "isWatching": true,
+      "problemMatcher": "$tsc-watch"
+    },
+    {
+      "taskName": "compile",
+      "isBuildCommand": true,
+      "problemMatcher": "$tsc"
+    }
+  ]
 }

src/phpDebug.ts

@@ -125,11 +125,11 @@ class PhpDebugSession extends vscode.DebugSession {
         super(debuggerLinesStartAt1, isServer);
     }
 
-	protected initializeRequest(response: VSCodeDebugProtocol.InitializeResponse, args: VSCodeDebugProtocol.InitializeRequestArguments): void {
-		response.body.supportsConfigurationDoneRequest = true;
+    protected initializeRequest(response: VSCodeDebugProtocol.InitializeResponse, args: VSCodeDebugProtocol.InitializeRequestArguments): void {
+        response.body.supportsConfigurationDoneRequest = true;
         response.body.supportsEvaluateForHovers = true;
-		this.sendResponse(response);
-	}
+        this.sendResponse(response);
+    }
 
     protected attachRequest(response: VSCodeDebugProtocol.AttachResponse, args: VSCodeDebugProtocol.AttachRequestArguments) {
         this.sendErrorResponse(response, 0, 'Attach requests are not supported');
@@ -288,7 +288,7 @@ class PhpDebugSession extends vscode.DebugSession {
             this.sendEvent(new vscode.OutputEvent(log));
         }
         super.sendEvent(event);
-	}
+    }
 
     public sendResponse(response: VSCodeDebugProtocol.Response): void {
         const log = `<- ${response.command}Response\n${util.inspect(response, {depth: null})}\n\n`;
@@ -567,7 +567,7 @@ class PhpDebugSession extends vscode.DebugSession {
         this.sendResponse(response);
     }
 
-	protected stepInRequest(response: VSCodeDebugProtocol.StepInResponse, args: VSCodeDebugProtocol.StepInArguments) : void {
+    protected stepInRequest(response: VSCodeDebugProtocol.StepInResponse, args: VSCodeDebugProtocol.StepInArguments) : void {
         if (!args.threadId) {
             this.sendErrorResponse(response, 0, 'No active connection');
             return;
@@ -576,10 +576,10 @@ class PhpDebugSession extends vscode.DebugSession {
         connection.sendStepIntoCommand()
             .then(response => this._checkStatus(response))
             .catch(error => this.sendErrorResponse(response, error.code, error.message));
-		this.sendResponse(response);
-	}
+        this.sendResponse(response);
+    }
 
-	protected stepOutRequest(response: VSCodeDebugProtocol.StepOutResponse, args: VSCodeDebugProtocol.StepOutArguments) : void {
+    protected stepOutRequest(response: VSCodeDebugProtocol.StepOutResponse, args: VSCodeDebugProtocol.StepOutArguments) : void {
         if (!args.threadId) {
             this.sendErrorResponse(response, 0, 'No active connection');
             return;
@@ -588,12 +588,12 @@ class PhpDebugSession extends vscode.DebugSession {
         connection.sendStepOutCommand()
             .then(response => this._checkStatus(response))
             .catch(error => this.sendErrorResponse(response, error.code, error.message));
-		this.sendResponse(response);
-	}
+        this.sendResponse(response);
+    }
 
-	protected pauseRequest(response: VSCodeDebugProtocol.PauseResponse, args: VSCodeDebugProtocol.PauseArguments) : void {
-		this.sendErrorResponse(response, 0, 'Pausing the execution is not supported by XDebug');
-	}
+    protected pauseRequest(response: VSCodeDebugProtocol.PauseResponse, args: VSCodeDebugProtocol.PauseArguments) : void {
+        this.sendErrorResponse(response, 0, 'Pausing the execution is not supported by XDebug');
+    }
 
     protected disconnectRequest(response: VSCodeDebugProtocol.DisconnectResponse, args: VSCodeDebugProtocol.DisconnectArguments): void {
         Promise.all(Array.from(this._connections).map(([id, connection]) =>
@@ -614,7 +614,7 @@ class PhpDebugSession extends vscode.DebugSession {
         }).catch(error => {
             this.sendErrorResponse(response, error.code, error.message)
         });
-	}
+    }
 
     protected evaluateRequest(response: VSCodeDebugProtocol.EvaluateResponse, args: VSCodeDebugProtocol.EvaluateArguments): void {
         const connection = this._stackFrames.get(args.frameId).connection;

src/xdebugConnection.ts

@@ -97,7 +97,7 @@ export class StatusResponse extends Response {
                 this.exception = {
                     name: messageNode.getAttribute('exception'),
                     message: messageNode.textContent
-                }
+                };
             }
             if (messageNode.hasAttribute('filename')) {
                 this.fileUri = messageNode.getAttribute('filename');

testproject/index.php

@@ -10,11 +10,11 @@
     $nullValue = null;
     $variableThatsNotSet;
     $aLargeArray = array_fill(0, 100, 'test');
-    
+
     class TestParentClass {
         public static $aStaticProperty = 1234;
     }
-    
+
     class TestClass extends TestParentClass {
         public static $aStaticProperty = 5678;
         public $aProperty;
@@ -73,5 +73,3 @@ function triggerWarning() {
     throwDerivedException();
 
     throwCaughtException();
-
-