Master

Created by: madppiper

Various minor changes:

• Added *.iml to gitignore as one doesn't commit the project files by accident
• Added new package names, so that the sources become more readable (attention: may require an update of local .idea/sourcegraph.xml definitions)
• Renamed some of the classes to make them easier to distinguish from other frameworks (Util -> SourcegraphUtil, Config -> SourcegraphConfig)
• Replaced log4j dependency in accordance with https://blog.jetbrains.com/platform/2022/02/removing-log4j-from-the-intellij-platform/
• Removed unused class imports from Search.java

Test plan

Rebuild and deploy locally - test in IDE. It should run as expected, however, as package names were added, the "repository" definition in .idea/sourcegraph.xml changed.

Merged by: vdavid at 2022-04-19 09:37:25 UTC

Created by: philipp-spiess

Hey @madppiper! Nice to have you on the project. I tried to rebase my merge-into-monorepo branch and noticed that you pointed your PR onto the master branch, however we use main here as the default branch.

We'll have to rebase this against main, there are a few commits on main that weren't on master. I should have deleted the old branch when I changed the default, sorry!

cc @vdavid

There are a bunch of conflicts when I try to rebase this myself:

β sourcegraph-jetbrains (ps/fixes-reapplied) git cherry-pick 3a2660b3df62b9568f8ed324cec91340c57f9cb2
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
CONFLICT (modify/delete): src/main/java/Search.java deleted in 3a2660b (Master (#38)) and modified in HEAD.  Version HEAD of src/main/java/Search.java left in tree.
CONFLICT (modify/delete): src/main/java/SearchRepository.java deleted in 3a2660b (Master (#38)) and modified in HEAD.  Version HEAD of src/main/java/SearchRepository.java left in tree.
Auto-merging src/main/java/com/sourcegraph/action/Copy.java
Auto-merging src/main/java/com/sourcegraph/action/FileAction.java
CONFLICT (content): Merge conflict in src/main/java/com/sourcegraph/action/FileAction.java
Auto-merging src/main/java/com/sourcegraph/action/Open.java
Auto-merging src/main/java/com/sourcegraph/action/OpenRevisionAction.java
CONFLICT (content): Merge conflict in src/main/java/com/sourcegraph/action/OpenRevisionAction.java
Auto-merging src/main/java/com/sourcegraph/action/SearchActionBase.java
CONFLICT (content): Merge conflict in src/main/java/com/sourcegraph/action/SearchActionBase.java
Auto-merging src/main/java/com/sourcegraph/project/CommitViewUriBuilder.java
CONFLICT (content): Merge conflict in src/main/java/com/sourcegraph/project/CommitViewUriBuilder.java
Auto-merging src/main/java/com/sourcegraph/project/SourcegraphConfig.java
CONFLICT (content): Merge conflict in src/main/java/com/sourcegraph/project/SourcegraphConfig.java
Auto-merging src/main/java/com/sourcegraph/util/SourcegraphUtil.java
CONFLICT (content): Merge conflict in src/main/java/com/sourcegraph/util/SourcegraphUtil.java
Auto-merging src/main/resources/META-INF/plugin.xml
CONFLICT (content): Merge conflict in src/main/resources/META-INF/plugin.xml
error: could not apply 3a2660b... Master (#38)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

We'll fix this on our end tomorrow so don't worry about it! Just wanted to let you know to avoid future issues (in the monorepo we also use main as the default branch )

Created by: madppiper

Hey @philipp-spiess,

thanks for the heads-up!

So sorry - I guess I am so used to using "master", that I wasn't paying attention. I will rebase my internal branch against main now, so this won't be an issue in the future.

Am happy to support you on resolving those merge-conflicts, btw. So let me know and I'll do the changes on my end and open up another pull-request for you - this time against "main".

Thanks again & cheers, Paul