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/#462 gutter icons module case #465

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

Features/#462 gutter icons module case #465

wants to merge 29 commits into from

Commits on Nov 4, 2021

  1. LineMarkerProvider was implemented for rule inheritance. 

    Resolves: #429
    Dmitry committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    522b9f7 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2021

  1. Merge branch 'master' of https://github.com/JetBrains-Research/snakec… 

    …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
    Dmitry committed Dec 30, 2021
    Configuration menu
    Copy the full SHA
    49fd4c6 View commit details
    Browse the repository at this point in the history

  2. Now rule names are resolved properly. 

    Resolves: #455
    Dmitry committed Dec 30, 2021
    Configuration menu
    Copy the full SHA
    ab65a0e View commit details
    Browse the repository at this point in the history

  3. Update CHANGELOG.md

    @dakochik
    dakochik authored Dec 30, 2021
    Configuration menu
    Copy the full SHA
    fe4261a View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2022

  1. Tests were added. Minor fixes in marker provider and smk use implemen… 

    …tation.

Resolves: #429
    Dmitry committed Jan 13, 2022
    Configuration menu
    Copy the full SHA
    b50ba5f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'features/#455-unresolved-rules' of https://github.com/J… 

    …etBrains-Research/snakecharm into features/#429-icon-for-use
    Dmitry committed Jan 13, 2022
    Configuration menu
    Copy the full SHA
    486e511 View commit details
    Browse the repository at this point in the history

  3. Now rules which were imported via 'include' are supported too. 

    Resolves: #429
    Dmitry committed Jan 13, 2022
    Configuration menu
    Copy the full SHA
    4510e23 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2022

  1. refactor: code cleanup

    @iromeo
    iromeo committed Jan 15, 2022
    Configuration menu
    Copy the full SHA
    ae940f0 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2022

  1. Merge branch 'master' of https://github.com/JetBrains-Research/snakec… 

    …harm into features/#429-icon-for-use

� Conflicts:
�	CHANGELOG.md
�	src/main/kotlin/com/jetbrains/snakecharm/lang/psi/SmkFile.kt
    Dmitry committed Jan 17, 2022
    Configuration menu
    Copy the full SHA
    7c72c6d View commit details
    Browse the repository at this point in the history

  2. Code cleanup. 

    Resolves: #429
    Dmitry committed Jan 17, 2022
    Configuration menu
    Copy the full SHA
    83c436b View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2022

  1. Tests fix. 

    Resolves: #429
    Dmitry committed Jan 22, 2022
    Configuration menu
    Copy the full SHA
    9c62dda View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2022

  1. New index for inherited rules was created. Behaviour of creating gutt… 

    …er icons in case of overridden rules was changed. Corresponding tests were extended.

Resolves: #462, #463, #429
    Dmitry committed Jan 29, 2022
    Configuration menu
    Copy the full SHA
    6380fa3 View commit details
    Browse the repository at this point in the history

  2. Misspelling in test was fixed

    @dakochik
    dakochik authored Jan 29, 2022
    Configuration menu
    Copy the full SHA
    fdbdba8 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2022

  1. feature: logos updated

    @iromeo
    iromeo committed Feb 4, 2022
    Configuration menu
    Copy the full SHA
    24663bb View commit details
    Browse the repository at this point in the history

  2. refactor: file renamed

    @iromeo
    iromeo committed Feb 4, 2022
    Configuration menu
    Copy the full SHA
    13cde2f View commit details
    Browse the repository at this point in the history

  3. fix: readme logo fixed

    @iromeo
    iromeo committed Feb 4, 2022
    Configuration menu
    Copy the full SHA
    9a56970 View commit details
    Browse the repository at this point in the history

  4. chore: libs updated

    @iromeo
    iromeo committed Feb 4, 2022
    Configuration menu
    Copy the full SHA
    0551777 View commit details
    Browse the repository at this point in the history

  5. fix: test execution from IDEA fixed

    @iromeo
    iromeo committed Feb 4, 2022
    Configuration menu
    Copy the full SHA
    f26921d View commit details
    Browse the repository at this point in the history

  6. fix: 1) cleanup 2) libs updated

    @iromeo
    iromeo committed Feb 4, 2022
    Configuration menu
    Copy the full SHA
    aeb8b22 View commit details
    Browse the repository at this point in the history

  7. Features/#452 quick fix in unused log file inspection (#453) 

    fix: Unused log file quick fix #452

Resolves: #452
    @dakochik
    dakochik authored Feb 4, 2022
    Configuration menu
    Copy the full SHA
    262b914 View commit details
    Browse the repository at this point in the history

  8. fix: Checkpoints could be accessed as rules when using rules #262 

    Resolves: #262
    @dakochik
    dakochik authored Feb 4, 2022
    Configuration menu
    Copy the full SHA
    0b4f2b3 View commit details
    Browse the repository at this point in the history

  9. fix: Show override gutter icon for use / overload rules #429 

    * Use Psi improoved
* LineMarkerProvider was implemented for rule inheritance.

Resolves: #429

Co-authored-by: Roman Chernyatchik <[email protected]>
    @dakochik @iromeo
    dakochik and iromeo authored Feb 4, 2022
    Configuration menu
    Copy the full SHA
    16a657f View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2022

  1. feat: Snakemake file type icon updated

    @iromeo
    iromeo committed Feb 10, 2022
    Configuration menu
    Copy the full SHA
    6f7b489 View commit details
    Browse the repository at this point in the history

  2. feat: 'copy-minimal' shadow section missing in completion #467 

    Resolves:  #467
    @iromeo
    iromeo committed Feb 10, 2022
    Configuration menu
    Copy the full SHA
    7344c94 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2022

  1. API cleanup 

    Resolves: #462
    Dmitry committed Mar 28, 2022
    Configuration menu
    Copy the full SHA
    37d2024 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'features/#462-gutter-icons-module-case' of https://gith… 

    …ub.com/JetBrains-Research/snakecharm into features/#462-gutter-icons-module-case
    Dmitry committed Mar 28, 2022
    Configuration menu
    Copy the full SHA
    0dc46cb View commit details
    Browse the repository at this point in the history

  3. API cleanup, rebase conflicts were resolved 

    Resolves: #462
    Dmitry committed Mar 28, 2022
    Configuration menu
    Copy the full SHA
    3676b79 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'features/#462-gutter-icons-module-case' of https://gith… 

    …ub.com/JetBrains-Research/snakecharm into features/#462-gutter-icons-module-case

� Conflicts:
�	CHANGELOG.md
�	src/main/kotlin/com/jetbrains/snakecharm/SnakemakeRuleInheritanceMarkerProvider.kt
�	src/main/kotlin/com/jetbrains/snakecharm/inspections/SmkIgnorePyInspectionExtension.kt
�	src/main/kotlin/com/jetbrains/snakecharm/inspections/SmkNotSameWildcardsSetInspection.kt
�	src/main/kotlin/com/jetbrains/snakecharm/inspections/SmkSeveralRulesAreOverriddenAsOneInspection.kt
�	src/main/kotlin/com/jetbrains/snakecharm/inspections/SmkUnresolvedImportedRuleNameInspection.kt
�	src/main/kotlin/com/jetbrains/snakecharm/inspections/SmkUnusedLogFileInspection.kt
�	src/main/kotlin/com/jetbrains/snakecharm/lang/parser/SmkStatementParsing.kt
�	src/main/kotlin/com/jetbrains/snakecharm/lang/psi/SmkPsiElements.kt
�	src/main/kotlin/com/jetbrains/snakecharm/lang/psi/SmkWildcardsCollector.kt
�	src/main/kotlin/com/jetbrains/snakecharm/lang/psi/elementTypes/SmkElementTypes.kt
�	src/main/kotlin/com/jetbrains/snakecharm/lang/psi/impl/SmkUseImpl.kt
�	src/main/kotlin/com/jetbrains/snakecharm/lang/psi/impl/stubs/SmkUseElementType.kt
�	src/main/kotlin/com/jetbrains/snakecharm/lang/psi/types/SmkWildcardsType.kt
�	testData/psi/Use.txt
�	testData/psi/UseIncomplete.txt
�	testData/psi/UseInvalid.txt
    Dmitry committed Mar 28, 2022
    Configuration menu
    Copy the full SHA
    baa4d7e View commit details
    Browse the repository at this point in the history

  5. Conflicts resolving 

    Resolves: #462
    Dmitry committed Mar 28, 2022
    Configuration menu
    Copy the full SHA
    96f23b0 View commit details
    Browse the repository at this point in the history