Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow extern interfaces https://github.com/TiVo/intellij-haxe/issues/202 #204

Merged
merged 2 commits into from
Apr 6, 2015

Conversation

as3boyan
Copy link
Contributor

@as3boyan as3boyan commented Apr 4, 2015

Allow extern interfaces
#202

@@ -258,7 +258,7 @@ externOrPrivate ::= 'extern' | privateKeyWord
typedefDeclaration ::= macroClassList? externOrPrivate? 'typedef' componentName genericParam? '=' functionTypeWrapper ';'?
{pin=5 mixin="com.intellij.plugins.haxe.lang.psi.impl.AbstractHaxeTypeDefImpl" implements="com.intellij.plugins.haxe.lang.psi.HaxeClass"}

externClassDeclaration ::= macroClassList? externOrPrivate* 'class' componentName genericParam? inheritList? '{' externClassDeclarationBody '}'
externClassDeclaration ::= macroClassList? externOrPrivate* ('class' | 'interface') componentName genericParam? inheritList? '{' externClassDeclarationBody '}'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Main change

@EBatTiVo
Copy link
Contributor

EBatTiVo commented Apr 4, 2015

You know, updating the copyright as a secondary change does not help when trying to decipher the differences in a change list. Can you please combine both of these changes into a single change when you pull it? Thanks.

Functionality approved for pull... though I wonder if we should be making a new rule, rather than expanding the current one. I'll leave it up to you.

@as3boyan
Copy link
Contributor Author

as3boyan commented Apr 4, 2015

I think https://github.com/TiVo/intellij-haxe/pull/204/files it's pretty clear

You know, updating the copyright as a secondary change does not help when trying to decipher the differences in a change list.

Forgot about it. Seems like so. Ok, I will try to make this change in one commit.

@EBatTiVo
Copy link
Contributor

EBatTiVo commented Apr 4, 2015

That is clear. If github is going to make the pull look like that, then that makes me happy -- I'll have less work to do. I guess we'll see how it actually shows up in the local repo once you make the pull.

as3boyan added a commit that referenced this pull request Apr 6, 2015
@as3boyan as3boyan merged commit 840dcaa into master Apr 6, 2015
@as3boyan as3boyan deleted the AllowMetaTagsOnExternTypes branch April 6, 2015 15:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants