Skip to content

Commit 0a98c85

Browse files
authored
added CommentedOutCode check (#512)
* added CommentedOutCode check * removed 4.0.5 build jobs * fixed missing quote in file tag of XMLReporter * updated haxeparser lib * removed COC
1 parent 773bf04 commit 0a98c85

File tree

19 files changed

+431
-238
lines changed

19 files changed

+431
-238
lines changed

.github/workflows/checkstyle-linux.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
strategy:
1717
matrix:
18-
haxe-version: ['4.0.5', '4.1.5', '4.2.1', 'nightly']
18+
haxe-version: ['4.1.5', '4.2.4', 'nightly']
1919
env:
2020
CC_TEST_REPORTER_ID: c4eda639526d39fbcab7ab9fc68c4046d4e597df56dbcb552b42d27b3580b758
2121
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
@@ -26,7 +26,7 @@ jobs:
2626
with:
2727
node-version: 10
2828
- name: Installing codeclimate client
29-
if: matrix.haxe-version == '4.2.1'
29+
if: matrix.haxe-version == '4.2.4'
3030
run: |
3131
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
3232
chmod +x ./cc-test-reporter
@@ -60,13 +60,13 @@ jobs:
6060
- name: Run Java tests
6161
run: npx haxe testJava.hxml
6262
- name: Format and upload codeclimate coverage
63-
if: success() && matrix.haxe-version == '4.2.1'
63+
if: success() && matrix.haxe-version == '4.2.4'
6464
run: |
6565
( \
6666
cd src; \
6767
../cc-test-reporter format-coverage -t lcov ../lcov.info; \
6868
../cc-test-reporter upload-coverage; \
6969
)
7070
- name: Upload results to codecov
71-
if: success() && (matrix.haxe-version == '4.2.1')
71+
if: success() && (matrix.haxe-version == '4.2.4')
7272
run: bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"

.haxerc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"version": "4.2.1",
2+
"version": "4.2.4",
33
"resolveLibs": "scoped"
44
}

.travis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,15 @@ dist: xenial
66

77
env:
88
matrix:
9-
- HAXE_VERSION=haxe4
109
- HAXE_VERSION=haxe41
1110
- HAXE_VERSION=haxe42
1211
- HAXE_VERSION=nightly
1312

1413
install:
1514
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter; chmod +x ./cc-test-reporter
1615
- npm install
17-
- if [[ "$HAXE_VERSION" == "haxe4" ]]; then npx lix download haxe 4.0.5; npx lix use haxe 4.0.5; fi
1816
- if [[ "$HAXE_VERSION" == "haxe41" ]]; then npx lix download haxe 4.1.5; npx lix use haxe 4.1.5; fi
19-
- if [[ "$HAXE_VERSION" == "haxe42" ]]; then npx lix download haxe 4.2.1; npx lix use haxe 4.2.1; fi
17+
- if [[ "$HAXE_VERSION" == "haxe42" ]]; then npx lix download haxe 4.2.4; npx lix use haxe 4.2.4; fi
2018
- if [[ "$HAXE_VERSION" == "nightly" ]]; then npx lix download haxe nightly; npx lix use haxe nightly; fi
2119
- npx lix download
2220
- npx haxe -version

CHANGELOG.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22

33
## dev branch / next version (2.x.x)
44

5-
- Added related messages to reporters for `CodeSimilarity` check ([#506](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/506))
5+
- New check `CommentedOutCode` to check comments for commented out code fragments ([#512](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/512))
66
- Fixed Haxe nightly compilation ([#505](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/505))
7+
- Added related messages to reporters for `CodeSimilarity` check ([#506](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/506))
78
- Fixed null pointer exception in `UnusedImport` check ([#507](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/507))
8-
- Updated to Haxe 4.1.5 ([#505](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/505))
9+
- Updated to Haxe 4.2.4 ([#512](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/512))
10+
- Retired Haxe 4.0.5 compile support ([#512](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/512))
911

1012
## version 2.7.0 (2020-12-23)
1113

CODE_OF_CONDUCT.md

Lines changed: 0 additions & 74 deletions
This file was deleted.

checkstyle.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@
5353
{
5454
"type": "DefaultComesLast"
5555
},
56+
{
57+
"type": "CommentedOutCode"
58+
},
5659
{
5760
"type": "DocCommentStyle"
5861
},

haxe_libraries/haxeparser.hxml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# @install: lix --silent download "gh://github.com/simn/haxeparser#9eee8e0db1dc628d53334e30ebf08e31cb1c92b9" into haxeparser/3.3.0/github/9eee8e0db1dc628d53334e30ebf08e31cb1c92b9
1+
# @install: lix --silent download "gh://github.com/simn/haxeparser#e4f91798d502cd2811a363c1d2fe1456aa9feb02" into haxeparser/3.3.0/github/e4f91798d502cd2811a363c1d2fe1456aa9feb02
22
-lib hxparse
3-
-cp ${HAXE_LIBCACHE}/haxeparser/3.3.0/github/9eee8e0db1dc628d53334e30ebf08e31cb1c92b9/src
3+
-cp ${HAXE_LIBCACHE}/haxeparser/3.3.0/github/e4f91798d502cd2811a363c1d2fe1456aa9feb02/src
44
-D haxeparser=3.3.0

0 commit comments

Comments
 (0)