Merge branch 'master' of github.com:icsharpcode/SharpDevelop

PeterForstmeier · PeterForstmeier · commit 5ad6289f1490 · 2014-08-23T18:37:55.000+02:00
diff --git a/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsPanel.xaml.cs b/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsPanel.xaml.cs
@@ -276,7 +276,7 @@ private string[] GetRuleAssemblyList(bool replacePath)
 		private void ChangeRuleAssembliesButtonClick( object sender, RoutedEventArgs e)
 		{
 			var  stringListDialog = new StringListEditorDialog();
-			stringListDialog.BrowseForDirectory = true;
+			stringListDialog.ShowBrowse = true;
 			stringListDialog.TitleText = StringParser.Parse("${res:ICSharpCode.CodeAnalysis.ProjectOptions.ChooseRuleAssemblyDirectory}");
 			stringListDialog.LoadList(GetRuleAssemblyList(false));
 			stringListDialog.ShowDialog();
diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptions.xaml.cs b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptions.xaml.cs
@@ -165,7 +165,7 @@ public static void PopulateStringListEditor(string title, string listCaption,Tex
 			var  stringListDialog = new StringListEditorDialog();
 			stringListDialog.TitleText = title;
 			stringListDialog.ListCaption = listCaption;
-			stringListDialog.BrowseForDirectory = browseForDirectoty;
+			stringListDialog.ShowBrowse = browseForDirectoty;
 			string[] strings = textBox.Text.Split(';');
 			stringListDialog.LoadList (strings);
 			stringListDialog.ShowDialog();
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.xaml b/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.xaml
@@ -5,6 +5,6 @@
 	xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui;assembly=ICSharpCode.SharpDevelop">
 	
 	<Grid>
-		<gui:StringListEditorXaml x:Name="editor" BrowseForDirectory="True"></gui:StringListEditorXaml>
+		<gui:StringListEditor x:Name="editor" ShowBrowse="True" />
 	</Grid>
 </optionpanels:OptionPanel>
diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeElements.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeElements.vb
@@ -24,6 +24,6 @@ Namespace EnvDTE
 		
 		Function Item(index As Object) As CodeElement
 		
-		Function GetEnumerator() As IEnumerator
+		Shadows Function GetEnumerator() As IEnumerator
 	End Interface
 End Namespace
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddOptionalParameterToInvocationAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddOptionalParameterToInvocationAction.cs
@@ -23,9 +23,11 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
+using System;
 using ICSharpCode.NRefactory.CSharp;
 using System.Collections.Generic;
 using System.Linq;
+using ICSharpCode.NRefactory.CSharp.Resolver;
 using ICSharpCode.NRefactory.Semantics;
 using ICSharpCode.NRefactory.Xml;
 using ICSharpCode.NRefactory.Documentation;
@@ -43,44 +45,28 @@ public override IEnumerable<CodeAction> GetActions(RefactoringContext context)
 			if (invocationExpression == null)
 				yield break;
 
-			var resolveResult = context.Resolve(invocationExpression) as InvocationResolveResult;
+			var resolveResult = context.Resolve(invocationExpression) as CSharpInvocationResolveResult;
 			if (resolveResult == null) {
 				yield break;
 			}
-
+			
 			var method = (IMethod)resolveResult.Member;
-
-			bool foundOptionalParameter = false;
-			foreach (var parameter in method.Parameters) {
-				if (parameter.IsParams) {
-					yield break;
-				}
-
-				if (parameter.IsOptional) {
-					foundOptionalParameter = true;
-					break;
+			bool[] parameterIsSpecified = new bool[method.Parameters.Count];
+			var argumentToParameterMap = resolveResult.GetArgumentToParameterMap();
+			if (argumentToParameterMap != null) {
+				foreach (int paramIndex in argumentToParameterMap)
+					parameterIsSpecified[paramIndex] = true;
+			} else {
+				for (int i = 0; i < Math.Min(resolveResult.Arguments.Count, parameterIsSpecified.Length); i++) {
+					parameterIsSpecified[i] = true;
 				}
 			}
-
-			if (!foundOptionalParameter) {
-				yield break;
+			var missingParameters = new List<IParameter>();
+			for (int i = 0; i < method.Parameters.Count; i++) {
+				if (!parameterIsSpecified[i] && method.Parameters[i].IsOptional)
+					missingParameters.Add(method.Parameters[i]);
 			}
-
-			//Basic sanity checks done, now see if there are any missing optional arguments
-			var missingParameters = new List<IParameter>(method.Parameters);
-			if (resolveResult.Arguments.Count != invocationExpression.Arguments.Count) {
-				//Extension method
-				missingParameters.RemoveAt (0);
-			}
-			foreach (var argument in invocationExpression.Arguments) {
-				var namedArgument = argument as NamedArgumentExpression;
-				if (namedArgument == null) {
-					missingParameters.RemoveAt(0);
-				} else {
-					missingParameters.RemoveAll(parameter => parameter.Name == namedArgument.Name);
-				}
-			}
-
+			
 			foreach (var parameterToAdd in missingParameters) {
 				//Add specific parameter
 				yield return new CodeAction(string.Format(context.TranslateString("Add optional parameter \"{0}\""),
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateMethodDeclarationAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateMethodDeclarationAction.cs
@@ -363,7 +363,10 @@ internal static string GuessNameFromType(IType returnType)
 				case "System.Action":
 					return "action";
 			}
-			return returnType.Name;
+			if (returnType.Kind == TypeKind.Interface && returnType.Name.StartsWith("I", System.StringComparison.Ordinal))
+				return returnType.Name.Substring(1);
+			else
+				return returnType.Name;
 		}
 		
 		string GetMethodName(InvocationExpression invocation)
diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-tokenizer.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-tokenizer.cs
@@ -3104,7 +3104,6 @@ private int consume_string (bool quoted)
 
 				value_builder[pos++] = (char) c;
 			}
-			recordNewLine = true;
 		}
 
 		private int consume_identifier (int s)
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
@@ -279,8 +279,8 @@
     <Compile Include="Src\Gui\Components\StringListEditorDialog.xaml.cs">
       <DependentUpon>StringListEditorDialog.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Src\Gui\Components\StringListEditorXaml.xaml.cs">
-      <DependentUpon>StringListEditorXaml.xaml</DependentUpon>
+    <Compile Include="Src\Gui\Components\StringListEditor.xaml.cs">
+      <DependentUpon>StringListEditor.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Src\Gui\CustomFocusManager.cs" />
@@ -896,7 +896,7 @@
     <Page Include="Src\Editor\Dialogs\RenameSymbolDialog.xaml" />
     <Page Include="Src\Gui\Components\FontSelector.xaml" />
     <Page Include="Src\Gui\Components\StringListEditorDialog.xaml" />
-    <Page Include="Src\Gui\Components\StringListEditorXaml.xaml" />
+    <Page Include="Src\Gui\Components\StringListEditor.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\ExternalToolPanel.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\CodeGenerationPanel.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\EditStandardHeaderPanel.xaml" />
diff --git a/src/Main/Base/Project/Src/Gui/Components/StringListEditor.xaml b/src/Main/Base/Project/Src/Gui/Components/StringListEditor.xaml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <UserControl
-	x:Class="ICSharpCode.SharpDevelop.Gui.StringListEditorXaml"
+	x:Class="ICSharpCode.SharpDevelop.Gui.StringListEditor"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:widgets="http://icsharpcode.net/sharpdevelop/widgets"
@@ -37,7 +37,7 @@
 			<Button x:Name="addButton"
 				IsEnabled="False"
 				Click="AddButton_Click"
-				Content="{core:Localize Dialog.ProjectOptions.ReferencePaths.AddPath}"
+				Content="{Binding AddButtonText}"
 				Style="{x:Static core:GlobalStyles.ButtonStyle}">
 			</Button>
 		
diff --git a/src/Main/Base/Project/Src/Gui/Components/StringListEditor.xaml.cs b/src/Main/Base/Project/Src/Gui/Components/StringListEditor.xaml.cs
@@ -26,14 +26,14 @@
 namespace ICSharpCode.SharpDevelop.Gui
 {
 	/// <summary>
-	/// Interaction logic for StringListEditorXaml.xaml
+	/// Interaction logic for StringListEditor.xaml
 	/// </summary>
-	public partial class StringListEditorXaml : UserControl
+	public partial class StringListEditor : UserControl
 	{
-		bool browseForDirectory;
+		bool showBrowse;
 		public event EventHandler ListChanged;
 		
-		public StringListEditorXaml()
+		public StringListEditor()
 		{
 			InitializeComponent();
 			moveUpButton.Content = new Image { Height = 16, Source = PresentationResourceService.GetBitmapSource("Icons.16x16.ArrowUp") };
@@ -44,16 +44,18 @@ public StringListEditorXaml()
 		
 		public string TitleText {get;set;}
 		
+		public string AddButtonText { get; set; }
+		
 		public string ListCaption {get;set;}
 		
 		
-		public bool BrowseForDirectory {
+		public bool ShowBrowse {
 			get {
-				return browseForDirectory;
+				return showBrowse;
 			}
 			set {
-				browseForDirectory = value;
-				if (browseForDirectory) {
+				showBrowse = value;
+				if (showBrowse) {
 					browseButton.Visibility = Visibility.Visible;
 				} else {
 					browseButton.Visibility = Visibility.Hidden;
diff --git a/src/Main/Base/Project/Src/Gui/Components/StringListEditorDialog.xaml b/src/Main/Base/Project/Src/Gui/Components/StringListEditorDialog.xaml
@@ -22,7 +22,7 @@
 			<ColumnDefinition Width="70"></ColumnDefinition>
 		</Grid.ColumnDefinitions>
 		
-		<local:StringListEditorXaml x:Name="stringListEditor" Grid.ColumnSpan="3" VerticalAlignment="Stretch"></local:StringListEditorXaml>
+		<local:StringListEditor x:Name="stringListEditor" Grid.ColumnSpan="3" VerticalAlignment="Stretch" />
 		
 		<Button  Margin="0,3,5,3" Grid.Row="1" Grid.Column="1" IsDefault="True"  Click="Button_Click" Content="{core:Localize Global.OKButtonText}"></Button>
 		<Button  Margin="0,3,5,3" Grid.Row="1" Grid.Column="2" IsCancel="True"  Content="{core:Localize Global.CancelButtonText}"></Button>
diff --git a/src/Main/Base/Project/Src/Gui/Components/StringListEditorDialog.xaml.cs b/src/Main/Base/Project/Src/Gui/Components/StringListEditorDialog.xaml.cs
@@ -39,9 +39,9 @@ public StringListEditorDialog()
 		}
 		
 		
-		public bool BrowseForDirectory {
-			get {return stringListEditor.BrowseForDirectory;}
-			set {stringListEditor.BrowseForDirectory = value;}
+		public bool ShowBrowse {
+			get {return stringListEditor.ShowBrowse;}
+			set {stringListEditor.ShowBrowse = value;}
 		}
 		
 		public string ListCaption {
@@ -54,6 +54,11 @@ public string TitleText {
 			set {stringListEditor.TitleText = value;}
 		}
 		
+		public string AddButtonText {
+			get {return stringListEditor.AddButtonText;}
+			set {stringListEditor.AddButtonText = value;}
+		}
+		
 		public string[] GetList() {
 			return stringListEditor.GetList();
 		}
@@ -66,13 +71,5 @@ void Button_Click(object sender, RoutedEventArgs e)
 		{
 			DialogResult = true;
 		}
-		
-		
-		public  string AddButtonText
-		{
-			get {return stringListEditor.Content.ToString();}
-			set {stringListEditor.addButton.Content = value;}
-		}
-		
 	}
 }
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ReferencePaths.xaml b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ReferencePaths.xaml
@@ -21,7 +21,7 @@
 			<optionpanels:StorageLocationPicker Margin="5,40,0,0"
 				x:Name="location" Location="{Binding ReferencePath.Location}" />
 			
-			<gui:StringListEditorXaml x:Name="editor" Grid.Column="1" Grid.RowSpan="2"></gui:StringListEditorXaml>
+			<gui:StringListEditor x:Name="editor" Grid.Column="1" Grid.RowSpan="2"></gui:StringListEditor>
 		
 		</Grid>
 	</ScrollViewer>
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ReferencePaths.xaml.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ReferencePaths.xaml.cs
@@ -31,7 +31,7 @@ public ReferencePaths()
 		{
 			InitializeComponent();
 			
-			editor.BrowseForDirectory = true;
+			editor.ShowBrowse = true;
 			editor.TitleText = StringParser.Parse("${res:Global.Folder}:");
 			editor.ListCaption = StringParser.Parse("${res:Dialog.ProjectOptions.ReferencePaths}:");
 			editor.ListChanged += delegate { IsDirty = true; };
diff --git a/src/Main/ICSharpCode.Core.WinForms/Menu/MenuCommand.cs b/src/Main/ICSharpCode.Core.WinForms/Menu/MenuCommand.cs
@@ -100,7 +100,8 @@ public virtual void UpdateStatus()
 					} catch (ResourceNotFoundException) {}
 				}
 				Visible = GetVisible();
-				Enabled = command != null && command.CanExecute(caller);
+				command = CommandWrapper.Unwrap(command);
+				Enabled = command != null && MenuService.CanExecuteCommand(command, caller);
 			}
 		}
 		
diff --git a/src/Main/ICSharpCode.Core.WinForms/Menu/MenuService.cs b/src/Main/ICSharpCode.Core.WinForms/Menu/MenuService.cs
@@ -28,6 +28,7 @@ namespace ICSharpCode.Core.WinForms
 	public static class MenuService
 	{
 		public static Action<System.Windows.Input.ICommand, object> ExecuteCommand;
+		public static Func<System.Windows.Input.ICommand, object, bool> CanExecuteCommand;
 		
 		public static void AddItemsToMenu(ToolStripItemCollection collection, object owner, string addInTreePath)
 		{
diff --git a/src/Main/SharpDevelop/Workbench/WpfWorkbench.cs b/src/Main/SharpDevelop/Workbench/WpfWorkbench.cs
@@ -137,6 +137,7 @@ public void Initialize()
 			dockPanel.Children.Insert(dockPanel.Children.Count - 2, statusBar);
 			
 			Core.WinForms.MenuService.ExecuteCommand = ExecuteCommand;
+			Core.WinForms.MenuService.CanExecuteCommand = CanExecuteCommand;
 			UpdateMenu();
 			
 			AddHandler(Hyperlink.RequestNavigateEvent, new RequestNavigateEventHandler(OnRequestNavigate));
@@ -160,9 +161,9 @@ void ExecuteCommand(ICommand command, object caller)
 		{
 			ServiceSingleton.GetRequiredService<IAnalyticsMonitor>()
 				.TrackFeature(command.GetType().FullName, "Menu");
-			var routedCommand = command as System.Windows.Input.RoutedCommand;
+			var routedCommand = command as RoutedCommand;
 			if (routedCommand != null) {
-				var target = System.Windows.Input.FocusManager.GetFocusedElement(this);
+				var target = FocusManager.GetFocusedElement(this);
 				if (routedCommand.CanExecute(caller, target))
 					routedCommand.Execute(caller, target);
 			} else {
@@ -171,6 +172,17 @@ void ExecuteCommand(ICommand command, object caller)
 			}
 		}
 		
+		bool CanExecuteCommand(ICommand command, object caller)
+		{
+			var routedCommand = command as RoutedCommand;
+			if (routedCommand != null) {
+				var target = FocusManager.GetFocusedElement(this);
+				return routedCommand.CanExecute(caller, target);
+			} else {
+				return command.CanExecute(caller);
+			}
+		}
+		
 		// keep a reference to the event handler to prevent it from being garbage collected
 		// (CommandManager.RequerySuggested only keeps weak references to the event handlers)
 		EventHandler requerySuggestedEventHandler;

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ private string[] GetRuleAssemblyList(bool replacePath)`
`276`	`276`	`private void ChangeRuleAssembliesButtonClick( object sender, RoutedEventArgs e)`
`277`	`277`	`{`
`278`	`278`	`var stringListDialog = new StringListEditorDialog();`
`279`		`- stringListDialog.BrowseForDirectory = true;`
	`279`	`+ stringListDialog.ShowBrowse = true;`
`280`	`280`	`stringListDialog.TitleText = StringParser.Parse("${res:ICSharpCode.CodeAnalysis.ProjectOptions.ChooseRuleAssemblyDirectory}");`
`281`	`281`	`stringListDialog.LoadList(GetRuleAssemblyList(false));`
`282`	`282`	`stringListDialog.ShowDialog();`
Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,10 @@ internal static string GuessNameFromType(IType returnType)`
`363`	`363`	`case "System.Action":`
`364`	`364`	`return "action";`
`365`	`365`	`}`
`366`		`- return returnType.Name;`
	`366`	`+ if (returnType.Kind == TypeKind.Interface && returnType.Name.StartsWith("I", System.StringComparison.Ordinal))`
	`367`	`+ return returnType.Name.Substring(1);`
	`368`	`+ else`
	`369`	`+ return returnType.Name;`
`367`	`370`	`}`
`368`	`371`
`369`	`372`	`string GetMethodName(InvocationExpression invocation)`
Original file line number	Diff line number	Diff line change
`@@ -3104,7 +3104,6 @@ private int consume_string (bool quoted)`
`3104`	`3104`
`3105`	`3105`	`value_builder[pos++] = (char) c;`
`3106`	`3106`	`}`
`3107`		`- recordNewLine = true;`
`3108`	`3107`	`}`
`3109`	`3108`
`3110`	`3109`	`private int consume_identifier (int s)`