From 76c83caff561d50ef68ae915b8e0232a4a20d349 Mon Sep 17 00:00:00 2001 From: Miguel Date: Sun, 23 Feb 2025 11:10:00 +0100 Subject: [PATCH] Primera Version Funcionando --- .gitignore | 363 ++++++++++++++++++++ App.xaml | 9 + App.xaml.cs | 13 + AssemblyInfo.cs | 10 + ChangesHighlightingColorizer.cs | 125 +++++++ CodeMerger.csproj | 29 ++ CodeMerger.sln | 25 ++ MainWindow.xaml | 82 +++++ MainWindow.xaml.cs | 38 +++ Models/AppSettings.cs | 30 ++ Models/LogMessage.cs | 25 ++ Test/llm.cs | 11 + Test/merged.cs | 18 + Test/original.cs | 13 + ViewModels/LogViewModel.cs | 46 +++ ViewModels/MainViewModel.cs | 219 ++++++++++++ Views/LogWindow.xaml | 31 ++ Views/LogWindow.xaml.cs | 13 + cCodeMerger.cs | 567 ++++++++++++++++++++++++++++++++ 19 files changed, 1667 insertions(+) create mode 100644 .gitignore create mode 100644 App.xaml create mode 100644 App.xaml.cs create mode 100644 AssemblyInfo.cs create mode 100644 ChangesHighlightingColorizer.cs create mode 100644 CodeMerger.csproj create mode 100644 CodeMerger.sln create mode 100644 MainWindow.xaml create mode 100644 MainWindow.xaml.cs create mode 100644 Models/AppSettings.cs create mode 100644 Models/LogMessage.cs create mode 100644 Test/llm.cs create mode 100644 Test/merged.cs create mode 100644 Test/original.cs create mode 100644 ViewModels/LogViewModel.cs create mode 100644 ViewModels/MainViewModel.cs create mode 100644 Views/LogWindow.xaml create mode 100644 Views/LogWindow.xaml.cs create mode 100644 cCodeMerger.cs diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9491a2f --- /dev/null +++ b/.gitignore @@ -0,0 +1,363 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Oo]ut/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd \ No newline at end of file diff --git a/App.xaml b/App.xaml new file mode 100644 index 0000000..395410e --- /dev/null +++ b/App.xaml @@ -0,0 +1,9 @@ + + + + + diff --git a/App.xaml.cs b/App.xaml.cs new file mode 100644 index 0000000..77df449 --- /dev/null +++ b/App.xaml.cs @@ -0,0 +1,13 @@ +using System.Configuration; +using System.Data; +using System.Windows; + +namespace CodeMerger; + +/// +/// Interaction logic for App.xaml +/// +public partial class App : Application +{ +} + diff --git a/AssemblyInfo.cs b/AssemblyInfo.cs new file mode 100644 index 0000000..cc29e7f --- /dev/null +++ b/AssemblyInfo.cs @@ -0,0 +1,10 @@ +using System.Windows; + +[assembly:ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] diff --git a/ChangesHighlightingColorizer.cs b/ChangesHighlightingColorizer.cs new file mode 100644 index 0000000..88b8f62 --- /dev/null +++ b/ChangesHighlightingColorizer.cs @@ -0,0 +1,125 @@ +using ICSharpCode.AvalonEdit.Rendering; +using System.Windows.Media; +using System; +using System.Windows; +using ICSharpCode.AvalonEdit.Document; + +namespace CodeMerger; + +public class ChangesHighlightingColorizer : IBackgroundRenderer +{ + private static readonly Brush AddedLineBrush = new SolidColorBrush(Color.FromArgb(40, 50, 205, 50)); // Verde más visible + private static readonly Brush ModifiedLineBrush = new SolidColorBrush(Color.FromArgb(40, 255, 215, 0)); // Amarillo más visible + private TextView _textView; + + public KnownLayer Layer => KnownLayer.Background; + + public void SetTextView(TextView textView) + { + if (_textView != null) + _textView.VisualLinesChanged -= TextView_VisualLinesChanged; + + _textView = textView; + _textView.VisualLinesChanged += TextView_VisualLinesChanged; + } + + private void TextView_VisualLinesChanged(object sender, EventArgs e) + { + _textView?.InvalidateLayer(Layer); + } + + public void Draw(TextView textView, DrawingContext drawingContext) + { + if (textView?.Document == null) return; + + bool isInAddedSection = false; + bool isInModifiedSection = false; + int sectionStartDepth = 0; + int currentDepth = 0; + int currentLine = 1; + int totalLines = textView.Document.LineCount; + + while (currentLine <= totalLines) + { + var documentLine = textView.Document.GetLineByNumber(currentLine); + var lineText = textView.Document.GetText(documentLine); + var trimmedText = lineText.Trim(); + + // Actualizar el nivel de anidación + currentDepth += CountOpenBraces(trimmedText) - CountCloseBraces(trimmedText); + + // Detectar inicio de secciones + if (trimmedText.Contains("// Added:") || trimmedText.Contains("// New:")) + { + isInAddedSection = true; + isInModifiedSection = false; + sectionStartDepth = currentDepth; + } + else if (trimmedText.Contains("// Modified:") || trimmedText.Contains("// Changed:")) + { + isInAddedSection = false; + isInModifiedSection = true; + sectionStartDepth = currentDepth; + } + + // Obtener la línea visual + var visualLine = textView.GetOrConstructVisualLine(documentLine); + if (visualLine != null) + { + // Determinar el color basado en el estado actual + Brush brush = null; + if (isInAddedSection) + { + brush = AddedLineBrush; + } + else if (isInModifiedSection) + { + brush = ModifiedLineBrush; + } + + // Si tenemos un color asignado y no es una línea de separador + if (brush != null && !trimmedText.Contains("// ----------------------------------------")) + { + var rect = BackgroundGeometryBuilder.GetRectsFromVisualSegment(textView, visualLine, 0, 1000) + .First(); + + // Dibujar el fondo de la línea completa + drawingContext.DrawRectangle( + brush, + null, + new Rect(0, rect.Top, textView.ActualWidth, rect.Height) + ); + } + } + + // Detectar fin de secciones + // Si volvemos al mismo nivel de anidación donde empezó la sección y encontramos una llave de cierre + if ((isInAddedSection || isInModifiedSection) && + currentDepth <= sectionStartDepth && + trimmedText.Contains("}")) + { + isInAddedSection = false; + isInModifiedSection = false; + } + + // También terminar sección si encontramos un nuevo marcador + if (trimmedText.Contains("// ----------------------------------------")) + { + isInAddedSection = false; + isInModifiedSection = false; + } + + currentLine++; + } + } + + private int CountOpenBraces(string text) + { + return text.Count(c => c == '{'); + } + + private int CountCloseBraces(string text) + { + return text.Count(c => c == '}'); + } +} diff --git a/CodeMerger.csproj b/CodeMerger.csproj new file mode 100644 index 0000000..c87c7d5 --- /dev/null +++ b/CodeMerger.csproj @@ -0,0 +1,29 @@ + + + + WinExe + net9.0-windows + enable + enable + true + + + + + + + + + + + + + + + + + + + + + diff --git a/CodeMerger.sln b/CodeMerger.sln new file mode 100644 index 0000000..1e89e0c --- /dev/null +++ b/CodeMerger.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.13.35806.99 d17.13 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeMerger", "CodeMerger.csproj", "{0D46F18D-F5F1-4BED-B149-0549D1568443}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0D46F18D-F5F1-4BED-B149-0549D1568443}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0D46F18D-F5F1-4BED-B149-0549D1568443}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0D46F18D-F5F1-4BED-B149-0549D1568443}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0D46F18D-F5F1-4BED-B149-0549D1568443}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {4D6D330B-6A32-4A81-8239-E0CC76419FFE} + EndGlobalSection +EndGlobal diff --git a/MainWindow.xaml b/MainWindow.xaml new file mode 100644 index 0000000..6179427 --- /dev/null +++ b/MainWindow.xaml @@ -0,0 +1,82 @@ + + + + + + + + + + +