文件状态突出显示
最后修改时间:2023 年 8 月 23 日文件状态
文件可以在项目工具窗口中以不同的颜色显示,并且可以根据代码分析的结果、版本控制状态等突出显示其编辑器选项卡。
您可以在版本控制 |配置 VCS 文件状态颜色 IDE 设置的 文件状态颜色页面。CtrlAlt0S
提示
要同时突出显示包含已修改内容的文件夹,请在版本控制 | 项目树中选择突出显示包含已修改文件的目录。IDE 设置的 确认页面。CtrlAlt0S
下表列出了默认文件状态颜色及其在某些配色方案中的含义。
颜色 | 文件状态 | 描述 |
---|---|---|
#0A7700 | 添加 | 活动变更列表中的文件计划添加到存储库中。 |
#0EAA00 | 添加到非活动变更列表中 | 非活动更改列表中的文件计划添加到存储库中。如果在“设置”| “突出显示非活动更改列表中的文件”选项已启用,则此文件状态可用。版本控制 | 变更列表。 |
#FF0000 | 变更列表冲突 | 非活动变更列表中的文件已在活动变更列表中被修改。在这种情况下,将打开一个新对话框,提示您解决更改列表冲突。如果在“设置”|“设置”中启用了所有选项,则此文件状态可用。版本控制 | 变更列表。 |
#0A7700 | 已复制 | 如果一个文件是另一个文件的副本,则会跟踪其元数据,并将此类文件标记为已复制。 |
#616161 | 已删除 | 该文件计划从存储库中删除。 |
#773895 | 从文件系统中删除 | 该文件已在本地删除,但尚未计划删除,并且仍然存在于存储库中。 |
#8AA4C8 | 改变了后代 | 如果文件被修改,IDE 将递归突出显示包含该文件的所有目录。如果在“设置”| “项目树”中启用“突出显示项目树中包含已修改文件的目录”选项,则此状态可用。版本控制 | 确认。 |
#3264B4 | 立即改变孩子 | 如果文件被修改,IDE 将突出显示其父目录。如果在“设置”| “项目树”中启用“突出显示项目树中包含已修改文件的目录”选项,则此状态可用。版本控制 | 确认。 |
#B28C00 | 被劫持 | [Perforce、ClearCase、VSS] 文件被修改但未签出。 |
#727238 | 被忽略 | VCS 故意取消跟踪文件。 |
第7503章 DC | 合并 | 作为更新的结果,该文件由您的 VCS 合并。 |
#FF0000 | 与冲突合并 | 在上次更新期间,该文件已合并并存在冲突。 |
#FF0000 | 合并财产冲突 | 在上次更新期间,IDE 检测到本地文件的属性与其服务器版本之间存在差异。 |
#FF0000 | 合并文本和属性冲突 | 当两个或多个开发人员修改文件的相同行和相同的文件属性时,就会发生文本和属性冲突。 |
#0032A0 | 修改的 | 自上次同步以来该文件已更改。 |
#0047E4 | 在非活动变更列表中修改 | 非活动更改列表中的文件已被修改。如果在“设置”| “突出显示非活动更改列表中的文件”选项已启用,则此文件状态可用。版本控制 | 变更列表。 |
#7C7C00 | 过时的 | 该文件不应再位于存储库的工作副本中。 |
#007C7C | 更名 | 自上次更新以来,该文件已被重命名。 |
#08978F | 已切换 | [SVN] 该文件取自与整个项目不同的分支。 |
#993300 | (未知)未版本化 | 该文件存在于本地,但不在存储库中,并且未计划添加。 |
无(默认颜色) | 最新 | 该文件尚未更改。 |
颜色 | 文件状态 | 描述 |
---|---|---|
#629755 | 添加 | 活动变更列表中的文件计划添加到存储库中。 |
#629755 | 添加到非活动变更列表中 | 非活动更改列表中的文件计划添加到存储库中。如果在“设置”| “突出显示非活动更改列表中的文件”选项已启用,则此文件状态可用。版本控制 | 变更列表。 |
#D5756C | 变更列表冲突 | 非活动变更列表中的文件已在活动变更列表中被修改。在这种情况下,将打开一个新对话框,提示您解决更改列表冲突。如果在“设置”|“设置”中启用了所有选项,则此文件状态可用。版本控制 | 变更列表。 |
#0A7700 | 已复制 | 如果一个文件是另一个文件的副本,则会跟踪其元数据,并将此类文件标记为已复制。 |
#6C6C6C | 已删除 | 该文件计划从存储库中删除。 |
#6C6C6C | 从文件系统中删除 | 该文件已在本地删除,但尚未计划删除,并且仍然存在于存储库中。 |
#6897BB | 改变了后代 | 如果文件被修改,IDE 将递归突出显示包含该文件的所有目录。如果在“设置”| “项目树”中启用“突出显示项目树中包含已修改文件的目录”选项,则此状态可用。版本控制 | 确认。 |
#6897BB | 立即改变孩子 | 如果文件被修改,IDE 将突出显示其父目录。如果在“设置”| “项目树”中启用“突出显示项目树中包含已修改文件的目录”选项,则此状态可用。版本控制 | 确认。 |
无(默认颜色) | 被劫持 | [Perforce, ClearCase, VSS] The file is modified without checkout. |
#848504 | Ignored | A file is intentionally untracked by VCS. |
#9876AA | Merged | The file is merged by your VCS as a result of an update. |
#D5756C | Merged with conflicts | During the last update, the file has been merged with conflicts. |
#D5756C | Merged with property conflicts | During the last update, the IDE has detected differences between the properties of the local file and its server version. |
#D5756C | Merged with text and property conflicts | Text and property conflicts happen when two or more developers modify the same lines of a file and the same file properties. |
#6897BB | Modified | The file has changed since the last synchronization. |
#6897BB | Modified in not active changelist | The file in an inactive changelist has been modified. This file status is available if the Highlight files from non-active changelists option is enabled in Settings | Version Control | Changelists. |
None (default color) | Obsolete | The file should no longer be in your working copy of the repository. |
#3A8484 | Renamed | Since the last update, the file has been renamed. |
None (default color) | Switched | [SVN] The file is taken from a different branch than the whole project. |
#D1675A | (Unknown) Unversioned | The file exists locally but is not in the repository and is not scheduled for addition. |
None (default color) | Up to date | The file hasn't been changed. |
Color | File Status | Description |
---|---|---|
#62CC47 | Added | The file in the active changelist is scheduled for addition to the repository. |
#62CC47 | Added in not active changelist | The file in an inactive changelist is scheduled for addition to the repository. This file status is available if the Highlight files from non-active changelists option is enabled in Settings | Version Control | Changelists. |
#FF6666 | Changelist conflict | The file in an inactive changelist has been modified in the active changelist. In this case, a new dialog will open, prompting you to resolve the changelist conflict. This file status is available if all options are enabled in Settings | Version Control | Changelists. |
#62CC47 | Copied | If a file is a copy of another file, its metadata is tracked, and such a file is marked as copied. |
#ED864A | Deleted | The file is scheduled for deletion from the repository. |
#ED864A | Deleted from file system | The file has been deleted locally but hasn't been scheduled for deletion, and it still exists in the repository. |
#4FF0FF | Have changed descendants | If a file is modified, the IDE will recursively highlight all directories containing that file. This status is available if the Highlight directories that contain modified files in the Project tree option is enabled in Settings | Version Control | Confirmation. |
#4FF0FF | Have immediate changed children | If a file is modified, the IDE will highlight its parent directory. This status is available if the Highlight directories that contain modified files in the Project tree option is enabled in Settings | Version Control | Confirmation. |
None (default color) | Hijacked | [Perforce, ClearCase, VSS] The file is modified without checkout. |
#A9B837 | Ignored | A file is intentionally untracked by VCS. |
#ED94FF | Merged | The file is merged by your VCS as a result of an update. |
#FF6666 | Merged with conflicts | During the last update, the file has been merged with conflicts. |
#FF6666 | Merged with property conflicts | During the last update, the IDE has detected differences between the properties of the local file and its server version. |
#FF6666 | Merged with text and property conflicts | Text and property conflicts happen when two or more developers modify the same lines of a file and the same file properties. |
#4FF0FF | Modified | The file has changed since the last synchronization. |
#4FF0FF | Modified in not active changelist | The file in an inactive changelist has been modified. This file status is available if the Highlight files from non-active changelists option is enabled in Settings | Version Control | Changelists. |
None (default color) | Obsolete | The file should no longer be in your working copy of the repository. |
#4FF0FF | Renamed | Since the last update, the file has been renamed. |
None (default color) | Switched | [SVN] The file is taken from a different branch than the whole project. |
D1675A | (Unknown) Unversioned | The file exists locally but is not in the repository and is not scheduled for addition. |
None (default color) | Up to date | The file hasn't been changed. |
编辑器中的行状态
如果当前项目启用了 VCS 集成,则文件中修改的行会在装订线中用不同的颜色标记。
您可以在编辑器 |配置线路状态颜色。配色方案| IDE 设置的 VCS页面。CtrlAlt0S
要禁用突出显示已修改的行,请清除版本控制|上的在装订线中突出显示已修改的行复选框。IDE 设置的 确认页面。CtrlAlt0S
下表列出了默认行突出显示颜色及其在某些配色方案中的含义。
颜色 | 线路状态 | 描述 |
---|---|---|
#C3D6E8 | 修改线路 | 自上次更新以来已修改的行。 |
#EDDCBC | 空白修改的行 | 自上次更新以来仅修改了空格的行。 |
#C9DEC1 | 已添加线路 | 自上次更新以来添加的行。 |
#9F9F9F | 已删除的行 | 自上次更新以来已删除的行。 |
Color | Line Status | Description |
---|---|---|
#374752 | Modified lines | Lines that have been modified since the last update. |
#4C4638 | Whitespace-modified lines | Lines in which only whitespaces have been modified since the last update. |
#384C38 | Added lines | Lines that have been added since the last update. |
#656E76 | Deleted lines | Lines that have been removed since the last update. |
Color | Line Status | Description |
---|---|---|
#1AABFF | Modified lines | Lines that have been modified since the last update. |
#666666 | Whitespace-modified lines | Lines in which only whitespaces have been modified since the last update. |
#009924 | Added lines | Lines that have been added since the last update. |
#FFA14F | Deleted lines | Lines that have been removed since the last update. |
感谢您的反馈意见!