Skip to content

Commit

Permalink
fixed handling of multiple implements (#137)
Browse files Browse the repository at this point in the history
* fixed handling of multiple implements
  • Loading branch information
AlexHaxe authored Jan 10, 2019
1 parent 1a1069b commit 36d28cb
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 13 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## dev branch / next version (1.x.x)

- Fixed `TokenTreeCheckUtils.getColonType` detection of type check in array comprehension [#136](https://github.com/HaxeCheckstyle/tokentree/issues/136)
- Fixed handling of multiple `implements` [#137](https://github.com/HaxeCheckstyle/tokentree/issues/137)

## version 1.0.14 (2018-12-05)

Expand Down
2 changes: 1 addition & 1 deletion src/tokentree/walk/WalkImplements.hx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class WalkImplements {
WalkComment.walkComment(stream, parent);
WalkTypeNameDef.walkTypeNameDef(stream, interfacePart);
WalkComment.walkComment(stream, parent);
WalkImplements.walkImplements(stream, interfacePart);
WalkImplements.walkImplements(stream, parent);
WalkComment.walkComment(stream, parent);
}
}
20 changes: 8 additions & 12 deletions test/tokentree/TokenTreeBuilderParsingTest.hx
Original file line number Diff line number Diff line change
Expand Up @@ -918,21 +918,17 @@ abstract TokenTreeBuilderParsingTests(String) to String {
";

var IMPLEMENTS_EXTENDS = "
class Server implements ISocket extends BaseHandler
{
}
class Server implements ISocket extends BaseHandler {}
class Server extends BaseHandler implements ISocket
{
}
class Server extends BaseHandler implements ISocket {}
interface Server implements ISocket extends IBaseHandler
{
}
interface Server implements ISocket extends IBaseHandler {}
interface Server extends IBaseHandler implements ISocket
{
}
interface Server extends IBaseHandler implements ISocket {}
class Main implements ITest implements ITest1 implements ITest2 implements ITest3 extends Base {}
interface Main implements Test implements Test implements Test implements Test {}
";

var MACRO_PATTERNS = "
Expand Down

0 comments on commit 36d28cb

Please sign in to comment.