Fixed object decl handling in RightCurly (#497)

* fixed object decl handling in RightCurly, fixes #496
* disable C++ for nightly builds

Author: AlexHaxe

.github/workflows/checkstyle-linux.yml

@@ -56,6 +56,7 @@ jobs:
     - name: Build NodeJs version
       run: npx haxe buildJS.hxml
     - name: Build C++ version
+      if: matrix.haxe-version != 'nightly'
       run: npx haxe buildCpp.hxml
     - name: Build JSON schema
       run: npx haxe buildSchema.hxml

.travis.yml

@@ -31,7 +31,7 @@ script:
   - npx haxe build.hxml
   - npx haxe buildDebug.hxml
   - npx haxe buildJS.hxml
-  - npx haxe buildCpp.hxml
+  - if [[ "$HAXE_VERSION" != "nightly" ]]; then npx haxe buildCpp.hxml; fi
   - npx haxe buildSchema.hxml
   - npx haxe -D codecov_json buildTest.hxml
   - npx haxe testJava.hxml

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## dev branch / next version (2.x.x)
 
 - Added support for final in `MagicNumber`, fixes [#494](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/494) ([#495](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/495))
+- Fixed handling `OBJECT_DECL` token in `RightCurly`, fixes [#496](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/496) ([#497](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/497))
 
 ## version 2.6.1 (2019-12-17)
 

build/Build.hx

@@ -4,7 +4,7 @@ import haxe.Timer;
 	helper class to build everything, avoids `--next`
 **/
 class Build {
-	private static var exitCode:Int = 0;
+	static var exitCode:Int = 0;
 
 	/**
 		run all build files

checkstyle.json

@@ -28,7 +28,10 @@
 		{
 			"props": {
 				"ignoreExtern": true,
-				"format": "^[A-Z][A-Z0-9]*(_[A-Z0-9_]+)*$"
+				"format": "^[A-Z][A-Z0-9]*(_[A-Z0-9_]+)*$",
+				"tokens": [
+					"INLINE"
+				]
 			},
 			"type": "ConstantName"
 		},

haxe_libraries/hxcpp.hxml

@@ -1,4 +1,4 @@
--D hxcpp=4.0.52
-# @install: lix --silent download "haxelib:/hxcpp#4.0.52" into hxcpp/4.0.52/haxelib
-# @run: haxelib run-dir hxcpp ${HAXE_LIBCACHE}/hxcpp/4.0.52/haxelib
--cp ${HAXE_LIBCACHE}/hxcpp/4.0.52/haxelib/
+-D hxcpp=4.0.64
+# @install: lix --silent download "haxelib:/hxcpp#4.0.64" into hxcpp/4.0.64/haxelib
+# @run: haxelib run-dir hxcpp ${HAXE_LIBCACHE}/hxcpp/4.0.64/haxelib
+-cp ${HAXE_LIBCACHE}/hxcpp/4.0.64/haxelib/

src/checkstyle/checks/block/RightCurlyCheck.hx

@@ -70,10 +70,9 @@ class RightCurlyCheck extends Check {
 			switch (type) {
 				case BLOCK:
 				case TYPEDEFDECL:
-					if (!hasToken(TYPEDEF_DEF)) {
-						continue;
-					}
+					if (!hasToken(TYPEDEF_DEF)) continue;
 				case OBJECTDECL:
+					if (!hasToken(OBJECT_DECL)) continue;
 				case ANONTYPE:
 				case UNKNOWN:
 			}

test/checkstyle/checks/block/RightCurlyCheckTest.hx

@@ -191,7 +191,7 @@ class RightCurlyCheckTest extends CheckTestCase<RightCurlyCheckTests> {
 	@Test
 	public function testArrayComprehension() {
 		var check = new RightCurlyCheck();
-		check.tokens = [ARRAY_COMPREHENSION];
+		check.tokens = [ARRAY_COMPREHENSION, OBJECT_DECL];
 		assertNoMsg(check, ARRAY_COMPREHENSION_ISSUE_114);
 		assertNoMsg(check, ARRAY_COMPREHENSION_2_ISSUE_114);
 
@@ -202,6 +202,45 @@ class RightCurlyCheckTest extends CheckTestCase<RightCurlyCheckTests> {
 		check.option = ALONE;
 		assertMsg(check, ARRAY_COMPREHENSION_ISSUE_114, MSG_NOT_SAME_LINE);
 		assertNoMsg(check, ARRAY_COMPREHENSION_2_ISSUE_114);
+
+		check.tokens = [ARRAY_COMPREHENSION];
+		check.option = ALONE_OR_SINGLELINE;
+		assertNoMsg(check, ARRAY_COMPREHENSION_ISSUE_114);
+		assertNoMsg(check, ARRAY_COMPREHENSION_2_ISSUE_114);
+
+		check.option = SAME;
+		assertNoMsg(check, ARRAY_COMPREHENSION_ISSUE_114);
+		assertNoMsg(check, ARRAY_COMPREHENSION_2_ISSUE_114);
+
+		check.option = ALONE;
+		assertNoMsg(check, ARRAY_COMPREHENSION_ISSUE_114);
+		assertNoMsg(check, ARRAY_COMPREHENSION_2_ISSUE_114);
+	}
+
+	@Test
+	public function testTokenIfNoObjectDecl() {
+		var check = new RightCurlyCheck();
+		check.tokens = [IF];
+		check.option = ALONE;
+
+		assertMsg(check, SINGLELINE_IF, MSG_NOT_SAME_LINE);
+
+		assertNoMsg(check, SINGLELINE_FUNCTION);
+		assertNoMsg(check, SINGLELINE_FOR);
+		assertNoMsg(check, SINGLELINE_WHILE);
+		assertNoMsg(check, SINGLELINE_TRY_CATCH);
+		assertNoMsg(check, SINGLELINE_INTERFACE);
+		assertNoMsg(check, SINGLELINE_CLASS);
+		assertNoMsg(check, SINGLELINE_TYPEDEF);
+		assertNoMsg(check, SINGLELINE_SWITCH);
+		assertNoMsg(check, SINGLELINE_CASE);
+		assertNoMsg(check, SINGLELINE_OBJECT);
+		assertNoMsg(check, SINGLELINE_ABSTRACT);
+		assertNoMsg(check, SINGLELINE_ENUM);
+		assertNoMsg(check, SINGLELINE_NESTED_OBJECT);
+
+		assertNoMsg(check, CONSTRUCTOR_OBJECT_DECL_ISSUE_152);
+		assertNoMsg(check, SINGLELINE_PATTERN_OBJECT);
 	}
 }
 
@@ -547,4 +586,13 @@ abstract RightCurlyCheckTests(String) to String {
 	class Test {
 		var field = new Object({x:0});
 	}";
+	var SINGLELINE_PATTERN_OBJECT = "
+	class Test {
+		public function foo() {
+			var obj = {x: 1, y: 2};
+			switch (obj) {
+				case {x: 2, y: b}:
+			}
+		}
+	}";
 }