fixed expression try…catch, fixes #509

src/formatter/marker/MarkSameLine.hx

@@ -264,7 +264,7 @@ class MarkSameLine extends MarkerBase {
  function markCatch(token:TokenTree) {
  if (shouldCatchBeSameLine(token) && config.sameLine.expressionTry == Same) {
  markBodyAfterPOpen(token, Same, false);
- applySameLinePolicy(token, config.sameLine.tryCatch);
+ applySameLinePolicy(token, config.sameLine.expressionTry);
  return;
  }
  markBodyAfterPOpen(token, config.sameLine.catchBody, false);

src/formatter/marker/MarkWhitespace.hx

@@ -162,7 +162,7 @@ class MarkWhitespace extends MarkerBase {
  policy = policy.add(Before);
  case Call | Expression:
  }
- case Question:
+ case Question | DblDot:
  policy = policy.add(Before);
  default:
  }

test/testcases/sameline/issue_123_return_try_catch.hxtest

@@ -5,6 +5,8 @@
 
 class Main {
  public static function main() {
+ return try call(); catch (e:Any) null;
+ return try {call();} catch (e:Any) {null;}
  return try {
  call();
  } catch (e:Any) {
@@ -17,6 +19,12 @@ class Main {
 
 class Main {
  public static function main() {
+ return try call(); catch (e:Any) null;
+ return try {
+ call();
+ } catch (e:Any) {
+ null;
+ }
  return try {
  call();
  } catch (e:Any) {

test/testcases/sameline/issue_123_return_try_catch_expression_try_next.hxtest

@@ -0,0 +1,40 @@
+{
+ "sameLine": {
+ "expressionTry": "next"
+ }
+}
+
+---
+
+class Main {
+ public static function main() {
+ return try call(); catch (e:Any) null;
+ return try {call();} catch (e:Any) {null;}
+ return try {
+ call();
+ } catch (e:Any) {
+ null;
+ }
+ }
+}
+
+---
+
+class Main {
+ public static function main() {
+ return try
+ call();
+ catch (e:Any)
+ null;
+ return try {
+ call();
+ } catch (e:Any) {
+ null;
+ }
+ return try {
+ call();
+ } catch (e:Any) {
+ null;
+ }
+ }
+}

test/testcases/sameline/issue_123_return_try_catch_expression_try_same.hxtest

@@ -0,0 +1,37 @@
+{
+ "sameLine": {
+ "expressionTry": "same"
+ }
+}
+
+---
+
+class Main {
+ public static function main() {
+ return try call(); catch (e:Any) null;
+ return try {call();} catch (e:Any) {null;}
+ return try {
+ call();
+ } catch (e:Any) {
+ null;
+ }
+ }
+}
+
+---
+
+class Main {
+ public static function main() {
+ return try call(); catch (e:Any) null;
+ return try {
+ call();
+ } catch (e:Any) {
+ null;
+ }
+ return try {
+ call();
+ } catch (e:Any) {
+ null;
+ }
+ }
+}

test/testcases/sameline/issue_123_return_try_catch_next.hxtest

@@ -8,6 +8,8 @@
 
 class Main {
  public static function main() {
+ return try call(); catch (e:Any) null;
+ return try {call();} catch (e:Any) {null;}
  return try {
  call();
  } catch (e:Any) {
@@ -20,10 +22,15 @@ class Main {
 
 class Main {
  public static function main() {
+ return try call(); catch (e:Any) null;
  return try {
  call();
+ } catch (e:Any) {
+ null;
  }
- catch (e:Any) {
+ return try {
+ call();
+ } catch (e:Any) {
  null;
  }
  }

test/testcases/sameline/issue_509_try_catch_expression.hxtest

@@ -0,0 +1,21 @@
+{
+ "sameLine": {
+ "tryCatch": "next"
+ }
+}
+
+---
+
+class Main {
+ static function main() {
+ var applicationName = try ProjectUtils.getApplicationFile(FileSystem.fullPath(project.projectXmlPath)) catch (_:Dynamic) project.name;
+ }
+}
+
+---
+
+class Main {
+ static function main() {
+ var applicationName = try ProjectUtils.getApplicationFile(FileSystem.fullPath(project.projectXmlPath)) catch (_:Dynamic) project.name;
+ }
+}

test/testcases/sameline/issue_509_try_catch_expression_next.hxtest

@@ -0,0 +1,25 @@
+{
+ "sameLine": {
+ "tryCatch": "next",
+ "expressionTry": "next"
+ }
+}
+
+---
+
+class Main {
+ static function main() {
+ var applicationName = try ProjectUtils.getApplicationFile(FileSystem.fullPath(project.projectXmlPath)) catch (_:Dynamic) project.name;
+ }
+}
+
+---
+
+class Main {
+ static function main() {
+ var applicationName = try
+ ProjectUtils.getApplicationFile(FileSystem.fullPath(project.projectXmlPath))
+ catch (_:Dynamic)
+ project.name;
+ }
+}

test/testcases/sameline/issue_509_try_catch_expression_same.hxtest

@@ -0,0 +1,22 @@
+{
+ "sameLine": {
+ "tryCatch": "next",
+ "expressionTry": "same"
+ }
+}
+
+---
+
+class Main {
+ static function main() {
+ var applicationName = try ProjectUtils.getApplicationFile(FileSystem.fullPath(project.projectXmlPath)) catch (_:Dynamic) project.name;
+ }
+}
+
+---
+
+class Main {
+ static function main() {
+ var applicationName = try ProjectUtils.getApplicationFile(FileSystem.fullPath(project.projectXmlPath)) catch (_:Dynamic) project.name;
+ }
+}

test/testcases/whitespace/issue_592_bracket_config_map_literal.hxtest

@@ -33,5 +33,5 @@ function test(arr) {
  trace(arr[1]);
  makeArray()[100]();
  var a = [for (i in 0...100) i * i];
- _metadata = _data == null ? [] : [Constants.DEFAULT_VARIATION => _data];
+ _metadata = _data == null ? [] : [ Constants.DEFAULT_VARIATION => _data ];
 }