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

Author: PeterForstmeier

src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageMethodElement.cs

@@ -58,6 +58,7 @@ public CodeCoverageMethodElement(XElement element, CodeCoverageResults results)
 
 		public string FileID { get; private set; }
 		public string FileName { get; private set; }
+		public string FileNameExt { get; private set; }
 		public bool IsVisited { get; private set; }
 		public int CyclomaticComplexity { get; private set; }
 		public decimal SequenceCoverage { get; private set; }
@@ -86,9 +87,14 @@ void Init()
 
 			this.FileID = GetFileRef();
 			this.FileName = String.Empty;
+			this.FileNameExt = String.Empty;
 			if (!String.IsNullOrEmpty(this.FileID)) {
 				if (results != null) {
 					this.FileName = results.GetFileName(this.FileID);
+					try {
+						this.FileNameExt = Path.GetExtension(this.FileName).ToLowerInvariant();
+					}
+					catch {}
 					if (cacheFileName != this.FileName) {
 						cacheFileName = this.FileName;
 						cacheDocument = GetSource (cacheFileName);
@@ -220,14 +226,19 @@ void GetSequencePointContent(CodeCoverageSequencePoint sp)
 		// -> this method SP with lowest Line/Column
 		void getBodyStartSP() {
 			if (this.SequencePoints.Count != 0) {
-				foreach (CodeCoverageSequencePoint sp in this.SequencePoints) {
-					if (sp.FileID != this.FileID) continue;
-					if (this.BodyStartSP == null || (sp.Line < this.BodyStartSP.Line) ||
-					   (sp.Line == this.BodyStartSP.Line && sp.Column < this.BodyStartSP.Column)
-					   ) {
-						this.BodyStartSP = sp;
+				if (this.FileNameExt == ".cs") {
+					foreach (CodeCoverageSequencePoint sp in this.SequencePoints) {
+						if (sp.FileID != this.FileID) continue;
+						if (this.BodyStartSP == null || (sp.Line < this.BodyStartSP.Line) ||
+						   (sp.Line == this.BodyStartSP.Line && sp.Column < this.BodyStartSP.Column)
+						   ) {
+							this.BodyStartSP = sp;
+						}
 					}
 				}
+				else {
+					this.BodyStartSP = this.SequencePoints.First();
+				}
 			}
 		}
 
@@ -236,29 +247,34 @@ void getBodyStartSP() {
 		// and lowest Offset (when duplicated bw ccrewrite)
 		void getBodyFinalSP() {
 			if (this.SequencePoints.Count != 0) {
-				for (int i = this.SequencePoints.Count-1; i > 0; i--) {
-					var sp = this.SequencePoints[i];
-					if (sp.FileID != this.FileID) continue;
-					if (sp.Content != "}") continue;
-					if (this.BodyFinalSP == null || (sp.Line > this.BodyFinalSP.Line) ||
-					   (sp.Line == this.BodyFinalSP.Line && sp.Column >= this.BodyFinalSP.Column)
-					   ) {
-						// ccrewrite ContractClass/ContractClassFor
-						// adds duplicate method end-sequence-point "}"
-						//
-						// Take duplicate BodyFinalSP with lower Offset
-						// Because IL.Offset of second duplicate
-						// will extend branch coverage of this method
-						// by coverage of ContractClassFor inserted SequencePoint!
-						if (this.BodyFinalSP != null &&
-							sp.Line == this.BodyFinalSP.Line &&
-							sp.Column == this.BodyFinalSP.Column &&
-							sp.Offset < this.BodyFinalSP.Offset) {
-							this.SequencePoints.Remove(this.BodyFinalSP); // remove duplicate
+				if (this.FileNameExt == ".cs") {
+					for (int i = this.SequencePoints.Count-1; i > 0; i--) {
+						var sp = this.SequencePoints[i];
+						if (sp.FileID != this.FileID) continue;
+						if (sp.Content != "}") continue;
+						if (this.BodyFinalSP == null || (sp.Line > this.BodyFinalSP.Line) ||
+						   (sp.Line == this.BodyFinalSP.Line && sp.Column >= this.BodyFinalSP.Column)
+						   ) {
+							// ccrewrite ContractClass/ContractClassFor
+							// adds duplicate method end-sequence-point "}"
+							//
+							// Take duplicate BodyFinalSP with lower Offset
+							// Because IL.Offset of second duplicate
+							// will extend branch coverage of this method
+							// by coverage of ContractClassFor inserted SequencePoint!
+							if (this.BodyFinalSP != null &&
+								sp.Line == this.BodyFinalSP.Line &&
+								sp.Column == this.BodyFinalSP.Column &&
+								sp.Offset < this.BodyFinalSP.Offset) {
+								this.SequencePoints.Remove(this.BodyFinalSP); // remove duplicate
+							}
+							this.BodyFinalSP = sp;
 						}
-						this.BodyFinalSP = sp;
 					}
 				}
+				else {
+					this.BodyFinalSP = this.SequencePoints.Last();
+				}
 			}
 		}
 
@@ -273,6 +289,9 @@ int GetSequencePointsCount() {
 			return 0;
 		}
 
+		const string @assert = "Assert";
+		const string @contract = "Contract";
+
 		void GetBranchRatio () {
 
 			this.BranchCoverageRatio = null;
@@ -295,31 +314,33 @@ void GetBranchRatio () {
 				// SequencePoint is visited and belongs to this method?
 				if (sp.VisitCount != 0 && sp.FileID == this.FileID) {
 
-					// Don't want branch coverage of ccrewrite(n)
-					// SequencePoint's with offset before and after method body
-					if (sp.Offset < BodyStartSP.Offset ||
-						sp.Offset > BodyFinalSP.Offset) {
-						sp.BranchCoverage = true;
-						continue; // skip
-					}
+					if (this.FileNameExt == ".cs") {
+						// Only for C#
 
-					// 1) Generated "in" code for IEnumerables contains hidden "try/catch/finally" branches that
-					// one do not want or cannot cover by test-case because is handled earlier at same method.
-					// ie: NullReferenceException in foreach loop is pre-handled at method entry, ie. by Contract.Require(items!=null)
-					// 2) Branches within sequence points "{" and "}" are not source branches but compiler generated branches
-					// ie: static methods start sequence point "{" contains compiler generated branches
-					// 3) Exclude Contract class (EnsuresOnThrow/Assert/Assume is inside method body)
-					// 4) Exclude NUnit Assert(.Throws) class
-					const string assert = "Assert";
-					const string contract = "Contract";
-					if (sp.Content == "in" || sp.Content == "{" || sp.Content == "}" ||
-					    sp.Content.StartsWith(assert + ".", StringComparison.Ordinal) ||
-					    sp.Content.StartsWith(assert + " ", StringComparison.Ordinal) ||
-					    sp.Content.StartsWith(contract + ".", StringComparison.Ordinal) ||
-					    sp.Content.StartsWith(contract + " ", StringComparison.Ordinal)
-					   ) {
-						sp.BranchCoverage = true;
-						continue; // skip
+						// Don't want branch coverage of ccrewrite(n)
+						// SequencePoint(s) with offset before and after method body
+						if (sp.Offset < BodyStartSP.Offset ||
+							sp.Offset > BodyFinalSP.Offset) {
+							sp.BranchCoverage = true;
+							continue; // skip
+						}
+
+						// 1) Generated "in" code for IEnumerables contains hidden "try/catch/finally" branches that
+						// one do not want or cannot cover by test-case because is handled earlier at same method.
+						// ie: NullReferenceException in foreach loop is pre-handled at method entry, ie. by Contract.Require(items!=null)
+						// 2) Branches within sequence points "{" and "}" are not source branches but compiler generated branches
+						// ie: static methods start sequence point "{" contains compiler generated branches
+						// 3) Exclude Contract class (EnsuresOnThrow/Assert/Assume is inside method body)
+						// 4) Exclude NUnit Assert(.Throws) class
+						if (sp.Content == "in" || sp.Content == "{" || sp.Content == "}" ||
+						    sp.Content.StartsWith(@assert + ".", StringComparison.Ordinal) ||
+						    sp.Content.StartsWith(@assert + " ", StringComparison.Ordinal) ||
+						    sp.Content.StartsWith(@contract + ".", StringComparison.Ordinal) ||
+						    sp.Content.StartsWith(@contract + " ", StringComparison.Ordinal)
+						   ) {
+							sp.BranchCoverage = true;
+							continue; // skip
+						}
 					}
 
 					totalBranchCount += sp.BranchExitsCount;

src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpMethodInsight.cs

@@ -50,7 +50,9 @@ public CSharpMethodInsight(ITextEditor editor, int startOffset, IEnumerable<CSha
 		public void Show()
 		{
 			window = editor.ShowInsightWindow(items);
-			window.StartOffset = startOffset;
+			// Set startOffset so that window always appears below the caret line
+			var startLocation = editor.Document.GetLocation(startOffset);
+			window.StartOffset = editor.Document.GetOffset(editor.Caret.Line, startLocation.Column);
 			// closing the window at the end of the parameter list is handled by the CaretPositionChanged event
 			window.EndOffset = editor.Document.TextLength;
 			if (initiallySelectedItem != null)

src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/CSharpCodeGenerator.cs

@@ -86,7 +86,10 @@ public override void InsertEventHandler(ITypeDefinition target, string name, IEv
 			var node = context.RootNode.GetNodeAt<EntityDeclaration>(last.Region.Begin);
 			var resolver = context.GetResolverStateAfter(node);
 			var builder = new TypeSystemAstBuilder(resolver);
-			var delegateDecl = builder.ConvertEntity(eventDefinition.ReturnType.GetDefinition()) as DelegateDeclaration;
+			var invokeMethod = eventDefinition.ReturnType.GetDelegateInvokeMethod();
+			if (invokeMethod == null) return;
+			var importedMethod = resolver.Compilation.Import(invokeMethod);
+			var delegateDecl = builder.ConvertEntity(importedMethod) as MethodDeclaration;
 			if (delegateDecl == null) return;
 			var throwStmt = new ThrowStatement(new ObjectCreateExpression(context.CreateShortType("System", "NotImplementedException")));
 			var decl = new MethodDeclaration() {
@@ -96,7 +99,7 @@ public override void InsertEventHandler(ITypeDefinition target, string name, IEv
 					throwStmt
 				}
 			};
-			var param = delegateDecl.Parameters.Select(p => p.Clone()).OfType<ParameterDeclaration>().ToArray();
+			var param = delegateDecl.Parameters.Select(p => p.Clone()).ToArray();
 			decl.Parameters.AddRange(param);
 
 			using (Script script = context.StartScript()) {

src/AddIns/DisplayBindings/ILSpyAddIn/ILSpyParser.cs

@@ -20,6 +20,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Text;
 using System.Threading;
 using ICSharpCode.Core;
 using ICSharpCode.NRefactory;
@@ -82,7 +83,32 @@ public ICodeContext ResolveContext(ParseInformation parseInfo, TextLocation loca
 
 		public ResolveResult ResolveSnippet(ParseInformation parseInfo, TextLocation location, string codeSnippet, ICompilation compilation, CancellationToken cancellationToken)
 		{
-			return null;
+			var decompiledParseInfo = parseInfo as ILSpyFullParseInformation;
+			if (decompiledParseInfo == null)
+				throw new ArgumentException("ParseInfo does not have SyntaxTree");
+			CSharpAstResolver contextResolver = new CSharpAstResolver(compilation, decompiledParseInfo.SyntaxTree, null);
+			var node = decompiledParseInfo.SyntaxTree.GetNodeAt(location);
+			CSharpResolver context;
+			if (node != null)
+				context = contextResolver.GetResolverStateAfter(node, cancellationToken);
+			else
+				context = new CSharpResolver(compilation);
+			CSharpParser parser = new CSharpParser();
+			var expr = parser.ParseExpression(codeSnippet);
+			if (parser.HasErrors)
+				return new ErrorResolveResult(SpecialType.UnknownType, PrintErrorsAsString(parser.Errors), TextLocation.Empty);
+			CSharpAstResolver snippetResolver = new CSharpAstResolver(context, expr);
+			return snippetResolver.Resolve(expr, cancellationToken);
+		}
+		
+		string PrintErrorsAsString(IEnumerable<Error> errors)
+		{
+			StringBuilder builder = new StringBuilder();
+			
+			foreach (var error in errors)
+				builder.AppendLine(error.Message);
+			
+			return builder.ToString();
 		}
 
 		public void FindLocalReferences(ParseInformation parseInfo, ITextSource fileContent, IVariable variable, ICompilation compilation, Action<SearchResultMatch> callback, CancellationToken cancellationToken)

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/ModelTests.cs

@@ -668,6 +668,11 @@ public void AddBrushAsResource()
 		}
 
 		public void AddNativeTypeAsResource(object component, string expectedXamlValue)
+		{
+			AddTypeAsResource(component, expectedXamlValue, "Controls0:", new string[] { "xmlns:Controls0=\"clr-namespace:System;assembly=mscorlib\""} );
+		}
+		
+		public void AddTypeAsResource(object component, string expectedXamlValue, string typePrefix, String[] additionalXmlns)
 		{
 			DesignItem textBlock = CreateCanvasContext("<TextBlock/>");
 			DesignItem canvas = textBlock.Parent;
@@ -687,11 +692,11 @@ public void AddNativeTypeAsResource(object component, string expectedXamlValue)
 			string typeName = component.GetType().Name;
 
 			string expectedXaml = "<Canvas.Resources>\n" +
-								  "  <Controls0:" + typeName + " x:Key=\"res1\">" + expectedXamlValue + "</Controls0:" + typeName + ">\n" +
+								  "  <" + typePrefix + typeName + " x:Key=\"res1\">" + expectedXamlValue + "</" + typePrefix + typeName + ">\n" +
 								  "</Canvas.Resources>\n" +
 								  "<TextBlock Tag=\"{StaticResource ResourceKey=res1}\" />";
 
-			AssertCanvasDesignerOutput(expectedXaml, textBlock.Context, "xmlns:Controls0=\"clr-namespace:System;assembly=mscorlib\"");
+			AssertCanvasDesignerOutput(expectedXaml, textBlock.Context, additionalXmlns);
 			AssertLog("");
 		}
 
@@ -736,6 +741,18 @@ public void AddInt32AsResource()
 			const int i = 123;
 			AddNativeTypeAsResource(i, "123");
 		}
+		
+		[Test]
+		public void AddWpfEnumAsResource()
+		{
+			AddTypeAsResource(VerticalAlignment.Center, "Center", "", new string[0]);
+		}
+		
+		[Test]
+		public void AddCustomEnumAsResource()
+		{
+			AddTypeAsResource(MyEnum.One, "One", "t:", new string[0]);
+		}
 	}
 
 	public class MyMultiConverter : IMultiValueConverter
@@ -760,4 +777,9 @@ public string StringProp {
 			set { stringProp = value; }
 		}
 	}
+	
+	public enum MyEnum
+	{
+		One, Two
+	}
 }

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlDocument.cs

@@ -275,7 +275,7 @@ internal string GetPrefixForNamespace(string @namespace)
 
 		bool IsNativeType(object instance)
 		{
-			return instance.GetType().Assembly == typeof(String).Assembly;
+			return instance.GetType().Assembly == typeof(String).Assembly || instance.GetType().IsEnum;
 		}
 	}
 }

src/AddIns/VersionControl/SubversionAddIn/Src/Commands/AutostartCommands.cs

@@ -389,6 +389,10 @@ void FileRenaming(object sender, FileRenamingEventArgs e)
 			if (!AddInOptions.AutomaticallyRenameFiles) return;
 			string fullSource = Path.GetFullPath(e.SourceFile);
 			if (!CanBeVersionControlledFile(fullSource)) return;
+			if (!FileHelpers.CheckRenameOrReplacePossible(e)) {
+				e.Cancel = true;
+				return;
+			}
 			try {
 				using (SvnClientWrapper client = new SvnClientWrapper()) {
 					SvnMessageView.HandleNotifications(client);

src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/OutputVisitor/InsertMissingTokensDecorator.cs

@@ -61,6 +61,7 @@ public override void EndNode(AstNode node)
 		public override void WriteToken(Role role, string token)
 		{
 			CSharpTokenNode t = new CSharpTokenNode(locationProvider.Location, (TokenRole)role);
+			t.Role = role;
 			EmptyStatement node = nodes.Peek().LastOrDefault() as EmptyStatement;
 			if (node == null)
 				currentList.Add(t);

src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj

@@ -366,6 +366,7 @@
     <Compile Include="Workbench\DisplayBinding\ISecondaryDisplayBinding.cs" />
     <Compile Include="Workbench\FakeXmlViewContent.cs" />
     <Compile Include="Workbench\FileChangeWatcher.cs" />
+    <Compile Include="Workbench\File\FileHelpers.cs" />
     <Compile Include="Workbench\File\FileService.cs" />
     <Compile Include="Workbench\File\IRecentOpen.cs" />
     <Compile Include="Workbench\ICustomizedCommands.cs" />

src/Main/Base/Project/Workbench/File/FileHelpers.cs

@@ -0,0 +1,49 @@
+// Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER 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 System.IO;
+using ICSharpCode.Core;
+
+namespace ICSharpCode.SharpDevelop.Workbench
+{
+	/// <summary>
+	/// Utility/helper methods for IFileService to avoid changing the IFileService interface.
+	/// </summary>
+	public static class FileHelpers
+	{
+		/// <summary>
+		/// Checks that the rename/overwrite operation is possible.
+		/// </summary>
+		public static bool CheckRenameOrReplacePossible(FileRenameEventArgs e, bool replaceAllowed = false)
+		{
+			if (e.IsDirectory && Directory.Exists(e.SourceFile)) {
+				if (!replaceAllowed && Directory.Exists(e.TargetFile)) {
+					SD.MessageService.ShowMessage(StringParser.Parse("${res:Gui.ProjectBrowser.FileInUseError}"));
+					return false;
+				}
+			} else if (File.Exists(e.SourceFile)) {
+				if (!replaceAllowed && File.Exists(e.TargetFile)) {
+					SD.MessageService.ShowMessage(StringParser.Parse("${res:Gui.ProjectBrowser.FileInUseError}"));
+					return false;
+				}
+			}
+			return true;
+		}
+	}
+}