diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/SyncXmldocSection.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/SyncXmldocSection.cs index 2bd7421..c2719f1 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/SyncXmldocSection.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/SyncXmldocSection.cs @@ -29,10 +29,10 @@ public SynchronizeXmlDocSection(IPipeline 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 Blocks => new Dictionary { @@ -45,7 +45,7 @@ public override void CreateBlocks() } } -public class JustFuckingDoEverything : ActionBlockBase +public class SynchronizeXmlDocBlock : ActionBlockBase { private readonly IRubberduckDbService _content; private readonly IRepository _inspections; @@ -59,7 +59,7 @@ public class JustFuckingDoEverything : ActionBlockBase parent, CancellationTokenSource tokenSource, ILogger logger, + public SynchronizeXmlDocBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger, IRubberduckDbService content, IRepository inspections, IRepository quickfixes, @@ -334,11 +334,11 @@ public SyncXmldocSection(IPipeline 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 parent, CancellationTokenS private PrepareStagingBlock PrepareStaging { get; } private BulkSaveStagingBlock SaveStaging { get; } */ - public ITargetBlock InputBlock => JustFuckingDoIt.Block; - public IDataflowBlock OutputBlock => JustFuckingDoIt.Block; + public ITargetBlock InputBlock => SynchronizeXmlDoc.Block; + public IDataflowBlock OutputBlock => SynchronizeXmlDoc.Block; protected override IReadOnlyDictionary Blocks => new Dictionary { @@ -435,7 +435,7 @@ public SyncXmldocSection(IPipeline 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(); } } diff --git a/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocAnnotationParser.cs b/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocAnnotationParser.cs index 4939b99..bb80571 100644 --- a/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocAnnotationParser.cs +++ b/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocAnnotationParser.cs @@ -111,6 +111,9 @@ private IEnumerable 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)) diff --git a/rubberduckvba.Server/Data/AnnotationsRepository.cs b/rubberduckvba.Server/Data/AnnotationsRepository.cs index 96374cb..c4a603c 100644 --- a/rubberduckvba.Server/Data/AnnotationsRepository.cs +++ b/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, diff --git a/rubberduckvba.Server/Data/InspectionsRepository.cs b/rubberduckvba.Server/Data/InspectionsRepository.cs index c069ec4..ddc3e6a 100644 --- a/rubberduckvba.Server/Data/InspectionsRepository.cs +++ b/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, diff --git a/rubberduckvba.Server/Data/QuickFixRepository.cs b/rubberduckvba.Server/Data/QuickFixRepository.cs index 00b148c..b99c08d 100644 --- a/rubberduckvba.Server/Data/QuickFixRepository.cs +++ b/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,