Merge pull request #3 from imfox/master

使用lua-fmt库(https://github.com/trixnz/lua-fmt) 来整理代码

Author: tangzx

package.json

@@ -104,7 +104,6 @@
                     "lua"
                 ]
             },
-            
             {
                 "type": "emmylua_launch",
                 "label": "EmmyLua Launch Debug",
@@ -188,7 +187,7 @@
                             "workingDir",
                             "arguments",
                             "port"
-                        ], 
+                        ],
                         "properties": {
                             "program": {
                                 "type": "string",
@@ -300,17 +299,18 @@
         "test": "npm run compile && node ./node_modules/vscode/bin/test"
     },
     "devDependencies": {
+        "tslint": "^5.8.0",
         "typescript": "^2.6.1",
-        "vscode": "^1.1.6",
-        "tslint": "^5.8.0"
+        "vscode": "^1.1.6"
     },
     "dependencies": {
-        "vscode-languageclient": "^3.3.0",
-        "vscode-debugadapter": "1.27.0",
-        "vscode-debugprotocol": "1.27.0",
-        "@types/node": "^7.0.43",
         "@types/mocha": "^2.2.42",
+        "@types/node": "^7.0.43",
+        "lua-fmt": "^2.6.0",
         "smart-buffer": "^4.0.1",
+        "vscode-debugadapter": "1.27.0",
+        "vscode-debugprotocol": "1.27.0",
+        "vscode-languageclient": "^3.3.0",
         "xml2js": "^0.4.19"
     }
 }

src/extension.ts

@@ -10,6 +10,7 @@ import { LanguageClient, LanguageClientOptions, ServerOptions, StreamInfo } from
 import { Proposed } from 'vscode-languageserver-protocol';
 import { AttachDebuggerProvider } from './debugger/AttachDebuggerProvider';
 import { MobDebuggerProvider } from './debugger/MobDebuggerProvider';
+import { formatText } from 'lua-fmt';
 
 const LANGUAGE_ID = 'lua'; //EmmyLua
 export let savedContext: vscode.ExtensionContext;
@@ -32,6 +33,14 @@ export function activate(context: vscode.ExtensionContext) {
     vscode.commands.registerCommand("emmy.restartServer", restartServer);
     vscode.commands.registerCommand("emmy.showReferences", showReferences);
 
+    vscode.languages.registerDocumentFormattingEditProvider(
+        "lua", {
+            provideDocumentFormattingEdits(document, position, token): vscode.ProviderResult<vscode.TextEdit[]> {
+                return [new vscode.TextEdit(new vscode.Range(0, 0, document.lineCount, 0), formatText(document.getText()))];
+            }
+        }
+    )
+
     const attProvider = new AttachDebuggerProvider();
     savedContext.subscriptions.push(vscode.debug.registerDebugConfigurationProvider("emmylua_attach", attProvider));
     savedContext.subscriptions.push(vscode.debug.registerDebugConfigurationProvider("emmylua_launch", attProvider));