Merge remote-tracking branch 'remotes/martine/format-typescript'

Author: owent

package.json

@@ -18,7 +18,9 @@
         "onLanguage:cpp",
         "onLanguage:c",
         "onLanguage:objective-c",
-        "onLanguage:java"
+        "onLanguage:java",
+        "onLanguage:javascript",
+        "onLanguage:typescript"
     ],
     "contributes": {
         "configuration": {
@@ -54,8 +56,8 @@
         "postinstall": "node ./node_modules/vscode/bin/install"
     },
     "devDependencies": {
-        "typescript": "^1.6.2",
-        "vscode": "0.10.x"
+        "typescript": "^1.8.5",
+        "vscode": "^0.11.0"
     },
     "icon": "clang-format.png",
     "repository": {

src/clangMode.ts

@@ -2,7 +2,5 @@
 
 import vscode = require('vscode');
 
-export const CPP_MODE: vscode.DocumentFilter = { language: 'cpp', scheme: 'file' }
-export const C_MODE: vscode.DocumentFilter = { language: 'c', scheme: 'file' }
-export const OBJECTIVE_C_MODE: vscode.DocumentFilter = { language: 'objective-c', scheme: 'file' }
-export const JAVA_MODE: vscode.DocumentFilter = { language: 'java', scheme: 'file' }
+const LANGUAGES: string[] = ['cpp', 'c', 'objective-c', 'java', 'javascript', 'typescript'];
+export const MODES: vscode.DocumentFilter[] = LANGUAGES.map(language => ({ language, scheme: 'file' }));

src/extension.ts

@@ -1,7 +1,7 @@
 import * as vscode from 'vscode';
 import cp = require('child_process');
 import path = require('path');
-import {C_MODE, CPP_MODE, OBJECTIVE_C_MODE, JAVA_MODE} from './clangMode';
+import {MODES} from './clangMode';
 import { getBinPath } from './clangPath';
 import sax = require('sax');
 
@@ -171,9 +171,12 @@ export class ClangDocumentFormattingEditProvider implements vscode.DocumentForma
                 }
             };
 
-            var formatArgs = ['-output-replacements-xml'];
-            formatArgs.push(`-style=${this.getStyle()}`);
-            formatArgs.push(`-fallback-style=${this.getFallbackStyle()}`);
+            var formatArgs = [
+                '-output-replacements-xml',
+                `-style=${this.getStyle()}`,
+                `-fallback-style=${this.getFallbackStyle()}`,
+                `-assume-filename=${document.fileName}`,
+            ];
 
             if (range) {
                 var offset = document.offsetAt(range.start);
@@ -210,7 +213,7 @@ export function activate(ctx: vscode.ExtensionContext): void {
 
     var formatter = new ClangDocumentFormattingEditProvider();
 
-    [C_MODE, CPP_MODE, JAVA_MODE, OBJECTIVE_C_MODE].forEach(mode => {
+    MODES.forEach(mode => {
         ctx.subscriptions.push(vscode.languages.registerDocumentRangeFormattingEditProvider(mode, formatter));
         ctx.subscriptions.push(vscode.languages.registerDocumentFormattingEditProvider(mode, formatter));
     })