|
|
|
@ -221,7 +221,6 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor |
|
|
|
if (currentCompilationUnit != (ICompilationUnit)parseInfo.MostRecentCompilationUnit) { |
|
|
|
if (currentCompilationUnit != (ICompilationUnit)parseInfo.MostRecentCompilationUnit) { |
|
|
|
currentCompilationUnit = (ICompilationUnit)parseInfo.MostRecentCompilationUnit; |
|
|
|
currentCompilationUnit = (ICompilationUnit)parseInfo.MostRecentCompilationUnit; |
|
|
|
if (currentCompilationUnit != null) { |
|
|
|
if (currentCompilationUnit != null) { |
|
|
|
|
|
|
|
|
|
|
|
FillClassComboBox(true); |
|
|
|
FillClassComboBox(true); |
|
|
|
FillMembersComboBox(); |
|
|
|
FillMembersComboBox(); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -244,7 +243,6 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor |
|
|
|
if (((ComboBoxItem)membersComboBox.Items[i]).IsInside(textAreaControl.ActiveTextAreaControl.Caret.Line)) { |
|
|
|
if (((ComboBoxItem)membersComboBox.Items[i]).IsInside(textAreaControl.ActiveTextAreaControl.Caret.Line)) { |
|
|
|
if (membersComboBox.SelectedIndex != i) { |
|
|
|
if (membersComboBox.SelectedIndex != i) { |
|
|
|
membersComboBox.SelectedIndex = i; |
|
|
|
membersComboBox.SelectedIndex = i; |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
if (!membersComboBoxSelectedMember) { |
|
|
|
if (!membersComboBoxSelectedMember) { |
|
|
|
membersComboBox.Refresh(); |
|
|
|
membersComboBox.Refresh(); |
|
|
|
@ -254,6 +252,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
membersComboBox.SelectedIndex = -1; |
|
|
|
if (membersComboBoxSelectedMember) { |
|
|
|
if (membersComboBoxSelectedMember) { |
|
|
|
membersComboBox.Refresh(); |
|
|
|
membersComboBox.Refresh(); |
|
|
|
membersComboBoxSelectedMember = false; |
|
|
|
membersComboBoxSelectedMember = false; |
|
|
|
@ -485,6 +484,10 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor |
|
|
|
FileService.JumpToFilePosition(fileName, item.Line, item.Column); |
|
|
|
FileService.JumpToFilePosition(fileName, item.Line, item.Column); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if (comboBox == classComboBox) { |
|
|
|
|
|
|
|
FillMembersComboBox(); |
|
|
|
|
|
|
|
UpdateMembersComboBox(); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|