PhpStorm lets you compare two files, one of which is present in the right folder, and another one in the left even though such files are treated as different entities. Also, there may be a situation when you think a file was renamed, but is otherwise identical to a file in another folder. These may be versions of the same file that you want to compare. Sometimes a file may be present in one folder, and another file with a similar name in the other folder (for example, VCS_library_1.4 and VCS_library_1.5). Run the following command: diff where path_1 and path_2 are paths to the folders you want to compare. You can also open the difference viewer without running PhpStorm. The top pane lists all files in the selected folders, while the bottom pane shows the differences between two versions of the selected file (see Compare files). The differences are displayed in the Differences Viewer for Folders: PhpStorm lets you compare files in two folders against their file size, content, or timestamp. When you are comparing two files, or a file with the Cliboard contents, you can swap sides by clicking on the toolbar. To assign shortcuts to the apply and append actions, open the Keymap page of the IDE settings Ctrl+Alt+S and locate these actions under Version Control Systems | Diff & Merge. Productivity tips Assign shortcuts for 'apply' and 'append' Not a bad fee to get the core of what I appreciated about PHPStorm.Select a modified file anywhere in the Version Control tool window. However, Intelephense itself offers top-notch refactoring tools but for this like reliable symbol replacement and implementation discovery you need to shell out. Here it's worth mentioning that the built in PHP support in VSCode is second-class to Intelephense. I still prefer GitKraken for third-party integrations but barring those, I stick with Git Lens. You have options to automatically break on various error levels, quick breakpoint navigation, quick expression evaluation & watch and exploring all in-scope variables.Ī few classes beyond what PHPStorm can do, the Git Lens plugin rivals most dedicated Git tools. The UI might be as nice, but it doesn't get in the way. The XDebug plugin is awesome, somewhat better than PHPStorm IMHO. My other favourite tool, Meld, isn't cross-platform so you may need to look for something appropriate There are plugins but nothing really nice in the way of PHPStorm. Awesome enough to make me get over my Microsoft repulsion. Out of the box support for things like Python, JS/JSX/TypeScript is awesome for something free. Yes, it's Microsoft, but as far as tools go, it's right there at the top. Need Python / Go or Kubernetes integration? Look elsewhere.
You get some assistance on JS stuff, basic things like working with Dockerfiles but nothing beyond that. Formatting to standards, finding implementations of abstract functions / interfaces / etc, symbol replacement in project - all work flawlessly I always loved the way PHPStorm keeps up to date with language features. It's there and you can do basic stuff in a basic UI. Otherwise the UI is pretty nice to on the fly evaluating and watching expressions, breakpoint control, etc - stuff you normally want from such a tool. One thing I miss through was to easily control whether to automatically stop on exceptions. When you're done, everything gets staged so that you can get on with the commit/merge/rebase It's a clean 3-way merge + diff tool that makes it crystal clear where each change comes from and you can manually edit the outcome. That's the feature I appreciate most about it. Yes, it's a commercial product but if your outfit pays for it, it comes with great tooling. Give me 3 screens and a VIM configuration sprint and I'm there! I'm old, I like stuff that just works (as much as possible) without getting sucked into customization and configuration. Collecting PHP dependencies, particularly for 7, working with newer language features, doing stuff like finding interface implementations and so on aren't quite on par with others. I like SublimeText 3, but found it unreliable. Also, most plugins I worked with were buggy in mind blowing ways. It's nice for JS for the most part, but throw anything heavy at it and it slows to a crawl. Containers, GIT vizualization, diffs, some UI help and reliably working with other languages are definite pluses. I'm a PHP dev but I appreciate and IDE that can help with other stuff reliably. Yes, I know how the title sounds and it's probably going to get some people riled up over other IDEs but there are some things worth mentioning: