Add semicolon preference to formatter options

src/compiler/core.ts

@@ -329,6 +329,21 @@ namespace ts {
         return undefined;
     }
 
+    /**
+     * Like `forEach`, but iterates in reverse order.
+     */
+    export function forEachRight<T, U>(array: readonly T[] | undefined, callback: (element: T, index: number) => U | undefined): U | undefined {
+        if (array) {
+            for (let i = array.length - 1; i >= 0; i--) {
+                const result = callback(array[i], i);
+                if (result) {
+                    return result;
+                }
+            }
+        }
+        return undefined;
+    }
+
     /** Like `forEach`, but suitable for use with numbers and strings (which may be falsy). */
     export function firstDefined<T, U>(array: readonly T[] | undefined, callback: (element: T, index: number) => U | undefined): U | undefined {
         if (array === undefined) {
@@ -2159,8 +2174,19 @@ namespace ts {
         return (arg: T) => f(arg) && g(arg);
     }
 
-    export function or<T>(f: (arg: T) => boolean, g: (arg: T) => boolean): (arg: T) => boolean {
-        return arg => f(arg) || g(arg);
+    export function or<T extends unknown>(...fs: ((arg: T) => boolean)[]): (arg: T) => boolean {
+        return arg => {
+            for (const f of fs) {
+                if (f(arg)) {
+                    return true;
+                }
+            }
+            return false;
+        };
+    }
+
+    export function not<T extends unknown[]>(fn: (...args: T) => boolean): (...args: T) => boolean {
+        return (...args) => !fn(...args);
     }
 
     export function assertType<T>(_: T): void { }

src/compiler/utilities.ts

@@ -3380,11 +3380,7 @@ namespace ts {
         };
     }
 
-    export interface TrailingSemicolonDeferringWriter extends EmitTextWriter {
-        resetPendingTrailingSemicolon(): void;
-    }
-
-    export function getTrailingSemicolonDeferringWriter(writer: EmitTextWriter): TrailingSemicolonDeferringWriter {
+    export function getTrailingSemicolonDeferringWriter(writer: EmitTextWriter): EmitTextWriter {
         let pendingTrailingSemicolon = false;
 
         function commitPendingTrailingSemicolon() {
@@ -3451,20 +3447,6 @@ namespace ts {
                 commitPendingTrailingSemicolon();
                 writer.decreaseIndent();
             },
-            resetPendingTrailingSemicolon() {
-                pendingTrailingSemicolon = false;
-            }
-        };
-    }
-
-    export function getTrailingSemicolonOmittingWriter(writer: EmitTextWriter): EmitTextWriter {
-        const deferringWriter = getTrailingSemicolonDeferringWriter(writer);
-        return {
-            ...deferringWriter,
-            writeLine() {
-                deferringWriter.resetPendingTrailingSemicolon();
-                writer.writeLine();
-            },
         };
     }
 

src/harness/fourslash.ts

@@ -1683,7 +1683,7 @@ namespace FourSlash {
                 if (this.enableFormatting) {
                     const edits = this.languageService.getFormattingEditsAfterKeystroke(this.activeFile.fileName, offset, ch, this.formatCodeSettings);
                     if (edits.length) {
-                        offset += this.applyEdits(this.activeFile.fileName, edits, /*isFormattingEdit*/ true);
+                        offset += this.applyEdits(this.activeFile.fileName, edits);
                     }
                 }
             }
@@ -1756,7 +1756,7 @@ namespace FourSlash {
                 if (this.enableFormatting) {
                     const edits = this.languageService.getFormattingEditsAfterKeystroke(this.activeFile.fileName, offset, ch, this.formatCodeSettings);
                     if (edits.length) {
-                        offset += this.applyEdits(this.activeFile.fileName, edits, /*isFormattingEdit*/ true);
+                        offset += this.applyEdits(this.activeFile.fileName, edits);
                     }
                 }
             }
@@ -1775,7 +1775,7 @@ namespace FourSlash {
             if (this.enableFormatting) {
                 const edits = this.languageService.getFormattingEditsForRange(this.activeFile.fileName, start, offset, this.formatCodeSettings);
                 if (edits.length) {
-                    this.applyEdits(this.activeFile.fileName, edits, /*isFormattingEdit*/ true);
+                    this.applyEdits(this.activeFile.fileName, edits);
                 }
             }
 
@@ -1810,9 +1810,7 @@ namespace FourSlash {
          * @returns The number of characters added to the file as a result of the edits.
          * May be negative.
          */
-        private applyEdits(fileName: string, edits: readonly ts.TextChange[], isFormattingEdit: boolean): number {
-            // Get a snapshot of the content of the file so we can make sure any formatting edits didn't destroy non-whitespace characters
-            const oldContent = this.getFileContent(fileName);
+        private applyEdits(fileName: string, edits: readonly ts.TextChange[]): number {
             let runningOffset = 0;
 
             forEachTextChange(edits, edit => {
@@ -1833,14 +1831,6 @@ namespace FourSlash {
                 runningOffset += editDelta;
             });
 
-            if (isFormattingEdit) {
-                const newContent = this.getFileContent(fileName);
-
-                if (this.removeWhitespace(newContent) !== this.removeWhitespace(oldContent)) {
-                    this.raiseError("Formatting operation destroyed non-whitespace content");
-                }
-            }
-
             return runningOffset;
         }
 
@@ -1856,17 +1846,17 @@ namespace FourSlash {
 
         public formatDocument() {
             const edits = this.languageService.getFormattingEditsForDocument(this.activeFile.fileName, this.formatCodeSettings);
-            this.applyEdits(this.activeFile.fileName, edits, /*isFormattingEdit*/ true);
+            this.applyEdits(this.activeFile.fileName, edits);
         }
 
         public formatSelection(start: number, end: number) {
             const edits = this.languageService.getFormattingEditsForRange(this.activeFile.fileName, start, end, this.formatCodeSettings);
-            this.applyEdits(this.activeFile.fileName, edits, /*isFormattingEdit*/ true);
+            this.applyEdits(this.activeFile.fileName, edits);
         }
 
         public formatOnType(pos: number, key: string) {
             const edits = this.languageService.getFormattingEditsAfterKeystroke(this.activeFile.fileName, pos, key, this.formatCodeSettings);
-            this.applyEdits(this.activeFile.fileName, edits, /*isFormattingEdit*/ true);
+            this.applyEdits(this.activeFile.fileName, edits);
         }
 
         private editScriptAndUpdateMarkers(fileName: string, editStart: number, editEnd: number, newText: string) {
@@ -2414,7 +2404,7 @@ namespace FourSlash {
 
             if (options.applyChanges) {
                 for (const change of action.changes) {
-                    this.applyEdits(change.fileName, change.textChanges, /*isFormattingEdit*/ false);
+                    this.applyEdits(change.fileName, change.textChanges);
                 }
                 this.verifyNewContentAfterChange(options, action.changes.map(c => c.fileName));
             }
@@ -2497,7 +2487,7 @@ namespace FourSlash {
 
         private applyChanges(changes: readonly ts.FileTextChanges[]): void {
             for (const change of changes) {
-                this.applyEdits(change.fileName, change.textChanges, /*isFormattingEdit*/ false);
+                this.applyEdits(change.fileName, change.textChanges);
             }
         }
 
@@ -2525,7 +2515,7 @@ namespace FourSlash {
                 ts.Debug.assert(codeFix.changes.length === 1);
                 const change = ts.first(codeFix.changes);
                 ts.Debug.assert(change.fileName === fileName);
-                this.applyEdits(change.fileName, change.textChanges, /*isFormattingEdit*/ false);
+                this.applyEdits(change.fileName, change.textChanges);
                 const text = range ? this.rangeText(range) : this.getFileContent(this.activeFile.fileName);
                 actualTextArray.push(text);
                 scriptInfo.updateContent(originalContent);
@@ -2929,7 +2919,7 @@ namespace FourSlash {
 
             const editInfo = this.languageService.getEditsForRefactor(this.activeFile.fileName, this.formatCodeSettings, range, refactorName, actionName, ts.emptyOptions)!;
             for (const edit of editInfo.edits) {
-                this.applyEdits(edit.fileName, edit.textChanges, /*isFormattingEdit*/ false);
+                this.applyEdits(edit.fileName, edit.textChanges);
             }
 
             let renameFilename: string | undefined;
@@ -3045,7 +3035,7 @@ namespace FourSlash {
             const editInfo = this.languageService.getEditsForRefactor(marker.fileName, formattingOptions, marker.position, refactorNameToApply, actionName, ts.emptyOptions)!;
 
             for (const edit of editInfo.edits) {
-                this.applyEdits(edit.fileName, edit.textChanges, /*isFormattingEdit*/ false);
+                this.applyEdits(edit.fileName, edit.textChanges);
             }
             const actualContent = this.getFileContent(marker.fileName);
 

src/server/protocol.ts

@@ -2956,6 +2956,12 @@ namespace ts.server.protocol {
         Smart = "Smart",
     }
 
+    export enum SemicolonPreference {
+        Ignore = "ignore",
+        Insert = "insert",
+        Remove = "remove",
+    }
+
     export interface EditorSettings {
         baseIndentSize?: number;
         indentSize?: number;
@@ -2982,6 +2988,7 @@ namespace ts.server.protocol {
         placeOpenBraceOnNewLineForFunctions?: boolean;
         placeOpenBraceOnNewLineForControlBlocks?: boolean;
         insertSpaceBeforeTypeAnnotation?: boolean;
+        semicolons?: SemicolonPreference;
     }
 
     export interface UserPreferences {

src/services/codefixes/importFixes.ts

@@ -169,7 +169,7 @@ namespace ts.codefix {
         // We sort the best codefixes first, so taking `first` is best for completions.
         const moduleSpecifier = first(getNewImportInfos(program, sourceFile, position, exportInfos, host, preferences)).moduleSpecifier;
         const fix = first(getFixForImport(exportInfos, symbolName, position, program, sourceFile, host, preferences));
-        return { moduleSpecifier, codeAction: codeFixActionToCodeAction(codeActionForFix({ host, formatContext }, sourceFile, symbolName, fix, getQuotePreference(sourceFile, preferences))) };
+        return { moduleSpecifier, codeAction: codeFixActionToCodeAction(codeActionForFix({ host, formatContext, preferences }, sourceFile, symbolName, fix, getQuotePreference(sourceFile, preferences))) };
     }
 
     function codeFixActionToCodeAction({ description, changes, commands }: CodeFixAction): CodeAction {