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

Add icon for JetBrains Toolbox #2240

Merged
merged 5 commits into from
Apr 17, 2020
Merged

Add icon for JetBrains Toolbox #2240

merged 5 commits into from
Apr 17, 2020

Conversation

turansky
Copy link
Contributor

@turansky turansky commented Apr 5, 2020

Overview

Add icon for JetBrains Toolbox

Definition of Done

Icon is shown in JetBrains Toolbox

Screenshot 2020-04-05 at 15 22 01

.gitignore Outdated
@@ -18,7 +18,8 @@ gradle-app.setting
*.ipr
*.iws
*.uml
.idea/
.idea/*
Copy link
Contributor

@vlsi vlsi Apr 5, 2020

Choose a reason for hiding this comment

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

Why * is added here? It should work without the star.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Otherwise IntelliJ IDEA doesn't resolve next instruction !.idea/icon.png and show similar warning:

Screenshot 2020-04-05 at 15 41 18

Copy link
Member

Choose a reason for hiding this comment

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

I agree with @vlsi. If you add the asterisk *, commands like git status -s -u will show you numerous other files under .idea folders across the repo.

Copy link
Contributor

Choose a reason for hiding this comment

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

@sbrannen , I'm afraid you are not quite right.
git status -s -u does not show extra files in .idea folder.

I've just opened gitignore documentation, and the star is indeed a way to go: https://git-scm.com/docs/gitignore

/foo/*
!/foo/bar

Copy link
Member

Choose a reason for hiding this comment

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

Hmmm..... strange... on my machine, git status -s -u was showing me numerous other files after applying this PR.

Copy link
Member

Choose a reason for hiding this comment

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

TBH, I don't actively use IDEA, but I obviously imported some projects into IDEA at some point, and that's simply what's in the file system.

In any case, isn't is possible to craft the patterns so that they apply to .idea directories in subdirectories as well?

Copy link
Contributor Author

@turansky turansky Apr 5, 2020

Choose a reason for hiding this comment

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

I obviously imported some projects into IDEA at some point, and that's simply what's in the file system.

In this case IDEA will download Gradle for you (possibly incompatible with your root project) and root project settings will not be applied to your subproject.

For example documentation isn't separate project.

In any case, isn't is possible to craft the patterns so that they apply to .idea directories in subdirectories as well?

I guess not

Copy link
Contributor

Choose a reason for hiding this comment

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

Technically speaking, the following would ignore .idea everywhere, except it would keep /.idea/icon.png.

**/.idea/*
!/.idea/icon.png

Of course, it is up to you, however, I'm inclined that .idea from sub-folders should be removed.

Copy link
Member

Choose a reason for hiding this comment

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

I'd personally rather go with the more explicit (and IMO correct) patterns.

Whether or not somebody has .idea folders in subfolders is up to that individual. Maybe it's an accident, but maybe it's intentional.

@junit-team/junit-lambda Thoughts?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'd personally rather go with the more explicit (and IMO correct) patterns.

@sbrannen Done :)

@codecov
Copy link

codecov bot commented Apr 5, 2020

Codecov Report

Merging #2240 into master will increase coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #2240      +/-   ##
============================================
+ Coverage     91.17%   91.19%   +0.02%     
+ Complexity     4489     4463      -26     
============================================
  Files           386      383       -3     
  Lines         10773    10727      -46     
  Branches        874      869       -5     
============================================
- Hits           9822     9783      -39     
+ Misses          731      728       -3     
+ Partials        220      216       -4     
Impacted Files Coverage Δ Complexity Δ
...latform/testkit/engine/EngineExecutionResults.java 78.57% <0.00%> (-21.43%) 5.00% <0.00%> (ø%)
...g/junit/platform/commons/util/ReflectionUtils.java 94.43% <0.00%> (-0.05%) 227.00% <0.00%> (-5.00%)
...ntage/engine/descriptor/VintageTestDescriptor.java 97.77% <0.00%> (-0.05%) 21.00% <0.00%> (ø%)
...piter/params/provider/MethodArgumentsProvider.java 100.00% <0.00%> (ø) 17.00% <0.00%> (+1.00%)
...form/commons/util/ClassNamePatternFilterUtils.java 100.00% <0.00%> (ø) 8.00% <0.00%> (ø%)
...it/jupiter/api/condition/MethodBasedCondition.java
...unit/jupiter/api/condition/EnabledIfCondition.java
...nit/jupiter/api/condition/DisabledIfCondition.java
...jupiter/engine/execution/ExtensionValuesStore.java 91.17% <0.00%> (+1.47%) 21.00% <0.00%> (ø%)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 707db08...caba507. Read the comment docs.

@sbrannen
Copy link
Member

sbrannen commented Apr 5, 2020

Tentatively slated for 5.7 M1 for team discussion

.gitignore Outdated Show resolved Hide resolved
Co-Authored-By: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
@marcphilipp
Copy link
Member

Team decision: We decided against adding IDE-specific configuration files.

@marcphilipp
Copy link
Member

Team decision: Since we've now merged #2241, we've reconsidered and will accept this one as well.

@marcphilipp marcphilipp reopened this Apr 17, 2020
@marcphilipp marcphilipp merged commit 23037c2 into junit-team:master Apr 17, 2020
@sormuras
Copy link
Member

image

@vlsi
Copy link
Contributor

vlsi commented Apr 17, 2020

Great. Thanks a lot :)

🎉

@sormuras
Copy link
Member

Hoped that the default "Welcome to IntelliJ IDEA" screen picked up the icon as well. Apparently, it does not:

image

Is there already an issue at https://youtrack.jetbrains.com/issues/IDEA to display icons here as well?

@marcphilipp
Copy link
Member

@turansky Thanks for the PR! 👍

@marcphilipp
Copy link
Member

@sormuras Mine does:

Screenshot 2020-04-17 at 13 29 02

@turansky
Copy link
Contributor Author

turansky commented Apr 17, 2020

@sormuras
Welcome + Darcula - IDEA-236901

@sormuras
Copy link
Member

sormuras commented Apr 17, 2020

Welcome + Darcula - IDEA-236901

Voted: 👍

@sormuras
Copy link
Member

A switch to "IntelliJ Light" and back to black helped.

image

@turansky
Copy link
Contributor Author

It helps till IDEA restart

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants