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.

Sign up for GitHub

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

Jump to bottom

Features/#464 module resolve #466

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Features/#464 module resolve #466

wants to merge 14 commits into from

Conversation

dakochik
Copy link
Contributor

module name resolve was fixed

Dmitry and others added 14 commits November 4, 2021 11:59
LineMarkerProvider was implemented for rule inheritance.
522b9f7 
Resolves: #429
Merge branch 'master' of https://github.com/JetBrains-Research/snakec…
49fd4c6 
…harm into features/#429-icon-for-use

� Conflicts:
�	CHANGELOG.md
�	src/main/kotlin/com/jetbrains/snakecharm/lang/psi/SmkPsiElements.kt
�	src/main/kotlin/com/jetbrains/snakecharm/lang/psi/impl/SmkUseImpl.kt
�	src/main/resources/SnakemakeBundle.properties
Now rule names are resolved properly.
ab65a0e 
Resolves: #455
@dakochik
Update CHANGELOG.md
fe4261a
Tests were added. Minor fixes in marker provider and smk use implemen…
b50ba5f 
…tation.

Resolves: #429
Merge branch 'features/#455-unresolved-rules' of https://github.com/J…
486e511 
…etBrains-Research/snakecharm into features/#429-icon-for-use
Now rules which were imported via 'include' are supported too.
4510e23 
Resolves: #429
@iromeo
refactor: code cleanup
ae940f0
Merge branch 'master' of https://github.com/JetBrains-Research/snakec…
7c72c6d 
…harm into features/#429-icon-for-use

� Conflicts:
�	CHANGELOG.md
�	src/main/kotlin/com/jetbrains/snakecharm/lang/psi/SmkFile.kt
Code cleanup.
83c436b 
Resolves: #429
Tests fix.
9c62dda 
Resolves: #429
New index for inherited rules was created. Behaviour of creating gutt…
6380fa3 
…er icons in case of overridden rules was changed. Corresponding tests were extended.

Resolves: #462, #463, #429
Merge branch 'features/#462-gutter-icons-module-case' of https://gith…
cfdbcb4 
…ub.com/JetBrains-Research/snakecharm into features/#464-module-resolve
Hardcoded PyStringLiteralExpression validation was changed to PSI usage.
e890bbd 
Resolves: #464
@dakochik
Copy link
Contributor Author

Note, that all commits except the last one was taken from #462 so only the e890bbd is related to this issue.
Also, sorry, but this commit contains misleading commit message, the following one will be correct:
module name resolve behavior was extended by filtering resolve results

@iromeo
Copy link
Contributor

iromeo commented Feb 4, 2022

Ok, please merge it into master

@iromeo iromeo assigned dakochik and unassigned iromeo Feb 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@dakochik dakochik

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dakochik @iromeo