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

src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/AddOptionalParameterToInvocationAction.cs

@@ -54,8 +54,10 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			bool[] parameterIsSpecified = new bool[method.Parameters.Count];
 			var argumentToParameterMap = resolveResult.GetArgumentToParameterMap();
 			if (argumentToParameterMap != null) {
-				foreach (int paramIndex in argumentToParameterMap)
+				foreach (int paramIndex in argumentToParameterMap) {
+					if (paramIndex >= 0)
 						parameterIsSpecified[paramIndex] = true;
+				}
 			} else {
 				for (int i = 0; i < Math.Min(resolveResult.Arguments.Count, parameterIsSpecified.Length); i++) {
 					parameterIsSpecified[i] = true;

src/Main/SharpDevelop/Parser/AssemblyParserService.cs

@@ -391,7 +391,7 @@ namespace ICSharpCode.SharpDevelop.Parser
 				return GetAssemblyModel(fileName, includeInternalMembers);
 			} catch (BadImageFormatException) {
 				SD.MessageService.ShowWarningFormatted("${res:ICSharpCode.SharpDevelop.Dom.AssemblyInvalid}", Path.GetFileName(fileName));
-			} catch (FileNotFoundException) {
+			} catch (IOException) {
 				SD.MessageService.ShowWarningFormatted("${res:ICSharpCode.SharpDevelop.Dom.AssemblyNotAccessible}", fileName);
 			}