numandev1 / intellij-merge-tool

VS Code extension for open merge tool of intellij
16 stars 2 forks source link

Incompatability with Jetbrains Toolbox? #3

Open gimbo opened 3 years ago

gimbo commented 3 years ago

Hi there; I saw you mention your tool at https://github.com/microsoft/vscode/issues/37350 and since I use PyCharm as well as VSCode, I thought I'd try it out as it would be excellent to use that if possible.

Unfortunately, I can't get it to recognise PyCharm...

The extension helpfully suggests a path such as /Applications/WebStorm.app/Contents/MacOS/webstorm; however:

Any ideas?

gimbo commented 3 years ago

Ah, I just found where the toolbox installs it. The full path seems to be:

/Users/gimbo/Library/ApplicationSupport/JetBrains/Toolbox/apps/PyCharm-P/ch-0/211.6085.15/PyCharm 2021.1 EAP.app/Contents/MacOS/pycharm

Now your extension can find it (it doesn't say "You enter wrong address of intellij path" any more) but it doesn't open the PyCharm merge tool, and instead just pops up:

This file has conflict.

It doesn't seem to matter whether I have PyCharm open or not.

BTW, even if I can get this working properly, it'll still be a bit problematic as the path will change every time I install a new version of PyCharm. But maybe that's an annoyance worth living with; not sure what can be done about it...

gimbo commented 3 years ago

Hmmmm, looks like it gets as far as creating .temp.master.WHATEVER but that's it (and it doesn't clean up when it fails); so maybe it's just going wrong when creating the .temp.slave.* file??? Seems weird, can't see why it would succeed on one but fail on the other. Guess it could do with some error logging... :-)

lexaurin commented 3 years ago

The same here with IntelliJ:

This file has conflict.

for path /Applications/IntelliJ IDEA.app/Contents/MacOS/idea

Noyabronok commented 3 years ago

I have intellij idea, but the default path wasn't working. Tried a few path options, and now it's stuck with the "This file has conflict" error, and I can't change the path