Code Compare下载

Code Compare is a specialized tool designed for code comparison, enabling users to compare two files and identify similarities or differences. The software integrates multiple tools and supports various programming languages.

Software Highlights

Three-way comparison and automatic merging: The three-pane and vertical layout comparison windows integrate with version control systems, making it an excellent tool for resolving conflicts in files. Changes without conflicts are automatically merged, while conflicts are highlighted for easy resolution with a single mouse click.

Comprehensive folder structure comparison: Analyze all files within a folder for additions, deletions, and modifications, with color-coded highlighting. Filter options allow for excluding or including certain file types. Instantly open individual file comparisons with file display options for better analysis.

Batch processing commands: Copy files from one pane to another or to a selected folder for batch processing.

Software Features

Dual file comparison and merging

Visual Studio integration

Windows Shell integration

VCS integration

Intelligent recognition

Syntax highlighting

Code folding

Annotations

Inline change display

Unicode support

Command line support

Folder synchronization

Vocabulary comparison

Block movement verification

Structure comparison

Difference browser

Similarity line detection

User Interface

Toolbar: Customize comparison and layout options, and navigate between changes.

Main application menu: Access commands relevant to the current comparison, including code compare, layout, text, and standards.

Difference browser: Displays changes between revisions, showing the source structure tree with color-coded differences for easy navigation.

File area: The "Text Documents" tab shows the two text documents (or three in the Pro version) to be compared. Right-clicking on a document title opens a context menu for managing documents and tab groups.

File location: These combo boxes allow precise positioning and selection of files to be compared.

Navigation bar: Dropdown lists that can work in sync or independently. When working in sync, the code comparison will scroll the connected files together. Hold the SHIFT key to change this behavior manually. Note that this option does not work in Visual Studio when "Word Wrap" is enabled.

Navigation map: The navigation map on either side of the text document allows for quick navigation based on the comparison results.

Annotations: Set, delete, and navigate between annotations in the document to track important code segments.

Code blocks:

Missing block: Code segments not present in the target pane are highlighted in red by default.

Inserted block: Code segments not present in the source pane are highlighted in green by default.

Changed block: Code segments present in both panes but different are highlighted in blue by default.

Copy change buttons: Copy selected blocks and replace the corresponding blocks in the other file.

Connection lines: Connect related code block lines.

Previous/next change buttons: Navigate between changes.

Notification bar: Displays document number, current cursor position, and text or information being searched (if a search is in progress).

Customizing Keyboard Shortcuts

The environment provides numerous useful keyboard shortcuts to speed up work. The process to customize shortcuts is similar for standalone applications and Visual Studio extensions. Shortcuts can be changed in the "Options" dialog under the "Environment" section, accessed via "Tools" > "Options" and navigating to the "Keyboard" page. For example, you can distinguish all Code Compare commands by prefixing them with "CodeCompare", such as Tools.CodeCompare.Files.PreviousChange or Tools.CodeCompare.Files.

To assign custom keyboard shortcuts, select "Keyboard Options" in the "Options" dialog: Tools > Options > Environment > Keyboard. When using Visual Studio extensions, search for the required Code Compare command in the "Show commands containing" box by typing CodeCompare. To assign or remove keyboard shortcut combinations for a command, perform the following steps:

In the "Options" dialog, navigate to the "Environment" section, go to the "Keyboard" page, and enter the command name (without spaces) or a part of it in the "Show commands containing" box.

Select the desired command from the list.

The "Shortcut key" dropdown list now includes the keyboard shortcuts assigned to the command (if any). You can view them in the list.

To remove a combination, select it in the "Shortcut key" dropdown list and click "Remove".

To assign a custom keyboard shortcut combination for a command, select the command, choose the context area in which to use the shortcut, place the cursor in the "Press shortcut keys" box, and press the desired keyboard shortcut. The combination will appear in the box. Click "Assign".

For detailed information on changing shortcuts in Visual Studio, refer to the MSDN website.

Update Log

Support for JavaScript and TypeScript in VS: The language list now includes JavaScript and TypeScript, automatically identifying the programming language based on the file extension. Issues with incorrect opening of JSON files and strange flickering pop-ups have been addressed, with JavaScript now used for them.

Basic comparison for large files: To save time and resources, basic comparison is added for files larger than 10MB. After running the comparison, a dialog box will appear with information about each file's size, date, previous changes, and differences. This feature is only applicable when the "Enable binary quick compare before opening" option is enabled (default setting).

Improved support and usability for 4K-5K displays: Consideration has been given to UI reports for high DPI monitors, and the dialog box style has been improved. Shift + Middle Mouse Button shortcut is supported for easier scrolling. No new features have been imported for Visual Studio, as this behavior can be easily obtained through the SideScroller extension. Horizontal scroll synchronization will work normally.

Folder comparison improvements: Restored navigation through the file tree after searching or deleting an element. Renamed the "Compare file types" or "Compare files" command to "Compare file types". It can be used in one pane and in other panes as before. Renamed the "Ignore line breaks" option to "Ignore white space". Restored the issue with the compare starting from a context menu item in the "File/Folder" menu. Added the node_module folder to the default ignore folder list for folder comparison, and removed the resources folder from the list. Restored automatic completion of folder paths, making it easier to compare the root node of the file system.