Merge pull request diffblue#528 from diffblue/cleanup/max-line-length

Extract max line length into a constant
NathanJPhillips · Aug 14, 2018 · 1737d9d · 1737d9d
2 parents e7e43da + 3016a8e
commit 1737d9d
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/env-model-generator/src/javaCode.ts b/env-model-generator/src/javaCode.ts
@@ -1,5 +1,7 @@
 import * as _ from "lodash";
 
+const maxLineLength = 150;
+
 function indent(line: string): string { return line === "" ? "" : "  " + line; }
 
 export abstract class CodeElement {
@@ -46,7 +48,7 @@ export class FnCall extends CodeElement implements Expression {
       argInLines[argInLines.length - 1] += ",";
     }
     const oneLine = this.fnName + "(" + argsInLines.join(" ") + ")";
-    if (oneLine.length < 80)
+    if (oneLine.length < maxLineLength)
       return [ oneLine ];
     return [
       this.fnName + "(",
@@ -74,7 +76,7 @@ export class BraceInitialiser extends CodeElement implements Expression {
       argInLines[argInLines.length - 1] += ",";
     }
     const oneLine = this.typename + " { " + argsInLines.join(" ") + " }";
-    if (oneLine.length < 80)
+    if (oneLine.length < maxLineLength)
       return [ oneLine ];
     return [
       this.typename + " {",
@@ -138,7 +140,7 @@ export class Assignment extends CodeElement implements Statement {
       rhsInLines[rhsInLines.length - 1] += ";";
     if (rhsInLines.length === 1) {
       const oneLine = this.lhs + " = " + rhsInLines[0];
-      if (oneLine.length < 100)
+      if (oneLine.length < maxLineLength)
         return [ oneLine ];
     }
     return [
@@ -169,15 +171,15 @@ export class Declaration extends CodeElement implements Statement, Member {
       rhsInLines[rhsInLines.length - 1] += ";";
     const name = this.name + (rhsInLines.length === 0 ? ";" : " =");
     const oneLineLhs = `${this.modifiedType} ${name}`;
-    if (oneLineLhs.length >= 80)
+    if (oneLineLhs.length >= maxLineLength)
       return [
         this.modifiedType,
         indent(name),
         ...rhsInLines.map((arg) => indent(indent(arg))),
       ];
     if (rhsInLines.length <= 1) {
       const oneLine = rhsInLines.length === 0 ? oneLineLhs : `${oneLineLhs} ${rhsInLines[0]}`;
-      if (oneLine.length < 80)
+      if (oneLine.length < maxLineLength)
         return [ oneLine ];
     }
     return [
@@ -203,7 +205,7 @@ export class Return extends CodeElement implements Statement {
       valueInLines[valueInLines.length - 1] += ";";
     if (valueInLines.length === 1) {
       const oneLine = "return " + valueInLines[0];
-      if (oneLine.length < 100)
+      if (oneLine.length < maxLineLength)
         return [ oneLine ];
     }
     return [