smorg-rb 7.1.1 → 7.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c450da4a626c5f983cd9b487e0e42714ad674003f3b779e99716ce9237268df9
-  data.tar.gz: e21ef620c696b6cd36b4fd8bd0c7619cb788992f1a3685ca3e01e8c578633412
+  metadata.gz: 12f587107d9a170feee761ed0191d98959c214d4507ea7d7212256947760ccea
+  data.tar.gz: deb44e4aaa799376879ec3d0f1183a55707529f5ac01420344733e6836e0c9ad
 SHA512:
-  metadata.gz: befc7f7bd499c36ebfeaa1b04aea6fe1672db736a2a40081b759ccdedc364427c22088112e5d0849b395da1f21cf406e6c73f0aaa2d4a4730fcecdc1ed7169dc
-  data.tar.gz: 8f3c51cd057fef2dadb1553c29b7eff34587afcd105bcdde4c78332baff7ac6b9c90f8ecb5b2313b48a7fd5943696130e4560eae497dc66dd15beba0766c5b14
+  metadata.gz: a0b5b8de7fad58ef0489c375fd2010f32f2031a25363c1ee28ee0a77a0827cf87d2852212cd57f91a4bd552b04ce001297fd4a67defe770b2481528a1f4c534d
+  data.tar.gz: 448d2f9ad40cb86205f60f9d00e938b001c0595d6d12f654a51fab5cd02aabd07c75d2ad4412d50a69bc9a604fa5dd6f57a7d73e48dae7283d9183edc6fa204c

data/README.md

@@ -45,7 +45,7 @@ I've summarized my thoughts in [this blog post](https://dev.to/galtzo/hostile-ta
 
 ### Compatibility
 
-Compatible with MRI Ruby 4.0.0+, and concordant releases of JRuby, and TruffleRuby.
+Compatible with MRI Ruby 4.0.0+, JRuby, and TruffleRuby.
 CI workflows and Appraisals are generated for MRI Ruby 4.0.0+.
 This test floor is configured by `ruby.test_minimum` in `.kettle-jem.yml` and
 may be higher than the gem's runtime compatibility floor when legacy Rubies are
@@ -108,20 +108,12 @@ See [SECURITY.md][🔐security].
 ## 🤝 Contributing
 
 If you need some ideas of where to help, you could work on adding more code coverage,
-or if it is already 💯 (see [below](#code-coverage)) check [issues][🤝gh-issues] or [PRs][🤝gh-pulls],
-or use the gem and think about how it could be better.
+check [issues][🤝gh-issues] or [PRs][🤝gh-pulls], or use the gem and think about how it could be better.
 
 We [![Keep A Changelog][📗keep-changelog-img]][📗keep-changelog] so if you make changes, remember to update it.
 
 See [CONTRIBUTING.md][🤝contributing] for more detailed instructions.
 
-### Code Coverage
-
-<details markdown="1">
-<summary>Coverage service badges</summary>
-
-</details>
-
 ## 📌 Versioning
 
 This library follows [![Semantic Versioning 2.0.0][📌semver-img]][📌semver] for its public API where practical.
@@ -261,7 +253,7 @@ If none of the available licenses suit your use case, please [contact us](mailto
 [📌gitmoji]: https://gitmoji.dev
 [📌gitmoji-img]: https://img.shields.io/badge/gitmoji_commits-%20%F0%9F%98%9C%20%F0%9F%98%8D-34495e.svg?style=flat-square
 [🧮kloc]: https://www.youtube.com/watch?v=dQw4w9WgXcQ
-[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.494-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.460-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/SECURITY.md
 [🔐security-img]: https://img.shields.io/badge/security-policy-259D6C.svg?style=flat
 [📄copyright-notice-explainer]: https://opensource.stackexchange.com/questions/5778/why-do-licenses-such-as-the-mit-license-specify-a-single-year

data/lib/smorg/rb/version.rb

@@ -5,7 +5,7 @@ module Smorg
     # Version namespace for this gem.
     module Version
       # Current gem version.
-      VERSION = '7.1.1'
+      VERSION = '7.1.4'
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

data/lib/smorg/rb.rb

@@ -1,21 +1,29 @@
 # frozen_string_literal: true
 
 require 'English'
+require 'bash/merge'
 require 'go-merge'
+require 'html/merge'
 require 'ast/merge'
 require 'ast-merge-git'
 require 'diff/lcs'
 require 'diff/lcs/hunk'
+require 'dotenv/merge'
 require 'json'
 require 'json-merge'
 require 'kettle/jem'
 require 'kettle/jem/tasks/install_task'
-require 'markly/merge'
+require 'markdown/merge'
 require 'plain-merge'
+require 'rbs/merge'
+require 'toml/merge'
+require 'typescript/merge'
+require 'prism/merge'
+require 'psych/merge'
 require_relative 'rb/version'
 
 module Smorg
-  module RB
+  module RB # rubocop:disable Metrics/ModuleLength
     EXIT_SUCCESS = 0
     EXIT_UNRESOLVED_CONFLICT = 1
     EXIT_USER_ERROR = 2
@@ -438,7 +446,8 @@ module Smorg
         path_name: path_name,
         ok: ok,
         exit_code: exit_code,
-        fallbacks: fallbacks,
+        fallbacks: result.fetch(:fallbacks, []) + fallbacks,
+        conflicts: result.fetch(:conflicts, []),
         change_classifications: result.fetch(:change_classifications, []),
         owned_regions: result.fetch(:owned_regions, []),
         render_report: result[:render_report],
@@ -447,6 +456,8 @@ module Smorg
         secondary_formatting_metrics: result[:secondary_formatting_metrics],
         default_driver_evaluation: result[:default_driver_evaluation],
         profile: result[:profile],
+        provider: result[:provider],
+        verification: result[:verification],
         diagnostics: result.fetch(:diagnostics, [])
       }
       File.write(report_path, "#{JSON.pretty_generate(Ast::Merge.json_ready(report))}\n")
@@ -632,164 +643,100 @@ module Smorg
       end
 
       [
+        '*.bash merge=smorg-rb diff=smorg-rb smorg.language=bash',
         '*.go merge=smorg-rb diff=smorg-rb smorg.language=go',
+        '*.htm merge=smorg-rb diff=smorg-rb smorg.language=html',
+        '*.html merge=smorg-rb diff=smorg-rb smorg.language=html',
+        '*.env merge=smorg-rb diff=smorg-rb smorg.language=dotenv',
+        '.env merge=smorg-rb diff=smorg-rb smorg.language=dotenv',
+        '.env.* merge=smorg-rb diff=smorg-rb smorg.language=dotenv',
         '*.json merge=smorg-rb diff=smorg-rb smorg.language=json',
         '*.jsonc merge=smorg-rb diff=smorg-rb smorg.language=jsonc',
         '*.json5 merge=smorg-rb diff=smorg-rb smorg.language=json5',
         '*.md merge=smorg-rb diff=smorg-rb smorg.language=markdown',
-        '*.markdown merge=smorg-rb diff=smorg-rb smorg.language=markdown'
+        '*.markdown merge=smorg-rb diff=smorg-rb smorg.language=markdown',
+        '*.rb merge=smorg-rb diff=smorg-rb smorg.language=ruby',
+        '*.rbs merge=smorg-rb diff=smorg-rb smorg.language=rbs',
+        '*.rs merge=smorg-rb diff=smorg-rb smorg.language=rust',
+        '*.sh merge=smorg-rb diff=smorg-rb smorg.language=bash',
+        '*.toml merge=smorg-rb diff=smorg-rb smorg.language=toml',
+        '*.ts merge=smorg-rb diff=smorg-rb smorg.language=typescript',
+        '*.tsx merge=smorg-rb diff=smorg-rb smorg.language=tsx',
+        '*.yml merge=smorg-rb diff=smorg-rb smorg.language=yaml',
+        '*.yaml merge=smorg-rb diff=smorg-rb smorg.language=yaml'
       ].each { |line| stdout.puts(line) }
       EXIT_SUCCESS
     end
 
+    MERGE_PROVIDER_OPTIONS = {
+      'bash' => {
+        provider_id: 'ruby.bash', family: 'bash', dialect: 'bash', backend: 'kreuzberg-language-pack'
+      },
+      'go' => {
+        provider_id: 'ruby.go', family: 'go', dialect: 'go', backend: 'kreuzberg-language-pack'
+      },
+      'html' => {
+        provider_id: 'ruby.html', family: 'html', dialect: 'html', backend: 'kreuzberg-language-pack'
+      },
+      'dotenv' => { family: 'dotenv', dialect: 'dotenv', backend: 'dotenv-line' },
+      'json' => { family: 'json', dialect: 'json' },
+      'jsonc' => { family: 'json', dialect: 'jsonc' },
+      'json5' => { family: 'json', dialect: 'json5' },
+      'markdown' => {
+        provider_id: 'ruby.markdown', family: 'markdown', dialect: 'markdown', backend: 'kreuzberg-language-pack'
+      },
+      'ruby' => { family: 'ruby', dialect: 'ruby', backend: 'prism' },
+      'rbs' => { provider_id: 'ruby.rbs', family: 'rbs', dialect: 'rbs', backend: 'rbs' },
+      'rust' => {
+        provider_id: 'ruby.rust', family: 'rust', dialect: 'rust', backend: 'kreuzberg-language-pack'
+      },
+      'toml' => {
+        provider_id: 'ruby.toml', family: 'toml', dialect: 'toml', backend: 'kreuzberg-language-pack'
+      },
+      'typescript' => {
+        provider_id: 'ruby.typescript', family: 'typescript', dialect: 'typescript',
+        backend: 'kreuzberg-language-pack'
+      },
+      'tsx' => {
+        provider_id: 'ruby.typescript', family: 'typescript', dialect: 'tsx', backend: 'kreuzberg-language-pack'
+      },
+      'yaml' => { provider_id: 'ruby.yaml.psych', family: 'yaml', dialect: 'yaml', backend: 'psych' },
+      'text' => { family: 'text', dialect: 'text', profile_id: 'coarse_document' }
+    }.freeze
+
     def merge_by_path(path_name, language, conflict_marker_size, fallback_policy, ancestor_source, current_source,
                       other_source)
-      case normalize_language(language, path_name)
-      when 'go'
-        Go::Merge.merge_go(other_source, current_source, 'go')
-      when 'json'
-        merge3_result(
-          Ast::Merge::Git.merge3(
-            base_source: ancestor_source,
-            ours_source: current_source,
-            theirs_source: other_source,
-            path_name: path_name,
-            language: 'json',
-            dialect: 'json',
-            profile_id: 'json.keyed-object',
-            fallback_policy: fallback_policy,
-            conflict_marker_size: conflict_marker_size,
-            render_policy: 'canonical'
-          )
-        )
-      when 'jsonc'
-        Json::Merge.merge_json(other_source, current_source, 'jsonc')
-      when 'json5'
-        Json::Merge.merge_json(other_source, current_source, 'json5')
-      when 'markdown'
-        merge_markdown(ancestor_source, current_source, other_source)
-      when 'text'
-        Plain::Merge.merge_text(other_source, current_source)
-      else
-        unsupported_language_result(normalize_language(language, path_name), path_name)
-      end
-    end
+      normalized_language = normalize_language(language, path_name)
+      provider_options = MERGE_PROVIDER_OPTIONS[normalized_language]
+      return unsupported_language_result(normalized_language, path_name) unless provider_options
 
-    def merge_markdown(ancestor_source, current_source, other_source)
-      return { ok: true, diagnostics: [], output: current_source, policies: [] } if other_source == ancestor_source
-      return { ok: true, diagnostics: [], output: other_source, policies: [] } if current_source == ancestor_source
-      if markdown_theirs_changes_already_present?(ancestor_source, current_source, other_source)
-        return { ok: true, diagnostics: [], output: current_source, policies: [] }
-      end
+      merge_with_provider(
+        path_name, provider_options,
+        merge_options_for(ancestor_source, current_source, other_source, fallback_policy, conflict_marker_size)
+      )
+    end
 
-      result = Markly::Merge::SmartMerger.new(
-        other_source,
-        current_source,
-        add_template_only_nodes: true,
-        inner_merge_code_blocks: true,
-        inner_merge_lists: true,
-        normalize_whitespace: :basic
-      ).merge_result
-      {
-        ok: result.success?,
-        diagnostics: result.conflicts.map do |conflict|
-          {
-            severity: 'error',
-            category: 'merge_conflict',
-            message: conflict[:message] || conflict[:reason] || 'unresolved Markdown conflict'
-          }
-        end,
-        output: result.content,
-        policies: []
-      }
-    rescue Markdown::Merge::ParseError => e
-      {
-        ok: false,
-        diagnostics: [{ severity: 'error', category: 'parse_error', message: e.message }],
-        policies: []
-      }
-    rescue StandardError => e
+    def merge_options_for(ancestor_source, current_source, other_source, fallback_policy, conflict_marker_size)
       {
-        ok: false,
-        diagnostics: [{ severity: 'error', category: 'merge_error', message: e.message }],
-        policies: []
+        base_source: ancestor_source,
+        ours_source: current_source,
+        theirs_source: other_source,
+        fallback_policy: fallback_policy,
+        conflict_marker_size: conflict_marker_size
       }
     end
 
-    def markdown_theirs_changes_already_present?(ancestor_source, current_source, other_source)
-      ancestor_sections = markdown_sections(ancestor_source)
-      current_sections = markdown_sections(current_source)
-      other_sections = markdown_sections(other_source)
-      return false unless ancestor_sections && current_sections && other_sections
-
-      ancestor_by_path = sections_by_path(ancestor_sections)
-      ancestor_by_heading = sections_by_heading(ancestor_sections)
-      current_by_path = sections_by_path(current_sections)
-      current_by_heading = sections_by_heading(current_sections)
-
-      changed_sections = other_sections.filter do |section|
-        ancestor_text = ancestor_by_path[section[:path]] || ancestor_by_heading[markdown_heading_key(section[:text])]
-        ancestor_text != section[:text]
-      end
-      return false if changed_sections.empty?
-
-      changed_sections.all? do |section|
-        other_text = section[:text]
-        heading_key = markdown_heading_key(other_text)
-        ancestor_text = ancestor_by_heading[heading_key] || ancestor_by_path.fetch(section[:path], '')
-        current_text = current_by_heading[heading_key] || current_by_path[section[:path]]
-        next false unless current_text
-
-        introduced_tokens = markdown_significant_tokens(other_text) - markdown_significant_tokens(ancestor_text)
-        !introduced_tokens.empty? && introduced_tokens.subset?(markdown_significant_tokens(current_text))
-      end
-    end
-
-    def markdown_sections(source)
-      parsed = Markly::Merge.parse_markdown(source, 'markdown')
-      return nil unless parsed[:ok]
-
-      Markdown::Merge.collect_markdown_sections(
-        parsed.dig(:analysis, :normalized_source),
-        parsed.dig(:analysis, :owners)
+    def merge_with_provider(path_name, provider_options, merge_options)
+      merge3_result(
+        Ast::Merge::Git.merge3(
+          **merge_options,
+          path_name: path_name,
+          profile_id: provider_options.fetch(:profile_id, 'source_preserving'),
+          **provider_options.except(:profile_id)
+        )
       )
     end
 
-    def sections_by_path(sections)
-      sections.to_h { |section| [section[:path], section[:text]] }
-    end
-
-    def sections_by_heading(sections)
-      sections.each_with_object({}) do |section, map|
-        key = markdown_heading_key(section[:text])
-        map[key] ||= section[:text] unless key.empty?
-      end
-    end
-
-    def markdown_heading_key(section_text)
-      heading = section_text.each_line.find { |line| line.start_with?('#') }.to_s.strip
-      heading = heading.delete_prefix('#').strip while heading.start_with?('#')
-      heading.downcase
-    end
-
-    def markdown_significant_tokens(source)
-      source.split.each_with_object(Set.new) do |raw_token, tokens|
-        token = normalize_markdown_token(raw_token)
-        tokens << token if token.length >= 8
-      end
-    end
-
-    def normalize_markdown_token(raw_token)
-      token = raw_token.downcase
-      loop do
-        previous = token
-        token = token.delete_prefix('(').delete_prefix('[').delete_prefix('{').delete_prefix('<')
-        token = token.delete_suffix(')').delete_suffix(']').delete_suffix('}').delete_suffix('>')
-        token = token.delete_suffix('.').delete_suffix(',').delete_suffix(';').delete_suffix(':')
-        return token if token == previous
-      end
-    end
-
     def unsupported_language_result(language, path_name)
       {
         ok: false,
@@ -805,63 +752,69 @@ module Smorg
     end
 
     def merge3_result(result)
-      merge3_report_fields = {
-        change_classifications: result.fetch(:change_classifications, []),
-        reparse_after_render: result[:reparse_after_render],
-        formatting_preservation: result[:formatting_preservation],
-        secondary_formatting_metrics: result[:secondary_formatting_metrics],
-        default_driver_evaluation: result[:default_driver_evaluation]
-      }
       if result[:ok] && result[:merged_source]
-        {
-          ok: true,
-          diagnostics: result.fetch(:diagnostics),
-          output: result.fetch(:merged_source),
-          owned_regions: result.fetch(:owned_regions, []),
-          render_report: result.fetch(:render_report),
-          profile: result.fetch(:profile),
-          policies: [],
-          **merge3_report_fields
-        }
+        return merge3_result_payload(result, true, result.fetch(:merged_source))
       elsif !result[:ok] && result[:conflicted_source]
-        {
-          ok: false,
-          diagnostics: result.fetch(:diagnostics),
-          output: result.fetch(:conflicted_source),
-          owned_regions: result.fetch(:owned_regions, []),
-          render_report: result.fetch(:render_report),
-          profile: result.fetch(:profile),
-          policies: [],
-          **merge3_report_fields
-        }
-      else
-        {
-          ok: false,
-          diagnostics: result.fetch(:diagnostics),
-          owned_regions: result.fetch(:owned_regions, []),
-          render_report: result.fetch(:render_report),
-          profile: result.fetch(:profile),
-          policies: [],
-          **merge3_report_fields
-        }
+        return merge3_result_payload(result, false, result.fetch(:conflicted_source))
       end
+
+      merge3_result_payload(result, false, nil)
+    end
+
+    def merge3_result_payload(result, success, output)
+      payload = {
+        ok: success,
+        diagnostics: result.fetch(:diagnostics),
+        owned_regions: result.fetch(:owned_regions, []),
+        render_report: result.fetch(:render_report),
+        profile: result.fetch(:profile),
+        policies: [],
+        **merge3_report_fields(result)
+      }
+      output ? payload.merge(output: output) : payload
+    end
+
+    def merge3_report_fields(result)
+      {
+        change_classifications: result.fetch(:change_classifications, []),
+        conflicts: result.fetch(:conflicts, []),
+        fallbacks: result.fetch(:fallbacks, []),
+        provider: result.fetch(:provider, {}),
+        verification: result.fetch(:verification, {})
+      }
     end
 
     def normalize_language(language, path_name)
-      case language.to_s.strip.downcase
-      when 'go', 'golang'
-        'go'
-      when 'json'
-        'json'
-      when 'jsonc', 'json with comments'
-        'jsonc'
-      when 'json5'
-        'json5'
-      when 'markdown', 'md', 'gfm', 'text/markdown'
-        'markdown'
-      when 'plain', 'text', 'plaintext', 'text/plain'
-        'text'
-      else
+      normalized_language = language.to_s.strip.downcase
+      return language_from_path(path_name) if normalized_language.empty?
+
+      LANGUAGE_ALIASES.fetch(normalized_language) do
+        Ast::Merge.classify_template_target_path(path_name)[:family]
+      end
+    end
+
+    LANGUAGE_BY_EXTENSION = {
+      '.bash' => 'bash', '.sh' => 'bash', '.go' => 'go', '.htm' => 'html', '.html' => 'html',
+      '.rs' => 'rust', '.ts' => 'typescript', '.tsx' => 'tsx'
+    }.freeze
+
+    LANGUAGE_ALIASES = {
+      'bash' => 'bash', 'sh' => 'bash', 'application/x-sh' => 'bash', 'text/x-shellscript' => 'bash',
+      'go' => 'go', 'golang' => 'go', 'html' => 'html', 'htm' => 'html', 'text/html' => 'html', 'html5' => 'html',
+      'dotenv' => 'dotenv', 'env' => 'dotenv', 'config-env' => 'dotenv', 'json' => 'json', 'jsonc' => 'jsonc',
+      'json with comments' => 'jsonc', 'json5' => 'json5', 'markdown' => 'markdown', 'md' => 'markdown',
+      'gfm' => 'markdown', 'text/markdown' => 'markdown', 'ruby' => 'ruby', 'rb' => 'ruby',
+      'application/x-ruby' => 'ruby', 'rbs' => 'rbs', 'rust' => 'rust', 'rs' => 'rust',
+      'application/rust' => 'rust', 'text/rust' => 'rust', 'toml' => 'toml', 'application/toml' => 'toml',
+      'typescript' => 'typescript', 'ts' => 'typescript', 'application/typescript' => 'typescript',
+      'text/typescript' => 'typescript', 'tsx' => 'tsx', 'typescriptreact' => 'tsx', 'yaml' => 'yaml',
+      'yml' => 'yaml', 'application/yaml' => 'yaml', 'text/yaml' => 'yaml', 'plain' => 'text', 'text' => 'text',
+      'plaintext' => 'text', 'text/plain' => 'text'
+    }.freeze
+
+    def language_from_path(path_name)
+      extension = File.extname(path_name.to_s).downcase
+      LANGUAGE_BY_EXTENSION.fetch(extension) do
         Ast::Merge.classify_template_target_path(path_name)[:family]
       end
     end
@@ -877,50 +830,63 @@ module Smorg
     end
 
     def attribute_files_for_path(path_name)
-      clean_path = if File.expand_path(path_name,
-                                       Dir.pwd).start_with?(Dir.pwd)
-                     Pathname.new(path_name).cleanpath.to_s
-                   else
-                     path_name
-                   end
+      clean_path = normalized_attribute_path(path_name)
+      return ['.gitattributes'] if root_attribute_path?(clean_path)
+
+      ['.gitattributes', *attribute_directory_paths(File.dirname(clean_path))]
+    end
+
+    def normalized_attribute_path(path_name)
+      expanded_path = File.expand_path(path_name, Dir.pwd)
+      return Pathname.new(path_name).cleanpath.to_s if expanded_path.start_with?(Dir.pwd)
+
+      path_name
+    end
+
+    def root_attribute_path?(clean_path)
       dir = File.dirname(clean_path)
-      return ['.gitattributes'] if dir == '.' || clean_path.start_with?('..') || Pathname.new(clean_path).absolute?
+      dir == '.' || clean_path.start_with?('..') || Pathname.new(clean_path).absolute?
+    end
 
-      files = ['.gitattributes']
+    def attribute_directory_paths(dir)
       parts = dir.split(File::SEPARATOR).reject(&:empty?)
-      parts.each_index do |index|
-        files << File.join(*parts[0..index], '.gitattributes')
+      parts.each_index.map do |index|
+        File.join(*parts[0..index], '.gitattributes')
       end
-      files
     end
 
     def apply_attributes(settings, path_name, source)
       source.each_line do |raw_line|
-        line = raw_line.strip
-        next if line.empty? || line.start_with?('#')
-
-        pattern, *fields = line.split(/\s+/)
-        next if fields.empty? || !attribute_pattern_matches?(pattern, path_name)
-
-        fields.each do |field|
-          key, value = field.split('=', 2)
-          next unless value
-
-          case key
-          when 'smorg.language', 'linguist-language'
-            settings[:language] = value
-          when 'smorg.profile'
-            settings[:profile_id] = value
-          when 'smorg.requireProfileStatus'
-            settings[:require_profile_status] = value
-          when 'conflict-marker-size'
-            marker_size = value.to_i
-            settings[:conflict_marker_size] = marker_size if marker_size.positive?
-          end
-        end
+        attribute_fields(raw_line, path_name).each { |field| apply_attribute_field(settings, field) }
       end
     end
 
+    def attribute_fields(raw_line, path_name)
+      line = raw_line.strip
+      return [] if line.empty? || line.start_with?('#')
+
+      pattern, *fields = line.split(/\s+/)
+      return [] if fields.empty? || !attribute_pattern_matches?(pattern, path_name)
+
+      fields
+    end
+
+    ATTRIBUTE_KEYS = {
+      'smorg.language' => :language,
+      'linguist-language' => :language,
+      'smorg.profile' => :profile_id,
+      'smorg.requireProfileStatus' => :require_profile_status
+    }.freeze
+
+    def apply_attribute_field(settings, field)
+      key, value = field.split('=', 2)
+      return unless value
+      return settings[ATTRIBUTE_KEYS[key]] = value if ATTRIBUTE_KEYS.key?(key)
+
+      marker_size = value.to_i
+      settings[:conflict_marker_size] = marker_size if key == 'conflict-marker-size' && marker_size.positive?
+    end
+
     def attribute_pattern_matches?(pattern, path_name)
       return true if pattern == path_name
 
@@ -932,26 +898,33 @@ module Smorg
     end
 
     def find_conflict_regions(source, marker_size)
-      marker_size = [marker_size.to_i, 1].max
-      start_prefix = '<' * marker_size
-      separator_prefix = '=' * marker_size
-      end_prefix = '>' * marker_size
+      prefixes = conflict_marker_prefixes(marker_size)
       regions = []
       current = nil
       source.split("\n").each_with_index do |line, index|
-        line_number = index + 1
-        if line.start_with?(start_prefix)
-          current = { start_line: line_number, separator_line: 0 }
-        elsif current && current[:separator_line].zero? && line.start_with?(separator_prefix)
-          current[:separator_line] = line_number
-        elsif current && line.start_with?(end_prefix)
-          regions << current.merge(end_line: line_number)
-          current = nil
-        end
+        current, completed = conflict_region_state(current, line, index + 1, prefixes)
+        regions << completed if completed
       end
       regions
     end
 
+    def conflict_marker_prefixes(marker_size)
+      size = [marker_size.to_i, 1].max
+      { start: '<' * size, separator: '=' * size, end: '>' * size }
+    end
+
+    def conflict_region_state(current, line, line_number, prefixes)
+      if line.start_with?(prefixes[:start])
+        [{ start_line: line_number, separator_line: 0 }, nil]
+      elsif current && current[:separator_line].zero? && line.start_with?(prefixes[:separator])
+        [current.merge(separator_line: line_number), nil]
+      elsif current && line.start_with?(prefixes[:end])
+        [nil, current.merge(end_line: line_number)]
+      else
+        [current, nil]
+      end
+    end
+
     def print_conflict_diff(stdout, path_name, regions)
       stdout.puts("conflicts #{path_name}")
       stdout.puts("count #{regions.length}")
@@ -971,5 +944,7 @@ module Smorg
         stderr.puts("#{diagnostic[:category]}: #{diagnostic[:message]}")
       end
     end
-  end
+  end # rubocop:enable Metrics/ModuleLength
 end
+
+require 'rust/merge'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smorg-rb
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.1.4
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,28 +43,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
   name: ast-merge-git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
+- !ruby/object:Gem::Dependency
+  name: bash-merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -79,76 +93,194 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: dotenv-merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
   name: go-merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
+- !ruby/object:Gem::Dependency
+  name: html-merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
   name: json-merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
   name: kettle-jem
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.5
+- !ruby/object:Gem::Dependency
+  name: markdown-merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
-  name: markly-merge
+  name: plain-merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
-  name: plain-merge
+  name: prism-merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.4
+- !ruby/object:Gem::Dependency
+  name: psych-merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.4
+- !ruby/object:Gem::Dependency
+  name: rbs-merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.4
+- !ruby/object:Gem::Dependency
+  name: rust-merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.4
+- !ruby/object:Gem::Dependency
+  name: toml-merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.4
+- !ruby/object:Gem::Dependency
+  name: typescript-merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -175,20 +307,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.17
+        version: 3.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.17
+        version: 3.0.7
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -266,7 +398,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -276,7 +408,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: kettle-test
   requirement: !ruby/object:Gem::Requirement
@@ -286,7 +418,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.19
+        version: 2.0.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -296,7 +428,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.19
+        version: 2.0.20
 - !ruby/object:Gem::Dependency
   name: turbo_tests2
   requirement: !ruby/object:Gem::Requirement
@@ -306,7 +438,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: 3.2.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -316,7 +448,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: 3.2.6
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -360,7 +492,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.11
+        version: 2.0.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -370,7 +502,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.11
+        version: 2.0.12
 description: "\U0001F48E Git-compatible StructuredMerge command surface for the Ruby
   implementation."
 email:
@@ -393,10 +525,10 @@ licenses:
 - PolyForm-Small-Business-1.0.0
 metadata:
   homepage_uri: https://structuredmerge.org
-  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.1
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.1/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.4
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.4/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/smorg-rb/7.1.1
+  documentation_uri: https://www.rubydoc.info/gems/smorg-rb/7.1.4
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   news_uri: https://www.railsbling.com/tags/smorg-rb