Merge with master #221
Merged
Merge with master #221
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ring.fromCharCode in f;) #191
…ions Resolve static function imports for import with in keyword (import String.fromCharCode in f;) #191
Check if module is HaxeModuleType #166
Two primary issues: The first was a change in the BNF that changed the underlying type of HaxeLocalVarDeclaration to a HaxePsiField. The second was changing the type of HaxePsiField from a HaxeComponent to a HaxeNamedComponent. In the first case, the change itself wasn't really a problem; it was that HaxeComponentType.typeOf() hadn't been changed to reflect the new reality that it was going to be asked about HAXE_LOCAL_VAR_DECLARATION types. It simply returned null for types it didn't know about, thus HaxeIntroduceHandler.getOccurrences() stopped its loop looking for the enclosing method element. The fix was simply to add that type to the list of classifications. HAXE_VAR_DECLARATION was also added as future-proofing. In the second case, HaxePsiField must be a HaxeComponent for HaxeQualifiedNameProvider to work correctly. If it is not a HaxeComponent, a ClassCastException is thrown and refactorings requiring names silently fail.
Reverts part of change 15b1574 which added an override for HaxeMethodPsiMixinImpl.getContext(). The override called getContainingClass() instead of getParent(). That caused a tree_walk_up to skip several nodes, notably the CLASS_BODY element, and HaxeIntroduceHandler could no longer walk all of its children to find all of the fields in a class. Thus, for the test case names were suggested that clashed with a function name.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.