Merge pull request #35 from rubberduck-vba/p0

Bugfixes

Author: retailcoder

rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/SyncXmldocSection.cs

@@ -29,10 +29,10 @@ public SynchronizeXmlDocSection(IPipeline<SyncContext, bool> parent, Cancellatio
         XmlDocInspectionParser xmlInspectionParser)
         : base(parent, tokenSource, logger)
     {
-        Block = new JustFuckingDoEverything(this, tokenSource, logger, content, inspections, quickfixes, annotations, tagServices, github, mergeService, staging, xmlAnnotationParser, xmlQuickFixParser, xmlInspectionParser);
+        Block = new SynchronizeXmlDocBlock(this, tokenSource, logger, content, inspections, quickfixes, annotations, tagServices, github, mergeService, staging, xmlAnnotationParser, xmlQuickFixParser, xmlInspectionParser);
     }
 
-    public JustFuckingDoEverything Block { get; }
+    public SynchronizeXmlDocBlock Block { get; }
 
     protected override IReadOnlyDictionary<string, IDataflowBlock> Blocks => new Dictionary<string, IDataflowBlock>
     {
@@ -45,7 +45,7 @@ public override void CreateBlocks()
     }
 }
 
-public class JustFuckingDoEverything : ActionBlockBase<SyncRequestParameters, SyncContext>
+public class SynchronizeXmlDocBlock : ActionBlockBase<SyncRequestParameters, SyncContext>
 {
     private readonly IRubberduckDbService _content;
     private readonly IRepository<InspectionEntity> _inspections;
@@ -59,7 +59,7 @@ public class JustFuckingDoEverything : ActionBlockBase<SyncRequestParameters, Sy
     private readonly XmlDocQuickFixParser _xmlQuickFixParser;
     private readonly XmlDocInspectionParser _xmlInspectionParser;
 
-    public JustFuckingDoEverything(PipelineSection<SyncContext> parent, CancellationTokenSource tokenSource, ILogger logger,
+    public SynchronizeXmlDocBlock(PipelineSection<SyncContext> parent, CancellationTokenSource tokenSource, ILogger logger,
         IRubberduckDbService content,
         IRepository<InspectionEntity> inspections,
         IRepository<QuickFixEntity> quickfixes,
@@ -334,11 +334,11 @@ public SyncXmldocSection(IPipeline<SyncContext, bool> parent, CancellationTokenS
         PrepareStaging = new PrepareStagingBlock(this, tokenSource, logger);
         SaveStaging = new BulkSaveStagingBlock(this, tokenSource, staging, logger);
         */
-        JustFuckingDoIt = new JustFuckingDoEverything(this, tokenSource, logger, content, inspections, quickfixes, annotations, tagServices, github, mergeService, staging, xmlAnnotationParser, xmlQuickFixParser, xmlInspectionParser);
+        SynchronizeXmlDoc = new SynchronizeXmlDocBlock(this, tokenSource, logger, content, inspections, quickfixes, annotations, tagServices, github, mergeService, staging, xmlAnnotationParser, xmlQuickFixParser, xmlInspectionParser);
     }
 
     #region blocks
-    private JustFuckingDoEverything JustFuckingDoIt { get; }
+    private SynchronizeXmlDocBlock SynchronizeXmlDoc { get; }
     /*
     private ReceiveRequestBlock ReceiveRequest { get; }
     private BroadcastParametersBlock BroadcastParameters { get; }
@@ -384,8 +384,8 @@ public SyncXmldocSection(IPipeline<SyncContext, bool> parent, CancellationTokenS
     private PrepareStagingBlock PrepareStaging { get; }
     private BulkSaveStagingBlock SaveStaging { get; }
     */
-    public ITargetBlock<XmldocSyncRequestParameters> InputBlock => JustFuckingDoIt.Block;
-    public IDataflowBlock OutputBlock => JustFuckingDoIt.Block;
+    public ITargetBlock<XmldocSyncRequestParameters> InputBlock => SynchronizeXmlDoc.Block;
+    public IDataflowBlock OutputBlock => SynchronizeXmlDoc.Block;
 
     protected override IReadOnlyDictionary<string, IDataflowBlock> Blocks => new Dictionary<string, IDataflowBlock>
     {
@@ -435,7 +435,7 @@ public SyncXmldocSection(IPipeline<SyncContext, bool> parent, CancellationTokenS
         [nameof(PrepareStaging)] = PrepareStaging.Block,
         [nameof(SaveStaging)] = SaveStaging.Block,
         */
-        [nameof(JustFuckingDoIt)] = JustFuckingDoIt.Block,
+        [nameof(SynchronizeXmlDoc)] = SynchronizeXmlDoc.Block,
     };
     #endregion
 
@@ -487,6 +487,6 @@ public override void CreateBlocks()
         PrepareStaging.CreateBlock(JoinStagingSources);
         SaveStaging.CreateBlock(PrepareStaging);
         */
-        JustFuckingDoIt.CreateBlock();
+        SynchronizeXmlDoc.CreateBlock();
     }
 }

rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocAnnotationParser.cs

@@ -111,6 +111,9 @@ private IEnumerable<AnnotationExample> ParseExamples(XElement node)
                     */
                     before = example.Elements(XmlDocSchema.Annotation.Example.Before.ElementName)
                         .Select((e, i) => ExtractCodeModule(e.Element(XmlDocSchema.Annotation.Example.Before.Module.ElementName)!, i, "(code pane)"));
+
+                    after = example.Elements(XmlDocSchema.Annotation.Example.After.ElementName)
+                        .Select((e, i) => ExtractCodeModule(e.Element(XmlDocSchema.Annotation.Example.Before.Module.ElementName)!, i, "(exported code)"));
                 }
 
                 if (before.Any() && (after?.Any() ?? false))

rubberduckvba.Server/Data/AnnotationsRepository.cs

@@ -61,6 +61,7 @@ INSERT INTO [dbo].[Annotations] (
 UPDATE [dbo].[Annotations]
 SET [DateTimeUpdated]=GETDATE(),
     [TagAssetId]=@tagAssetId,
+    [SourceUrl]=@sourceUrl,
     [Summary]=@summary,
     [Remarks]=@remarks,
     [JsonParameters]=@jsonParameters,

rubberduckvba.Server/Data/InspectionsRepository.cs

@@ -76,6 +76,7 @@ INSERT INTO [dbo].[Inspections] (
 UPDATE [dbo].[Inspections]
 SET [DateTimeUpdated]=GETDATE(),
     [TagAssetId]=@tagAssetId,
+    [SourceUrl]=@sourceUrl,
     [InspectionType]=@inspectionType,
     [DefaultSeverity]=@defaultSeverity,
     [Summary]=@summary,

rubberduckvba.Server/Data/QuickFixRepository.cs

@@ -73,6 +73,7 @@ INSERT INTO [dbo].[QuickFixes] (
 UPDATE [dbo].[QuickFixes]
 SET [DateTimeUpdated]=GETDATE(),
     [TagAssetId]=@tagAssetId,
+    [SourceUrl]=@sourceUrl,
     [Summary]=@summary,
     [Remarks]=@remarks,
     [CanFixMultiple]=@canFixMultiple,