Differences Viewer

WebStorm 6.0.1 Web Help

Project tool window | context menu of a file | Compare File with Editor

Project tool window | context menu of two selected folders | Compare Two Files

Project tool window | context menu of a file | Compare File with Editor

Project tool window | context menu of two selected folders | Compare Two Files

This dialog is displayed every time you explore differences between files (local history for folders, recent changes, version control, local files and their versions on a remote host, or just comparing files). So doing, you can compare files of any types, including binaries.

Tip

You can also open the difference viewer without running WebStorm. This is done through the following command:

<path to WebStorm executable file> diff <path_1> <path_2>

where path_1 and path_2 are paths to the files in question, which can be of various types, including jar.

The differences viewer provides a powerful editor that enables code completion, live templates etc.

Item	Tooltip and Shortcut	Description
	Ctrl+C or Ctrl+InsertCtrl+C or Ctrl+InsertCtrl+C or Ctrl+InsertCtrl+C or Ctrl+InsertCtrl+Insert, Alt+C or Escape, WCtrl+C or Ctrl+InsertCtrl+C or Ctrl+InsertCtrl+C or Ctrl+InsertMeta C or Meta InsertMeta C or Meta InsertMeta C or Meta Insert	Click this button to copy the line at caret in the right pane to the Clipboard.
	Ctrl+F or Alt+F3Ctrl+F or Alt+Shift+3Ctrl+F or Alt+Shift+3Ctrl+F or Alt+F3Ctrl+Alt+S, Alt+F3 or Ctrl+SCtrl+F or Alt+F3Ctrl+F or Alt+F3Ctrl+F or Alt+F3Meta F or Alt F3Meta F or Alt F3Meta F or Alt F3	Click this button to initiate Finding text procedure and locate the specified string in the current file.
or	F7F7F7F7F7F11 or F8F7F5F7F7F5 or Shift+F7Shift+F7Shift+F7Shift+F7Shift+F7Shift+F7Shift+F7Ctrl+F5Shift F7Shift F7Alt F5	Click this button to move to next / previous difference.
Ignore whitespace		Use this drop-down list to define how the differences viewer should treat white spaces in the text. Do not ignore: white spaces are important, and the differences should be highlighted. Leading and Trailing: Ignore the differences, if they appear in the end and in the beginning of a line. All: white spaces are not important, regardless of their location in the source code.
	Compare Previous File Alt+LeftAlt+LeftAlt+LeftAlt+LeftAlt+Left or Ctrl+X, PAlt+LeftCtrl+Page UpCtrl+Shift+F6, Ctrl+Alt+Right or Ctrl+Page UpControl LeftControl LeftMeta Shift F6 or Meta Alt Left	Click this button to compare the local copy of the previous file with its update from the server. Note The button is available only when the Differences Viewer is invoked from the Update Project Info tab of the Version Control tool window or from the Apply Patch dialog box.
	Compare Next File Alt+RightAlt+RightAlt+RightAlt+RightAlt+Right, Ctrl+X, N or Ctrl+X, OAlt+RightCtrl+Page DownCtrl+F6, Ctrl+Alt+Left or Ctrl+Page DownControl RightControl RightMeta F6 or Meta Alt Right	Click this button to compare the local copy of the next file with its update from the server. Note The button is available only when the Differences Viewer is invoked from the Update Project Info tab of the Version Control tool window or from the Apply Patch dialog box.
Legend		Shows summary information about the encountered differences: number of differences found, and color map. Tip Color map for the Differences viewer is configurable in the Colors and Fonts dialog box.
		Use these chevron buttons to apply differences between panes.
	F1F1F1F1F1F1F1F1F1F1F1	Click this button to show reference page.
		Click this button to reveal the drop-down list of available options (show or hide line numbers, indentation guides, white spaces, or soft wraps).
	Ctrl+Tab or Ctrl+Shift+TabCtrl+Tab or Ctrl+Shift+TabCtrl+Tab or Ctrl+Shift+TabCtrl+Tab or Ctrl+Shift+TabCtrl+X, BCtrl+Tab or Ctrl+Shift+TabCtrl+Tab or Ctrl+Shift+TabCtrl+Tab or Ctrl+Shift+TabControl Tab or Control Shift TabControl Tab or Control Shift TabControl Tab or Control Shift Tab	Use this keyboard shortcut to switch between the panes of the Differences viewer.

See Also

Procedures:

Web Resources: