Trim line ends (#947)

* Trim line ends of comments * Indent only for non-empty line * accept baselines Co-authored-by: Nathan Shively-Sanders <[email protected]>
microsoft · Feb 23, 2021 · d52565b · d52565b
1 parent c6d98e4
commit d52565b
Show file tree

Hide file tree

Showing 6 changed files with 253 additions and 253 deletions.
diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts
diff --git a/baselines/dom.iterable.generated.d.ts b/baselines/dom.iterable.generated.d.ts
@@ -119,7 +119,7 @@ interface IDBDatabase {
 interface IDBObjectStore {
     /**
      * Creates a new index in store with the given name, keyPath and options and returns a new IDBIndex. If the keyPath and options define constraints that cannot be satisfied with the data already in store the upgrade transaction will abort with a "ConstraintError" DOMException.
-     * 
+     *
      * Throws an "InvalidStateError" DOMException if not called within an upgrade transaction.
      */
     createIndex(name: string, keyPath: string | Iterable<string>, options?: IDBIndexParameters): IDBIndex;

diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts
diff --git a/baselines/webworker.iterable.generated.d.ts b/baselines/webworker.iterable.generated.d.ts
@@ -60,7 +60,7 @@ interface IDBDatabase {
 interface IDBObjectStore {
     /**
      * Creates a new index in store with the given name, keyPath and options and returns a new IDBIndex. If the keyPath and options define constraints that cannot be satisfied with the data already in store the upgrade transaction will abort with a "ConstraintError" DOMException.
-     * 
+     *
      * Throws an "InvalidStateError" DOMException if not called within an upgrade transaction.
      */
     createIndex(name: string, keyPath: string | Iterable<string>, options?: IDBIndexParameters): IDBIndex;

diff --git a/src/emitter.ts b/src/emitter.ts
@@ -68,7 +68,7 @@ function createTextWriter(newLine: string) {
     }
 
     function write(s: string) {
-        if (lineStart) {
+        if (s && lineStart) {
             output += getIndentString(indent);
             lineStart = false;
         }

diff --git a/src/widlprocess.ts b/src/widlprocess.ts
@@ -103,9 +103,9 @@ function addComments(obj: any, commentMap: Record<string, string>, container: st
     const key = container.toLowerCase() + (member ? "-" + member.toLowerCase() : "");
     if (commentMap[key]) {
         const comments = commentMap[key].split("\n");
-        obj["comment"] = "/**\n * ";
-        obj["comment"] += comments.join("\n * ");
-        obj["comment"] += "\n */";
+        obj["comment"] = "/**\n";
+        obj["comment"] += comments.map(c => ` * ${c}`.trimRight() + "\n").join("");
+        obj["comment"] += " */";
     }
 }