Paste text with CRLF as hard-breaks, paragraphs (#1746)

* Paste text with CRLF as hard-breaks, paragraphs
#1745

* simplify PageEditor async requirements
#1745

OneMore/Commands/Edit/ConvertMarkdownCommand.cs

@@ -47,7 +47,7 @@ public override async Task Execute(params object[] args)
 
 			foreach (var outline in outlines.ToList())
 			{
-				var content = await editor.ExtractSelectedContent(outline);
+				var content = editor.ExtractSelectedContent(outline);
 				logger.Debug("outline - - - - - - - - - - - - - - - - - - - - - -");
 				logger.Debug(content);
 				logger.Debug("/outline");

OneMore/Commands/Edit/CopyAsMarkdownCommand.cs

@@ -25,7 +25,7 @@ public override async Task Execute(params object[] args)
 			#region WriteMarkdown(PageEditor editor, MarkdownWriter writer, XElement start)
 			async void WriteMarkdown(PageEditor editor, MarkdownWriter writer, XElement start)
 			{
-				var content = await editor.ExtractSelectedContent(start);
+				var content = editor.ExtractSelectedContent(start);
 
 				logger.Debug("markdown content");
 				logger.Debug(content);

OneMore/Commands/Edit/PasteTextCommand.cs

@@ -1,5 +1,5 @@
 //************************************************************************************************
-// Copyright © 2022 Steven M Cohn.  All rights reserved.
+// Copyright © 2022 Steven M Cohn. All rights reserved.
 //************************************************************************************************
 
 namespace River.OneMoreAddIn.Commands
@@ -23,44 +23,50 @@ public PasteTextCommand()
 
 		public override async Task Execute(params object[] args)
 		{
-			await using var one = new OneNote(out var page, out var ns);
-			var elements = page.Root.Descendants(ns + "T")
-				.Where(e => e.Attribute("selected")?.Value == "all");
-
 			var text = await new ClipboardProvider().GetText();
 			if (string.IsNullOrEmpty(text))
 			{
 				return;
 			}
 
-			var editor = new PageEditor(page);
-			var content = new XElement(ns + "T", new XCData(text));
+			await using var one = new OneNote(out var page, out var ns);
+			PageNamespace.Set(ns);
 
-			if (!elements.Any())
+			var elements = page.Root.Descendants(ns + "T")
+				.Where(e => e.Attribute("selected")?.Value == "all");
+
+			var editor = new PageEditor(page)
 			{
-				// empty page so add new content
-				editor.AddNextParagraph(content);
-			}
-			else if (elements.Count() > 1)
+				KeepSelected = false
+			};
+
+			if (elements.Any())
 			{
-				// selected multiple runs so replace them all
-				editor.ReplaceSelectedWith(content);
+				editor.ExtractSelectedContent();
 			}
-			else
+
+			// OneNote transforms \r\n into soft-break <br> but we want hard-breaks,
+			// so split text into lines...
+
+			var lines = text.Split(new string[] { "\r\n" }, System.StringSplitOptions.None);
+
+			XElement first = null;
+			for (var i = lines.Length - 1; i >= 0; i--)
 			{
-				var line = elements.First();
-				if (line.Value.Length == 0)
-				{
-					// empty cdata, unselected cursor so just insert
-					line.GetCData().Value = text;
-				}
-				else
-				{
-					// something is selected so replace it
-					editor.ReplaceSelectedWith(content);
-				}
+				var run = new XElement(ns + "T", new XCData(lines[i]));
+				first ??= run;
+
+				editor.InsertAtAnchor(run);
 			}
 
+			// position insertion cursor after last line...
+
+			page.Root.DescendantNodes().OfType<XAttribute>()
+				.Where(a => a.Name == "selected")
+				.Remove();
+
+			first?.SetAttributeValue("selected", "all");
+
 			await one.Update(page);
 		}
 	}

OneMore/Commands/Edit/PreviewMarkdownCommand.cs

@@ -42,7 +42,7 @@ public override async Task Execute(params object[] args)
 			// collect all outlines on page, in document-order
 			foreach (var outline in page.BodyOutlines)
 			{
-				var content = await editor.ExtractSelectedContent(outline);
+				var content = editor.ExtractSelectedContent(outline);
 				if (content != null)
 				{
 					if (paragraphs.Count >= 1)

OneMore/Commands/Page/ExtractContentCommand.cs

@@ -61,7 +61,7 @@ public override async Task Execute(params object[] args)
 			}
 
 			var editor = new PageEditor(page);
-			var content = await editor.ExtractSelectedContent();
+			var content = editor.ExtractSelectedContent();
 
 			var sectionEditor = new SectionEditor(await one.GetSection());
 

OneMore/Commands/Snippets/InsertBoxCommand.cs

@@ -116,7 +116,7 @@ public override async Task Execute(params object[] args)
 				cell.SetContent(MakeDefaultContent(addTitle));
 
 				var editor = new PageEditor(page);
-				await editor.ExtractSelectedContent();
+				editor.ExtractSelectedContent();
 
 				var box = new XElement(ns + "OE", table.Root);
 				if (editor.Anchor.Name.LocalName.In("OE", "HTMLBlock"))
@@ -137,7 +137,7 @@ public override async Task Execute(params object[] args)
 					KeepSelected = true
 				};
 
-				var content = await editor.ExtractSelectedContent();
+				var content = editor.ExtractSelectedContent();
 
 				if (!content.HasElements)
 				{

OneMore/Commands/Snippets/InsertInfoBoxCommand.cs

@@ -69,7 +69,7 @@ public override async Task Execute(params object[] args)
 					));
 
 				var editor = new PageEditor(page);
-				await editor.ExtractSelectedContent();
+				editor.ExtractSelectedContent();
 				anchor = editor.Anchor;
 			}
 			else
@@ -80,7 +80,7 @@ public override async Task Execute(params object[] args)
 					KeepSelected = true
 				};
 
-				content = await editor.ExtractSelectedContent();
+				content = editor.ExtractSelectedContent();
 				anchor = editor.Anchor;
 
 				editor.Deselect();

OneMore/Models/PageEditor.cs

@@ -9,7 +9,6 @@ namespace River.OneMoreAddIn.Models
 	using System.Collections.Generic;
 	using System.Linq;
 	using System.Text;
-	using System.Threading.Tasks;
 	using System.Xml;
 	using System.Xml.Linq;
 
@@ -637,7 +636,7 @@ public bool EditNode(XElement cursor, Func<XNode, XNode> edit)
 		/// Default is to process all page content.
 		/// </param>
 		/// <returns>An OEChildren XElement</returns>
-		public async Task<XElement> ExtractSelectedContent(XElement targetOutline = null)
+		public XElement ExtractSelectedContent(XElement targetOutline = null)
 		{
 			schema = new PageSchema();
 
@@ -694,7 +693,7 @@ public async Task<XElement> ExtractSelectedContent(XElement targetOutline = null
 			//	: Anchor.Elements(ns + "OE").Select(e => e.Attribute("objectID").Value).FirstOrDefault();
 			//logger.WriteLine($"first anchor ({oid})", Anchor);
 
-			var snippets = await ExtractSnippets(runs);
+			var snippets = ExtractSnippets(runs);
 			RebuildContent(snippets, content);
 
 			//logger.WriteLine($"content", content);
@@ -760,9 +759,8 @@ private XElement WholeTableSelected(XElement cell)
 		}
 
 
-		private async Task<List<Snippet>> ExtractSnippets(List<XElement> runs)
+		private List<Snippet> ExtractSnippets(List<XElement> runs)
 		{
-			await using var one = new OneNote();
 			var tables = new List<XElement>();
 
 			var snippets = new List<Snippet>();
@@ -867,6 +865,7 @@ next is null &&
 					if (run.Name.LocalName == "Image" &&
 						run.Elements(ns + "CallbackID").FirstOrDefault() is XElement callback)
 					{
+						using var one = new OneNote();
 						var data = one.GetPageContent(page.PageId,
 							callback.Attribute("callbackID").Value);
 
@@ -1078,9 +1077,9 @@ private void CleanupOrphanedElements()
 		}
 
 
-		public async Task<bool> ReplaceSelectedContent(XElement replacement)
+		public bool ReplaceSelectedContent(XElement replacement)
 		{
-			var content = await ExtractSelectedContent();
+			var content = ExtractSelectedContent();
 
 			if (!content.HasElements)
 			{