MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Dmitry Batkovich
2015-10-15 14:51:34 +03:00
parent 0a29bb026f 571b423273
commit fa4cc7a8bd
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/PositionPanel.java
+4 -3
View File
@@ -145,18 +145,19 @@ public class PositionPanel extends EditorBasedWidget implements StatusBarWidget.
SelectionModel selectionModel = editor.getSelectionModel();
int caretCount = editor.getCaretModel().getCaretCount();
if (caretCount > 1) {
message.append(caretCount).append(" carets");
message.append(UIBundle.message("position.panel.caret.count", caretCount));
}
else {
if (selectionModel.hasSelection()) {
int selectionStart = selectionModel.getSelectionStart();
int selectionEnd = selectionModel.getSelectionEnd();
if (selectionEnd > selectionStart) {
message.append(selectionEnd - selectionStart).append(" chars");
message.append(UIBundle.message("position.panel.selected.chars.count", selectionEnd - selectionStart));
int selectionStartLine = editor.getDocument().getLineNumber(selectionStart);
int selectionEndLine = editor.getDocument().getLineNumber(selectionEnd);
if (selectionEndLine > selectionStartLine) {
message.append(", ").append(selectionEndLine - selectionStartLine + 1).append(" lines");
message.append(", ");
message.append(UIBundle.message("position.panel.selected.lines.count", selectionEndLine - selectionStartLine + 1));
}
message.append(" ");
}
platform/platform-resources-en/src/messages/UIBundle.properties
+3
View File
@@ -72,6 +72,9 @@ memory.usage.panel.statistics.message=Allocated heap size: {0}M Used: {1}M
memory.usage.panel.message.text={0,number,####} of {1,number,####}M
go.to.line.command.name=Go to Line
go.to.line.command.double.click=Click to go to line
position.panel.caret.count={0} carets
position.panel.selected.chars.count={0} chars
position.panel.selected.lines.count={0} lines
popup.hints.panel.click.to.configure.highlighting.tooltip.text=Click to configure highlighting for this file
popup.hints.panel.click.to.configure.profile.text=Click to configure inspection profiles
read.only.attr.panel.double.click.to.toggle.attr.tooltip.text=Click to toggle the read-only attribute