Merge remote-tracking branch 'upstream/master'

Author: gumme

data/templates/packages/Modernizr.2.5.3.nupkg

@@ -19,6 +19,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.IO;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -72,7 +73,7 @@ void AddCurrentProjectAssemblyClick(object sender, RoutedEventArgs e)
 				return;
 
 			string fileName = ProjectService.CurrentProject.OutputAssemblyFullPath;
-			if (string.IsNullOrEmpty(fileName))
+			if (!File.Exists(fileName))
 			{
 				MessageBox.Show("Project output assembly not found! Please build it first!");
 				return;

data/templates/packages/jQuery.1.7.2.nupkg

@@ -79,6 +79,8 @@ public void Dispose()
 		public void Draw(TextView textView, DrawingContext drawingContext)
 		{
 			if (currentReferences == null) {
+				if (textView.VisualLines.Count == 0)
+					return;
 				var start = textView.VisualLines.First().FirstDocumentLine.LineNumber;
 				var end = textView.VisualLines.Last().LastDocumentLine.LineNumber;
 				currentReferences = new List<ISegment>();
@@ -188,7 +190,7 @@ void ColorizeMatch(AstNode node, ResolveResult result)
 		{
 			var identifierNode = FindReferences.GetNodeToReplace(node);
 			TextLocation start, end;
-			if (!identifierNode.IsNull) {
+			if (identifierNode != null && !identifierNode.IsNull) {
 				start = identifierNode.StartLocation;
 				end = identifierNode.EndLocation;
 			}

src/AddIns/Analysis/CodeQuality/Gui/MainView.xaml.cs

@@ -152,6 +152,7 @@ void InsertWithCursorOnLayer(EditorScript currentScript, InsertionCursorLayer la
 			if (doc != null) {
 				doc.UndoStack.Push(op);
 			}
+			layer.ScrollToInsertionPoint();
 			layer.Exited += delegate(object s, InsertionCursorEventArgs args) {
 				doc.UndoStack.StartContinuedUndoGroup();
 				try {

src/AddIns/BackendBindings/CSharpBinding/Project/Src/CaretReferenceHighlightRenderer.cs

@@ -65,7 +65,6 @@ public InsertionCursorLayer(TextArea editor, string operation, IList<InsertionPo
 			this.editor.TextView.InsertLayer(this, KnownLayer.Text, LayerInsertionPosition.Above);
 			this.editor.TextView.ScrollOffsetChanged += TextViewScrollOffsetChanged;
 			AddGroupBox();
-			ScrollToInsertionPoint();
 		}
 
 		static readonly Pen markerPen = new Pen(Brushes.Blue, 2);
@@ -246,7 +245,7 @@ void InsertCode(object sender, ExecutedRoutedEventArgs e)
 			FireExited(true);
 		}
 
-		void ScrollToInsertionPoint()
+		internal void ScrollToInsertionPoint()
 		{
 			var location = insertionPoints[CurrentInsertionPoint].Location;
 			editor.GetService<TextEditor>().ScrollTo(location.Line, location.Column);

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

@@ -345,8 +345,7 @@ Task<IContextAction[]> IContextActionProvider.GetAvailableActionsAsync(EditorRef
 					result.AddRange(tag.Actions);
 					string issueName;
 					if (CanSuppress(tag, out issueName)) {
-						result.Add(new SuppressIssueContextAction(issueName, SuppressType.Once));
-						result.Add(new SuppressIssueContextAction(issueName, SuppressType.Always));
+						result.Add(new SuppressIssueContextAction(issueName));
 					}
 				}
 			}
@@ -363,21 +362,14 @@ bool CanSuppress(InspectionTag tag, out string issueName)
 			return true;
 		}
 
-		enum SuppressType {
-			Once,
-			Always
-		}
-		
 		[ContextAction("Suppress issue", Description = "Suppresses an issue.")]
 		class SuppressIssueContextAction : ContextAction
 		{
 			string issueName;
-			SuppressType type;
 
-			public SuppressIssueContextAction(string issueName, SuppressType type)
+			public SuppressIssueContextAction(string issueName)
 			{
 				this.issueName = issueName;
-				this.type = type;
 			}
 
 			public override Task<bool> IsAvailableAsync(EditorRefactoringContext context, CancellationToken cancellationToken)
@@ -387,27 +379,21 @@ public override Task<bool> IsAvailableAsync(EditorRefactoringContext context, Ca
 
 			public override string DisplayName
 			{
-				get {
-					string fmt;
-					if (type == SuppressType.Once)
-						fmt = "Suppress '{0}' once";
-					else
-						fmt = "Suppress '{0}'";
-					return string.Format(fmt, issueName);
-				}
+				get { return string.Format("Suppress '{0}'", issueName); }
 			}
 
 			public override void Execute(EditorRefactoringContext context)
 			{
-				var myContext = SDRefactoringContext.Create(context.Editor, default(CancellationToken));
-				var currentNode = myContext.RootNode.GetNodeAt<Statement>(context.CaretLocation);
-				if (currentNode == null)
-					return;
-				using (var script = myContext.StartScript()) {
-					script.InsertBefore(currentNode, new Comment(string.Format(" disable{1}{0}", issueName, type == SuppressType.Once ? " once " : " ")));
-				}
+				SD.AnalyticsMonitor.TrackFeature(typeof(SuppressIssueContextAction), issueName);
+				var lineNo = context.CaretLocation.Line;
+				var document = context.Editor.Document;
+				
+				var line = document.GetLineByNumber(lineNo);
+				string indentation = DocumentUtilities.GetIndentation(document, lineNo);
+				string newLine = DocumentUtilities.GetLineTerminator(document, lineNo);
+				document.Insert(line.Offset, indentation + "// disable once " + issueName + newLine);
 			}
 		}
-		#endregion
 	}
+	#endregion
 }

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

@@ -24,7 +24,7 @@ public class ClipboardRingAction : IContextAction
 
 		public ClipboardRingAction(string text) 
 		{
-			string entry = text.Trim();
+			string entry = System.Text.RegularExpressions.Regex.Replace(text.Trim(), @"\s+", " ");
 			if(entry.Length > maxLength)
 				entry = entry.Substring(0, maxLength-endString.Length) + endString;
 

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

@@ -510,6 +510,7 @@ public void ShowHelp()
 
 		void LoadAndDisplayDesigner()
 		{
+			SD.AnalyticsMonitor.TrackFeature(typeof(FormsDesignerViewContent), "Load");
 			try {
 
 				LoadDesigner();
@@ -627,6 +628,7 @@ static string FormatLoadErrors(DesignSurface designSurface)
 
 		public virtual void MergeFormChanges()
 		{
+			SD.AnalyticsMonitor.TrackFeature(typeof(FormsDesignerViewContent), "Save");
 			if (this.HasLoadError || this.designSurface == null) {
 				LoggingService.Debug("Forms designer: Cannot merge form changes because the designer is not loaded successfully or not loaded at all");
 				return;

src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ContextActions/ClipboardRingAction.cs

@@ -84,6 +84,7 @@ protected override void LoadInternal(OpenedFile file, System.IO.Stream stream)
 		{
 			wasChangedInDesigner = false;
 			Debug.Assert(file == this.PrimaryFile);
+			SD.AnalyticsMonitor.TrackFeature(typeof(WpfViewContent), "Load");
 
 			_stream = new MemoryStream();
 			stream.CopyTo(_stream);
@@ -137,6 +138,7 @@ protected override void LoadInternal(OpenedFile file, System.IO.Stream stream)
 		protected override void SaveInternal(OpenedFile file, System.IO.Stream stream)
 		{
 			if (wasChangedInDesigner && designer.DesignContext != null) {
+				SD.AnalyticsMonitor.TrackFeature(typeof(WpfViewContent), "Save");
 				XmlWriterSettings settings = new XmlWriterSettings();
 				settings.Indent = true;
 				settings.IndentChars = SD.EditorControlService.GlobalOptions.IndentationString;