set default d.ts format code settings

ace-ext.d.ts

@@ -506,6 +506,7 @@ declare module "ace-code/src/ext/modelist" {
          */
         supportsFile(filename: string): RegExpMatchArray;
     }
+
     export {};
 }
 declare module "ace-code/src/ext/themelist" {

ace-lib.d.ts

@@ -210,6 +210,7 @@ declare module "ace-code/src/lib/app_config" {
         reportError: (msg: any, data: any) => void;
     }
     function warn(message: any, ...args: any[]): void;
+
     export {};
     namespace Ace {
         type EventEmitter<T> = import("ace-code").Ace.EventEmitter<T>;

ace-modules.d.ts

@@ -21,6 +21,7 @@ declare module "ace-code/src/layer/font_metrics" {
         els: any[] | HTMLElement | Text;
         transformCoordinates(clientPos: any, elPos: any): any[];
     }
+
     export {};
     namespace Ace {
         type EventEmitter<T> = import("ace-code").Ace.EventEmitter<T>;
@@ -2282,6 +2283,7 @@ declare module "ace-code/src/tooltip" {
          */
         doPopupsOverlap(popupA: Tooltip, popupB: Tooltip): boolean;
     }
+
     export {};
     export interface HoverTooltip {
         row: number;
@@ -6178,6 +6180,7 @@ declare module "ace-code/src/range" {
      * @returns {Number}
      */
     function comparePoints(p1: Point, p2: Point): number;
+
     export {};
     namespace Ace {
         type Point = import("ace-code").Ace.Point;

ace.d.ts

@@ -599,9 +599,9 @@ declare module "ace-code" {
             clazz: string;
             inFront?: boolean;
             id?: number;
-            update?: (html: string[], 
-            // TODO maybe define Marker class
-            marker: any, session: EditSession, config: any) => void;
+            update?: (html: string[],
+                      // TODO maybe define Marker class
+                      marker: any, session: EditSession, config: any) => void;
             [key: string]: any;
         }
         type MarkerRenderer = (html: string[], range: Range, left: number, top: number, config: any) => void;
@@ -672,7 +672,7 @@ declare module "ace-code" {
         }
         interface SyntaxMode {
             HighlightRules: {
-                new (config: any): HighlightRules;
+                new(config: any): HighlightRules;
             }; //TODO: fix this
             foldingRules?: FoldMode;
             /**
@@ -734,7 +734,7 @@ declare module "ace-code" {
             isBackwards: boolean;
         }
         var Selection: {
-            new (session: EditSession): Selection;
+            new(session: EditSession): Selection;
         };
         interface TextInput {
             resetSelection(): void;

tool/ace_declaration_generator.js

@@ -4,6 +4,31 @@ const path = require("path");
 
 const SEPARATE_MODULES = ["ext", "theme", "snippets", "lib"]; // adjust this list for more granularity
 
+const defaultFormatCodeSettings = {
+    baseIndentSize: 0,
+    indentSize: 4,
+    tabSize: 4,
+    indentStyle: ts.IndentStyle.Smart,
+    newLineCharacter: "\n",
+    convertTabsToSpaces: true,
+    insertSpaceAfterCommaDelimiter: true,
+    insertSpaceAfterSemicolonInForStatements: true,
+    insertSpaceBeforeAndAfterBinaryOperators: true,
+    insertSpaceAfterConstructor: false,
+    insertSpaceAfterKeywordsInControlFlowStatements: true,
+    insertSpaceAfterFunctionKeywordForAnonymousFunctions: false,
+    insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: false,
+    insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: false,
+    insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces: true,
+    insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: false,
+    insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces: false,
+    insertSpaceAfterTypeAssertion: false,
+    insertSpaceBeforeFunctionParenthesis: false,
+    placeOpenBraceOnNewLineForFunctions: false,
+    placeOpenBraceOnNewLineForControlBlocks: false,
+    insertSpaceBeforeTypeAnnotation: false
+};
+
 /**
  * @param {string} directoryPath
  */
@@ -47,7 +72,7 @@ function generateInitialDeclaration(excludeDir) {
             return defaultCompilerHost.getSourceFile(fileName, languageVersion, onError, shouldCreateNewSourceFile);
         }
     };
-    
+
     const program = ts.createProgram(parsedConfig.fileNames, parsedConfig.options, customCompilerHost);
     program.emit();
     return fileContent;
@@ -280,6 +305,7 @@ function fixDeclaration(content, aceNamespacePath) {
                     let allReferences = referencePaths.join("\n") + "\n/// <reference path=\"./ace-modes.d.ts\" />\n";
                     output = allReferences + output;
                 }
+                output = formatDts(outputName, output);
                 fs.writeFileSync(outputName, output);
             });
 
@@ -289,12 +315,53 @@ function fixDeclaration(content, aceNamespacePath) {
 
     const sourceCode = program.getSourceFile(temporaryName);
     const result = ts.transform(sourceCode, [transformer, pathBasedTransformer]);
-    
+
     result.dispose();
 
     checkFinalDeclaration(finalDeclarations);
 }
 
+function createMinimalLanguageServiceHost() {
+    return {
+        files: {},
+        addFile(fileName, text) {
+            this.files[fileName] = ts.ScriptSnapshot.fromString(text);
+        },
+        "getCompilationSettings": function () {
+            return ts.getDefaultCompilerOptions();
+        },
+        "getScriptFileNames": function () {
+            return Object.keys(this.files);
+        },
+        "getScriptVersion": function (_fileName) {
+            return "0";
+        },
+        "getScriptSnapshot": function (fileName) {
+            return this.files[fileName];
+        },
+        "getCurrentDirectory": function () {
+            return "";
+        }
+    };
+
+}
+
+function formatDts(filename, text) {
+    var host = createMinimalLanguageServiceHost();
+    host.addFile(filename, text);
+    const languageService = ts.createLanguageService(host);
+    let formatEdits = languageService.getFormattingEditsForDocument(filename, defaultFormatCodeSettings);
+    formatEdits
+        .sort((a, b) => a.span.start - b.span.start)
+        .reverse()
+        .forEach(edit => {
+            const head = text.slice(0, edit.span.start);
+            const tail = text.slice(edit.span.start + edit.span.length);
+            text = `${head}${edit.newText}${tail}`;
+        });
+    return text;
+}
+
 
 /**
  * @param {string[]} declarationNames
@@ -408,7 +475,7 @@ function cloneAceNamespace(aceNamespacePath) {
  */
 function generateDeclaration(aceNamespacePath) {
     if (!aceNamespacePath) {
-        aceNamespacePath = __dirname + "/../ace-internal.d.ts"
+        aceNamespacePath = __dirname + "/../ace-internal.d.ts";
     }
     const excludeDir = "src/mode"; //TODO: remove, when modes are ES6
 
@@ -433,7 +500,9 @@ function generateDeclaration(aceNamespacePath) {
  */
 function updateDeclarationModuleNames(content) {
     let output = content.replace(
-        /ace\-code(?:\/src)?\/(mode(?!\/(?:matching_brace_outdent|matching_parens_outdent|behaviour|folding))|theme|ext|keybinding|snippets)\//g, "ace-builds/src-noconflict/$1-");
+        /ace\-code(?:\/src)?\/(mode(?!\/(?:matching_brace_outdent|matching_parens_outdent|behaviour|folding))|theme|ext|keybinding|snippets)\//g,
+        "ace-builds/src-noconflict/$1-"
+    );
     output = output.replace(/"ace\-code"/g, "\"ace-builds\"");
     output = output.replace(/ace\-code(?:\/src)?/g, "ace-builds-internal");
     return output;
@@ -442,7 +511,7 @@ function updateDeclarationModuleNames(content) {
 
 if (!module.parent) {
     require("./modes-declaration-generator");
-    generateDeclaration();    
+    generateDeclaration();
 }
 else {
     exports.generateDeclaration = generateDeclaration;