coplan-engine 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7978a493f24f0424cd5a4170890ff0e41e27dc10e9b7dfff2de3e456df2a5c56
-  data.tar.gz: 541671d9b00b2d10ddae7269c78074db1eb025a75b94d05654a529a1809668c7
+  metadata.gz: 129983ca7890cb3869a1c594ebde86720d3ba80e14861b9ad613c3311eec30b0
+  data.tar.gz: 93ee7fa05f6f3676bc414a9f9794a3a04c80cee7181efcab89d484816f72cd79
 SHA512:
-  metadata.gz: 5b670e1689fc107975f40915ae5cd3b9ee509863a7b3f690b399710d3220308834d5043af9e1dec61f993bbc5759e134f5364aa43c9b3e66503612fb9d7138d0
-  data.tar.gz: 8cf385dcdbf1309395113203c186f7813e0ec51518e49ea0f7a3120075ce7b4b07453555cfd576db3c279fe415e7157e7cc756407d6297467018ffd52d199cae
+  metadata.gz: 291848526406f7b918dd2cf86e161ccec3e85eecf73277325af84fb320ea78b4fd64c260c0f539ba6bf0e59b747906c2d173fdf39c1920c72522537ae62fe0ae
+  data.tar.gz: 8f5af631ce15ede7498305751f51a89dfc71136448196a959e4aa3223e5c00fde1955645aefa507db117f72269d8ab256d7bad1053c56cb34a218b509e9cd6e6

data/app/controllers/coplan/comment_threads_controller.rb

@@ -12,6 +12,7 @@ module CoPlan
         plan_version: @plan.current_plan_version,
         anchor_text: params[:comment_thread][:anchor_text].presence,
         anchor_context: params[:comment_thread][:anchor_context].presence,
+        anchor_occurrence: params[:comment_thread][:anchor_occurrence].presence&.to_i,
         start_line: params[:comment_thread][:start_line].presence,
         end_line: params[:comment_thread][:end_line].presence,
         created_by_user: current_user

data/app/javascript/controllers/coplan/text_selection_controller.js

@@ -1,7 +1,7 @@
 import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
-  static targets = ["content", "popover", "form", "anchorInput", "contextInput", "anchorPreview", "anchorQuote"]
+  static targets = ["content", "popover", "form", "anchorInput", "contextInput", "occurrenceInput", "anchorPreview", "anchorQuote"]
   static values = { planId: String }
 
   connect() {
@@ -48,6 +48,7 @@ export default class extends Controller {
 
     this.selectedText = text
     this.selectedContext = this.extractContext(range, text)
+    this.selectedOccurrence = this.computeOccurrence(range, text)
 
     // Position popover near the selection
     const rect = range.getBoundingClientRect()
@@ -62,9 +63,10 @@ export default class extends Controller {
     event.preventDefault()
     if (!this.selectedText) return
 
-    // Set the anchor text and surrounding context
+    // Set the anchor text, surrounding context, and occurrence index
     this.anchorInputTarget.value = this.selectedText
     this.contextInputTarget.value = this.selectedContext || ""
+    this.occurrenceInputTarget.value = this.selectedOccurrence != null ? this.selectedOccurrence : ""
     this.anchorQuoteTarget.textContent = this.selectedText.length > 120
       ? this.selectedText.substring(0, 120) + "…"
       : this.selectedText
@@ -114,11 +116,13 @@ export default class extends Controller {
     this.formTarget.style.display = "none"
     this.anchorInputTarget.value = ""
     this.contextInputTarget.value = ""
+    this.occurrenceInputTarget.value = ""
     this.anchorPreviewTarget.style.display = "none"
     const textarea = this.formTarget.querySelector("textarea")
     if (textarea) textarea.value = ""
     this.selectedText = null
     this.selectedContext = null
+    this.selectedOccurrence = null
   }
 
   scrollToAnchor(event) {
@@ -126,16 +130,18 @@ export default class extends Controller {
     if (!anchor) return
 
     const context = event.currentTarget.closest("[data-anchor-context]")?.dataset.anchorContext || ""
+    const occurrence = event.currentTarget.dataset.anchorOccurrence
 
     // Remove existing highlights first
     this.contentTarget.querySelectorAll(".anchor-highlight--active").forEach(el => {
       el.classList.remove("anchor-highlight--active")
     })
 
-    // Find and highlight the anchor text using context for disambiguation
-    const highlighted = context
-      ? this.findAndHighlightWithContext(anchor, context, "anchor-highlight--active")
-      : this.findAndHighlight(anchor, "anchor-highlight--active")
+    // Build full text for position lookups
+    this.fullText = this.contentTarget.textContent
+
+    // Find and highlight using occurrence index (most reliable), then context, then first match
+    const highlighted = this.findAndHighlightForThread(anchor, context, occurrence, "anchor-highlight--active", null)
     if (highlighted) {
       highlighted.scrollIntoView({ behavior: "smooth", block: "center" })
     }
@@ -166,6 +172,21 @@ export default class extends Controller {
     return fullText.slice(start, end)
   }
 
+  // Computes the 1-based occurrence number of the selected text in the DOM content.
+  // This is sent to the server so resolve_anchor_position picks the right match.
+  computeOccurrence(range, text) {
+    const offset = this.getSelectionOffset(range)
+    const fullText = this.contentTarget.textContent
+
+    let count = 0
+    let pos = -1
+    while ((pos = fullText.indexOf(text, pos + 1)) !== -1) {
+      count++
+      if (pos >= offset) return count
+    }
+    return count > 0 ? count : 1
+  }
+
   getSelectionOffset(range) {
     if (!range || !this.contentTarget) return 0
 
@@ -200,8 +221,9 @@ export default class extends Controller {
     threads.forEach(thread => {
       const anchor = thread.dataset.anchorText
       const context = thread.dataset.anchorContext
+      const occurrence = thread.dataset.anchorOccurrence
       if (anchor && anchor.length > 0) {
-        this.findAndHighlightWithContext(anchor, context, "anchor-highlight")
+        this.findAndHighlightForThread(anchor, context, occurrence, "anchor-highlight", thread)
       }
     })
 
@@ -283,6 +305,53 @@ export default class extends Controller {
     })
   }
 
+  // Primary highlight method: uses occurrence index (from server-side OT positions)
+  // to find the correct Nth occurrence of anchor text in the rendered DOM.
+  // Falls back to context matching, then to first occurrence.
+  findAndHighlightForThread(text, context, occurrence, className, threadEl) {
+    const fullText = this.fullText
+    let targetIndex = -1
+
+    // Strategy 1: Use the occurrence index from the server (most reliable)
+    if (occurrence !== undefined && occurrence !== "") {
+      const occurrenceNum = parseInt(occurrence, 10)
+      if (!isNaN(occurrenceNum)) {
+        targetIndex = this.findNthOccurrence(fullText, text, occurrenceNum)
+      }
+    }
+
+    // Strategy 2: Fall back to context matching
+    if (targetIndex === -1 && context && context.length > 0) {
+      const contextIndex = fullText.indexOf(context)
+      if (contextIndex !== -1) {
+        targetIndex = fullText.indexOf(text, contextIndex)
+        if (targetIndex === -1 || targetIndex > contextIndex + context.length) {
+          targetIndex = fullText.indexOf(text)
+        }
+      }
+    }
+
+    // Strategy 3: Fall back to first occurrence
+    if (targetIndex === -1) {
+      targetIndex = fullText.indexOf(text)
+    }
+
+    if (targetIndex === -1) return null
+
+    const mark = this.highlightAtIndex(targetIndex, text.length, className)
+    if (mark && threadEl) threadEl._highlightMark = mark
+    return mark
+  }
+
+  findNthOccurrence(text, search, n) {
+    let pos = -1
+    for (let i = 0; i <= n; i++) {
+      pos = text.indexOf(search, pos + 1)
+      if (pos === -1) return -1
+    }
+    return pos
+  }
+
   findAndHighlightWithContext(text, context, className) {
     // Use context to find the right occurrence of the anchor text
     const fullText = this.fullText

data/app/models/coplan/comment_thread.rb

@@ -106,6 +106,25 @@ module CoPlan
       !out_of_date
     end
 
+    # Returns the 0-based occurrence index of anchor_text in the raw markdown,
+    # computed from anchor_start. The frontend uses this to find the correct
+    # occurrence in the rendered DOM text instead of relying on context matching.
+    def anchor_occurrence_index
+      return nil unless anchored? && anchor_start.present?
+
+      content = plan.current_content
+      return nil unless content.present?
+
+      count = 0
+      pos = 0
+      while (idx = content.index(anchor_text, pos))
+        break if idx >= anchor_start
+        count += 1
+        pos = idx + 1
+      end
+      count
+    end
+
     def anchor_context_with_highlight(chars: 100)
       return nil unless anchored? && anchor_start.present?
 

data/app/views/coplan/comment_threads/_new_comment_form.html.erb

@@ -2,6 +2,7 @@
   <%= form_with url: plan_comment_threads_path(plan), method: :post, data: { action: "turbo:submit-end->coplan--text-selection#resetCommentForm" } do |f| %>
     <input type="hidden" name="comment_thread[anchor_text]" data-coplan--text-selection-target="anchorInput" value="">
     <input type="hidden" name="comment_thread[anchor_context]" data-coplan--text-selection-target="contextInput" value="">
+    <input type="hidden" name="comment_thread[anchor_occurrence]" data-coplan--text-selection-target="occurrenceInput" value="">
     <div class="comment-form__anchor" data-coplan--text-selection-target="anchorPreview" style="display: none;">
       <span class="text-sm text-muted">Commenting on:</span>
       <blockquote class="comment-form__quote" data-coplan--text-selection-target="anchorQuote"></blockquote>

data/app/views/coplan/comment_threads/_thread.html.erb

@@ -1,6 +1,7 @@
 <div class="comment-thread card" id="<%= dom_id(thread) %>"
      data-anchor-text="<%= thread.anchor_text %>"
      data-anchor-context="<%= thread.anchor_context %>"
+     data-anchor-occurrence="<%= thread.anchor_occurrence_index %>"
      data-thread-id="<%= thread.id %>">
   <div class="comment-thread__header">
     <div class="comment-thread__meta">
@@ -10,7 +11,7 @@
       <% end %>
     </div>
     <% if thread.anchored? %>
-      <blockquote class="comment-thread__anchor-quote" data-action="click->coplan--text-selection#scrollToAnchor" data-anchor="<%= thread.anchor_text %>" style="cursor: pointer;"><%= thread.anchor_preview %></blockquote>
+      <blockquote class="comment-thread__anchor-quote" data-action="click->coplan--text-selection#scrollToAnchor" data-anchor="<%= thread.anchor_text %>" data-anchor-occurrence="<%= thread.anchor_occurrence_index %>" style="cursor: pointer;"><%= thread.anchor_preview %></blockquote>
     <% end %>
   </div>
 

data/lib/coplan/version.rb

@@ -1,3 +1,3 @@
 module CoPlan
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coplan-engine
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Block