Auto-format the generated monaco-editor.d.ts

build/lib/monaco-editor.d.ts.recipe

@@ -65,6 +65,7 @@ declare module monaco {
     #include(vs/base/common/winjs.base.d.ts): TValueCallback, ProgressCallback, TPromise
 
     #include(vs/base/common/uri): URI
+
     #include(vs/base/common/eventEmitter): IEmitterEvent, ListenerCallback, IBulkListenerCallback, ListenerUnbind, IEventEmitter
 
     #include(vs/base/common/keyCodes): KeyCode, KeyMod
@@ -110,6 +111,7 @@ declare module monaco.editor {
     #include(vs/editor/common/core/viewLineToken): ViewLineToken
 
     #includeAll(vs/editor/common/editorCommon): KeyCode, KeyMod
+
     #includeAll(vs/editor/browser/editorBrowser):
 
 }
\ No newline at end of file

build/lib/monaco.js

@@ -92,6 +92,52 @@ function getMassagedTopLevelDeclarationText(sourceFile, declaration) {
     result = result.replace(/export declare/g, 'export');
     return result;
 }
+function format(text) {
+    var options = getDefaultOptions();
+    // Parse the source text
+    var sourceFile = ts.createSourceFile('file.ts', text, ts.ScriptTarget.Latest, /*setParentPointers*/ true);
+    // Get the formatting edits on the input sources
+    var edits = ts.formatting.formatDocument(sourceFile, getRuleProvider(options), options);
+    // Apply the edits on the input code
+    return applyEdits(text, edits);
+    function getRuleProvider(options) {
+        // Share this between multiple formatters using the same options.
+        // This represents the bulk of the space the formatter uses.
+        var ruleProvider = new ts.formatting.RulesProvider();
+        ruleProvider.ensureUpToDate(options);
+        return ruleProvider;
+    }
+    function applyEdits(text, edits) {
+        // Apply edits in reverse on the existing text
+        var result = text;
+        for (var i = edits.length - 1; i >= 0; i--) {
+            var change = edits[i];
+            var head = result.slice(0, change.span.start);
+            var tail = result.slice(change.span.start + change.span.length);
+            result = head + change.newText + tail;
+        }
+        return result;
+    }
+    function getDefaultOptions() {
+        return {
+            IndentSize: 4,
+            TabSize: 4,
+            NewLineCharacter: '\r\n',
+            ConvertTabsToSpaces: true,
+            IndentStyle: ts.IndentStyle.Block,
+            InsertSpaceAfterCommaDelimiter: true,
+            InsertSpaceAfterSemicolonInForStatements: true,
+            InsertSpaceBeforeAndAfterBinaryOperators: true,
+            InsertSpaceAfterKeywordsInControlFlowStatements: true,
+            InsertSpaceAfterFunctionKeywordForAnonymousFunctions: false,
+            InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: false,
+            InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: false,
+            InsertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: true,
+            PlaceOpenBraceOnNewLineForFunctions: false,
+            PlaceOpenBraceOnNewLineForControlBlocks: false,
+        };
+    }
+}
 var recipe = fs.readFileSync(path.join(__dirname, './monaco-editor.d.ts.recipe')).toString();
 var lines = recipe.split(/\r\n|\n|\r/);
 var result = [];
@@ -131,4 +177,10 @@ lines.forEach(function (line) {
     }
     result.push(line);
 });
-fs.writeFileSync(path.join(__dirname, './monaco-editor.d.ts'), result.join('\n').replace(/\beditorCommon\./g, '').replace(/\bEvent</g, 'IEvent<'));
+var resultTxt = result.join('\n');
+resultTxt = resultTxt.replace(/\beditorCommon\./g, '');
+resultTxt = resultTxt.replace(/\bEvent</g, 'IEvent<');
+resultTxt = resultTxt.replace(/\bURI\b/g, 'Uri');
+resultTxt = format(resultTxt);
+resultTxt = resultTxt.replace(/\r\n/g, '\n');
+fs.writeFileSync(path.join(__dirname, './monaco-editor.d.ts'), resultTxt);

build/lib/monaco.ts

@@ -121,6 +121,59 @@ function getMassagedTopLevelDeclarationText(sourceFile:ts.SourceFile, declaratio
 	return result;
 }
 
+function format(text:string): string {
+	let options = getDefaultOptions();
+
+	// Parse the source text
+	let sourceFile = ts.createSourceFile('file.ts', text, ts.ScriptTarget.Latest, /*setParentPointers*/ true);
+
+	// Get the formatting edits on the input sources
+	let edits = (<any>ts).formatting.formatDocument(sourceFile, getRuleProvider(options), options);
+
+	// Apply the edits on the input code
+	return applyEdits(text, edits);
+
+	function getRuleProvider(options: ts.FormatCodeOptions) {
+		// Share this between multiple formatters using the same options.
+		// This represents the bulk of the space the formatter uses.
+		let ruleProvider = new (<any>ts).formatting.RulesProvider();
+		ruleProvider.ensureUpToDate(options);
+		return ruleProvider;
+	}
+
+	function applyEdits(text: string, edits: ts.TextChange[]): string {
+		// Apply edits in reverse on the existing text
+		let result = text;
+		for (let i = edits.length - 1; i >= 0; i--) {
+			let change = edits[i];
+			let head = result.slice(0, change.span.start);
+			let tail = result.slice(change.span.start + change.span.length)
+			result = head + change.newText + tail;
+		}
+		return result;
+	}
+
+	function getDefaultOptions(): ts.FormatCodeOptions {
+		return {
+			IndentSize: 4,
+			TabSize: 4,
+			NewLineCharacter: '\r\n',
+			ConvertTabsToSpaces: true,
+			IndentStyle: ts.IndentStyle.Block,
+
+			InsertSpaceAfterCommaDelimiter: true,
+			InsertSpaceAfterSemicolonInForStatements: true,
+			InsertSpaceBeforeAndAfterBinaryOperators: true,
+			InsertSpaceAfterKeywordsInControlFlowStatements: true,
+			InsertSpaceAfterFunctionKeywordForAnonymousFunctions: false,
+			InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: false,
+			InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: false,
+			InsertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: true,
+			PlaceOpenBraceOnNewLineForFunctions: false,
+			PlaceOpenBraceOnNewLineForControlBlocks: false,
+		};
+	}
+}
 
 var recipe = fs.readFileSync(path.join(__dirname, './monaco-editor.d.ts.recipe')).toString();
 var lines = recipe.split(/\r\n|\n|\r/);
@@ -169,4 +222,13 @@ lines.forEach(line => {
 	result.push(line);
 });
 
-fs.writeFileSync(path.join(__dirname, './monaco-editor.d.ts'), result.join('\n').replace(/\beditorCommon\./g, '').replace(/\bEvent</g, 'IEvent<'));
+let resultTxt = result.join('\n');
+resultTxt = resultTxt.replace(/\beditorCommon\./g, '');
+resultTxt = resultTxt.replace(/\bEvent</g, 'IEvent<');
+resultTxt = resultTxt.replace(/\bURI\b/g, 'Uri');
+
+resultTxt = format(resultTxt);
+
+resultTxt = resultTxt.replace(/\r\n/g, '\n');
+
+fs.writeFileSync(path.join(__dirname, './monaco-editor.d.ts'), resultTxt);