Merge branch 'main' of https://github.com/NotePlan/plugins

Author: jgclark

helpers/NPParagraph.js

@@ -1831,9 +1831,8 @@ export function removeAllDueDates(filename: string): boolean {
 }
 
 /**
- * WARNING: This was an attempt to work around the issue that .lineIndex in Editor.paragraphs includes frontmatter lines, but in Editor.selectedParagraphs it doesn't.
- * WARNING: However, it doesn't work, as it throws up "Attempted to assign to readonly property" errors.
  * Get the selected paragraphs with the correct line index, taking into account the frontmatter lines.
+ * Note: This attempts to work around the issue that .lineIndex in Editor.paragraphs includes frontmatter lines, but in Editor.selectedParagraphs it doesn't.
  * Note: should really live in editor.js, but putting here to avoid a circular dependency.
  * @author @jgclark
  * 
@@ -1846,11 +1845,13 @@ export function getSelectedParagraphsWithCorrectLineIndex(): Array<TParagraph> {
     return []
   }
   const numberOfFrontmatterLines = endOfFrontmatterLineIndex(note) || 0
+  logDebug('getSelectedParagraphsWithCorrectLineIndex', `numberOfFrontmatterLines: ${String(numberOfFrontmatterLines)}`)
   const selectedParagraphs = Editor.selectedParagraphs.map((p) => Editor.paragraphs[p.lineIndex]) ?? []
+  logDebug('getSelectedParagraphsWithCorrectLineIndex', `Editor.selectedParagraphs:\n${String(Editor.selectedParagraphs.map((p) => `- ${p.lineIndex}: ${p.content}`).join('\n'))}`)
   const correctedSelectedParagraphs: Array<TParagraph> = selectedParagraphs.slice()
   correctedSelectedParagraphs.forEach((p) => {
     // $FlowIgnore[cannot-write]
-    p.lineIndex += numberOfFrontmatterLines
+    p.lineIndex += numberOfFrontmatterLines + 1
   })
 
   logDebug('getSelectedParagraphsWithCorrectLineIndex', `${correctedSelectedParagraphs.length} Corrected selected paragraph(s) with lineIndex taking into account frontmatter lines:\n${String(correctedSelectedParagraphs.map((p) => `- ${p.lineIndex}: ${p.content}`).join('\n'))}`)

helpers/NPVersions.js

@@ -31,6 +31,7 @@ export function usersVersionHas(feature: string): boolean {
     getWeather: '3.19.2', // Nov 2025
     mainSidebarControl: '3.19.2', // Nov 2025
     contentDeduplicator: '3.19.2', // Nov 2025
+    settableLineIndex: '3.19.2', // Nov 2025, build 1440
   }
 
   // Check if the user's version meets the requirement for the requested feature

helpers/NPnote.js

@@ -185,18 +185,36 @@ export async function chooseNoteV2(
 
   // Now show the options to the user
   let noteToReturn = null
+  let selectedNote: ?TNote
+  let selectedText: string
   if (usersVersionHas('decoratedCommandBar')) {
     // logDebug('chooseNoteV2', `Using 3.18.0's advanced options for CommandBar.showOptions call`)
     // use the more advanced options to the `CommandBar.showOptions` call
     const { index } = await CommandBar.showOptions(opts, promptText)
-    noteToReturn = opts[index].text.includes('[New note]') ? await getOrMakeCalendarNote(sortedNoteList[index].title ?? '') : sortedNoteList[index]
+    selectedNote = sortedNoteList[index]
+    selectedText = opts[index].text
   } else {
     // use the basic options for the `CommandBar.showOptions` call. Get this by producing a simple array from the main options array.
     // logDebug('chooseNoteV2', `Using pre-3.18.0's basic options for CommandBar.showOptions call`)
     const simpleOpts = opts.map((opt) => opt.text)
     const { index } = await CommandBar.showOptions(simpleOpts, promptText)
-    noteToReturn = simpleOpts[index].includes('[New note]') ? await getOrMakeCalendarNote(sortedNoteList[index].title ?? '') : sortedNoteList[index]
+    selectedNote = sortedNoteList[index]
+    selectedText = simpleOpts[index]
   }
+  if (selectedText.includes('[New note]')) {
+    // Handle "[New note]" option - create a new regular note
+    // Prompt user for note title
+    const noteTitle = await CommandBar.showInput('Enter title for new note:', 'New note')
+    if (noteTitle && noteTitle !== '') {
+      const newNoteFilename = await DataStore.newNote(noteTitle, '/')
+      if (newNoteFilename) {
+        noteToReturn = await DataStore.noteByFilename(newNoteFilename, 'Notes')
+      }
+    }
+  } else {
+    noteToReturn = selectedNote
+  }
+
   // logDebug('chooseNoteV2', `-> ${noteToReturn ? noteToReturn.filename : '(none)'}`)
   return noteToReturn
 }
@@ -1158,62 +1176,75 @@ export function findNotesMatchingHashtagOrMentionFromList(
  *
  * @param {TNote} note - note to get headings from
  * @param {boolean} includeMarkdown - whether to include markdown markers in the headings
- * @param {boolean} optionAddATopAndtBottom - whether to add 'top of note' and 'bottom of note' options. Default: true.
+ * @param {boolean} optionAddATopAndBottom - whether to add 'top of note' and 'bottom of note' options. Default: true.
  * @param {boolean} optionCreateNewHeading - whether to offer to create a new heading at top or bottom of note. Default: false.
  * @param {boolean} includeArchive - whether to include headings in the Archive section of the note (i.e. after 'Done'). Default: false.
  * @return {Array<string>}
  */
 export function getHeadingsFromNote(
   note: TNote,
   includeMarkdown: boolean = false,
-  optionAddATopAndtBottom: boolean = true,
+  optionAddATopAndBottom: boolean = true,
   optionCreateNewHeading: boolean = false,
   includeArchive: boolean = false,
 ): Array<string> {
-  let headingStrings = []
-  const spacer = '#'
-  let headingParas: Array<TParagraph> = []
-  const indexEndOfActive = findEndOfActivePartOfNote(note)
-  if (includeArchive) {
-    headingParas = note.paragraphs.filter((p) => p.type === 'title' && p.lineIndex < indexEndOfActive)
-  } else {
-    headingParas = note.paragraphs.filter((p) => p.type === 'title')
-  }
+  try {
+    const indexEndOfActive = findEndOfActivePartOfNote(note)
+    const MDHeadingChar = '#'
+    let headingStrings = []
+    let headingParas: Array<TParagraph> = []
+    if (includeArchive) {
+      headingParas = note.paragraphs.filter((p) => p.type === 'title' && p.lineIndex <= indexEndOfActive)
+    } else {
+      headingParas = note.paragraphs.filter((p) => p.type === 'title')
+    }
 
-  // If this is the title line, skip it
-  if (headingParas.length > 0) {
-    if (headingParas[0].content === note.title) {
-      headingParas = headingParas.slice(1)
+    // If this is the title line, skip it
+    if (headingParas.length > 0) {
+      if (headingParas[0].content === note.title) {
+        headingParas = headingParas.slice(1)
+      }
     }
-  }
-  if (headingParas.length > 0) {
-    headingStrings = headingParas.map((p) => {
-      let prefix = ''
-      for (let i = 0; i < p.headingLevel; i++) {
-        prefix += spacer
+    if (headingParas.length > 0) {
+      headingStrings = headingParas.map((p) => {
+        let prefix = ''
+        for (let i = 0; i < p.headingLevel; i++) {
+          prefix += MDHeadingChar
+        }
+        return `${prefix} ${p.content.trimLeft()}`
+      })
+    }
+    if (optionCreateNewHeading) {
+      // Note: The strings here must match the strings in userInput.js::processChosenHeading()
+      if (note.type === 'Calendar') {
+        headingStrings.unshift('➕#️⃣ (first insert new heading at the start of the note)')
+      } else {
+        headingStrings.unshift(`➕#️⃣ (first insert new heading under the title)`)
+      }
+      if (headingParas.length > 0) {
+        headingStrings.push(`➕#️⃣ (first insert new heading at the end of the note)`)
+      } else {
+        logDebug('NPnote/getHeadingsFromNote', `No headings found in note ${note.filename}. So not adding 'insert new heading at the end of the note' option as well as 'first insert new heading...' option.`)
       }
-      return `${prefix} ${p.content.trimLeft()}`
-    })
-  }
-  if (optionCreateNewHeading) {
-    if (note.type === 'Calendar') {
-      headingStrings.unshift('➕#️⃣ (first insert new heading at the start of the note)')
-    } else {
-      headingStrings.unshift(`➕#️⃣ (first insert new heading under the title)`)
     }
-    headingStrings.push(`➕#️⃣ (first insert new heading at the end of the note)`)
-  }
-  if (optionAddATopAndtBottom) {
-    headingStrings.unshift('⏫ (top of note)')
-    headingStrings.push('⏬ (bottom of note)')
-  }
-  if (headingStrings.length === 0) {
-    return ['']
-  }
-  if (!includeMarkdown) {
-    headingStrings = headingStrings.map((h) => h.replace(/^#{1,5}\s*/, '')) // remove any markdown heading markers
+    logDebug('NPnote/getHeadingsFromNote', `After adding 'insert new heading...' options, headingStrings: ${String(headingStrings)}`)
+    if (optionAddATopAndBottom) {
+      headingStrings.unshift('⏫ (top of note)')
+      headingStrings.push('⏬ (bottom of note)')
+    }
+    if (headingStrings.length === 0) {
+      logDebug('NPnote/getHeadingsFromNote', `No headingStrings generated for note ${note.filename}. Returning empty array.`)
+      return []
+    }
+    // Remove any markdown heading markers if requested
+    if (!includeMarkdown) {
+      headingStrings = headingStrings.map((h) => h.replace(/^#{1,5}\s*/, ''))
+    }
+    return headingStrings
+  } catch (error) {
+    logError('NPnote/getHeadingsFromNote', error.message)
+    return []
   }
-  return headingStrings
 }
 
 /**

helpers/paragraph.js

@@ -583,7 +583,7 @@ export function findStartOfActivePartOfNote(note: CoreNoteFields, allowPreamble?
     // or 'allowPreamble' is true.
     // If there is, run on to next heading or blank line (if found) otherwise, just the next line. Finding a separator or any YouTutype of task or checklist also stops the search.
     if (allowPreamble || (paras[startOfActive] && paras[startOfActive].type === 'text' && paras[startOfActive].content.match(/^#\w/))) {
-      // logDebug('paragraph/findStartOfActivePartOfNote', `- We want to allow preamble, or found a metadata line.`)
+      // logDebug('paragraph/findStartOfActivePartOfNote', `- We want to allow preamble, or there's a hashtag starting the next line.`)
       // startOfActive += 1
       for (let i = startOfActive; i < paras.length; i++) {
         const p = paras[i]

helpers/userInput.js

@@ -741,6 +741,7 @@ export async function chooseHeading(
  * Ask user to select a heading from those in a given note (regular or calendar), or optionally create a new heading at top or bottom of note to use, or the top or bottom of the note.
  * Note: Any whitespace on the end of the heading text is left in place, as otherwise this would cause issues with NP API calls that take heading parameter.
  * V2: Can use newer CommandBar decorated options, if running on v3.18 or later.
+ * Note: Returns an empty string if no headings found and no other options requested.
  * @author @jgclark
  *
  * @param {TNote} note - note to draw headings from
@@ -763,10 +764,17 @@ export async function chooseHeadingV2(
       return await chooseHeading(note, optionAddAtTopAndBottom, optionCreateNewHeading, includeArchive, headingLevel)
     }
 
-    // Get the existing headings from the note, with markdown markers, but without any 'create new heading' options
-    const headingStrings = getHeadingsFromNote(note, true, false, false, includeArchive)
+    // Get the existing headings from the note, with markdown markers, but without any 'create new heading' options (as they get added later)
+    const headings = getHeadingsFromNote(note, true, false, false, includeArchive)
+
+    // If there are no headings, and the other options are false, then return an empty string
+    if (headings.length === 0 && !optionAddAtTopAndBottom && !optionCreateNewHeading) {
+      logDebug('userInput / chooseHeadingV2', `No headings found in note ${note.filename}, and no other options requested. So returning an empty string.`)
+      return ''
+    }
+
     const headingOptions: Array<TCommandBarOptionObject> = []
-    headingStrings.forEach((heading) => {
+    headings.forEach((heading) => {
       const headingWithoutLeadingMarkers = heading.replace(/^#{1,5}\s*/, '')
       const headingLevel = heading.match(/^#{1,5}/)?.[0]?.length ?? 2
       headingOptions.push({
@@ -787,14 +795,16 @@ export async function chooseHeadingV2(
         alpha: 0.6,
         darkAlpha: 0.6,
       })
-      headingOptions.push({
-        text: '(insert new heading at the end of the note)',
-        icon: 'h' + String(headingLevel),
-        shortDescription: 'Add new',
-        color: 'orange-500',
-        alpha: 0.6,
-        darkAlpha: 0.6,
-      })
+      if (headings.length > 0) {
+        headingOptions.push({
+          text: '(insert new heading at the end of the note)',
+          icon: 'h' + String(headingLevel),
+          shortDescription: 'Add new',
+          color: 'orange-500',
+          alpha: 0.6,
+          darkAlpha: 0.6,
+        })
+      }
     }
     if (optionAddAtTopAndBottom) {
       headingOptions.unshift({
@@ -835,64 +845,72 @@ export async function chooseHeadingV2(
  * @param {TNote} note
  * @param {string} chosenHeading - The text of the new heading to add, or 5 possible special instruction strings.
  * @param {number?} headingLevel - The level of the heading to add (1-5) where requested. If not given, will default to 2.
- * @returns {string} headingToReturn - The heading to return, or one of the special instruction strings <<top of note>>, <<bottom of note>>.
+ * @returns {string} headingToReturn - The heading to return, or one of the special instruction strings <<top of note>>, <<bottom of note>>. Or empty string if user cancelled operation.
  */
 export async function processChosenHeading(note: TNote, chosenHeading: string, headingLevel: number = 2): Promise<string> {
-  if (chosenHeading === '') {
-    throw new Error('No heading passed to processChosenHeading(). Stopping.')
-  }
+  try {
+    if (chosenHeading === '') {
+      throw new Error('No heading passed to processChosenHeading(). Stopping.')
+    }
 
-  let newHeading: string | boolean
-  let headingToReturn = chosenHeading
-  logDebug('userInput / processChosenHeading', `headingLevel: ${headingLevel} chosenHeading: '${chosenHeading}'`)
+    let newHeading: string | boolean
+    let headingToReturn = chosenHeading
+    logDebug('userInput / processChosenHeading', `headingLevel: ${headingLevel} chosenHeading: '${chosenHeading}'`)
 
-  if (headingToReturn.includes('insert new heading at the start of the note')) {
+    if (headingToReturn.includes('insert new heading at the start of the note')) {
     // ask for new heading, and insert right at top
-    newHeading = await getInput(`Enter heading to add at the start of the note`)
-    if (newHeading && typeof newHeading === 'string') {
-      const startPos = 0
-      // $FlowIgnore
-      note.insertHeading(newHeading, startPos, headingLevel)
-      logDebug('userInput / processChosenHeading', `prepended new heading '${newHeading}' at line ${startPos} (calendar note)`)
-      headingToReturn = newHeading
-    } else {
-      throw new Error(`user cancelled operation`)
-    }
-  } else if (headingToReturn.includes('insert new heading under the title')) {
-    // ask for new heading, find smart insertion position, and insert it
-    newHeading = await getInput(`Enter heading to add at the start of the note`)
-    if (newHeading && typeof newHeading === 'string') {
-      const startPos = findStartOfActivePartOfNote(note)
-      // $FlowIgnore
-      note.insertHeading(newHeading, startPos, headingLevel)
-      logDebug('userInput / processChosenHeading', `prepended new heading '${newHeading}' at line ${startPos} (project note)`)
-      headingToReturn = newHeading
-    } else {
-      throw new Error(`user cancelled operation`)
-    }
-  } else if (headingToReturn.includes('insert new heading at the end of the note')) {
-    // ask for new heading, and then append it
-    newHeading = await getInput(`Enter heading to add at the end of the note`)
-    if (newHeading && typeof newHeading === 'string') {
-      const indexEndOfActive = findEndOfActivePartOfNote(note)
-      const newLindeIndex = indexEndOfActive + 1
-      // $FlowIgnore - headingLevel is a union type, and we've already checked it's a number
-      note.insertHeading(newHeading, newLindeIndex, headingLevel || 2)
-      logDebug('userInput / processChosenHeading', `appended new heading '${newHeading}' at line ${newLindeIndex}`)
-      headingToReturn = newHeading
+      newHeading = await getInput(`Enter heading to add at the start of the note`, 'OK', 'New Heading')
+      if (newHeading && typeof newHeading === 'string') {
+        const startPos = 0
+        // $FlowIgnore
+        note.insertHeading(newHeading, startPos, headingLevel)
+        logDebug('userInput / processChosenHeading', `prepended new heading '${newHeading}' at line ${startPos} (calendar note)`)
+        headingToReturn = newHeading
+      } else {
+        logWarn('userInput / processChosenHeading', `User cancelled operation`)
+        return ''
+      }
+    } else if (headingToReturn.includes('insert new heading under the title')) {
+      // ask for new heading, find smart insertion position, and insert it
+      newHeading = await getInput(`Enter heading to add under the title`, 'OK', 'New Heading')
+      if (newHeading && typeof newHeading === 'string') {
+        const startPos = findStartOfActivePartOfNote(note)
+        // $FlowIgnore
+        note.insertHeading(newHeading, startPos, headingLevel)
+        logDebug('userInput / processChosenHeading', `prepended new heading '${newHeading}' at line ${startPos} (project note)`)
+        headingToReturn = newHeading
+      } else {
+        logWarn('userInput / processChosenHeading', `User cancelled operation`)
+        return ''
+      }
+    } else if (headingToReturn.includes('insert new heading at the end of the note')) {
+      // ask for new heading, and then append it
+      newHeading = await getInput(`Enter heading to add at the end of the note`, 'OK', 'New Heading')
+      if (newHeading && typeof newHeading === 'string') {
+        const indexEndOfActive = findEndOfActivePartOfNote(note)
+        const newLindeIndex = indexEndOfActive + 1
+        // $FlowIgnore - headingLevel is a union type, and we've already checked it's a number
+        note.insertHeading(newHeading, newLindeIndex, headingLevel || 2)
+        logDebug('userInput / processChosenHeading', `appended new heading '${newHeading}' at line ${newLindeIndex}`)
+        headingToReturn = newHeading
+      } else {
+        logWarn('userInput / processChosenHeading', `User cancelled operation`)
+        return ''
+      }
+    } else if (headingToReturn.includes('(top of note)')) {
+      logDebug('userInput / processChosenHeading', `selected top of note, rather than a heading`)
+      headingToReturn = '<<top of note>>' // hopefully won't ever be used as an actual title!
+    } else if (headingToReturn.includes('(bottom of note)')) {
+      logDebug('userInput / processChosenHeading', `selected end of note, rather than a heading`)
+      headingToReturn = '<<bottom of note>>'
     } else {
-      throw new Error(`user cancelled operation`)
+      // Nothing else to do
     }
-  } else if (headingToReturn.includes('(top of note)')) {
-    logDebug('userInput / processChosenHeading', `selected top of note, rather than a heading`)
-    headingToReturn = '<<top of note>>' // hopefully won't ever be used as an actual title!
-  } else if (headingToReturn.includes('(bottom of note)')) {
-    logDebug('userInput / processChosenHeading', `selected end of note, rather than a heading`)
-    headingToReturn = '<<bottom of note>>'
-  } else {
-    // Nothing else to do
+    return headingToReturn
+  } catch (error) {
+    logError('userInput / processChosenHeading', error.message)
+    return ''
   }
-  return headingToReturn
 }
 
 /**

jgclark.Filer/CHANGELOG.md

@@ -1,8 +1,9 @@
 # What's changed in 📦 Filer plugin?
 Please see the [Readme for this plugin](https://github.com/NotePlan/plugins/tree/main/jgclark.Filer) for more details, including the available settings.
 
-## [1.3.3] - 2025-10-18
+## [1.3.3] - 2025-11-07
 - fix duplication in /move block (thanks for the tip, @bido_1977)
+- improved the heading picker used in some of these commands
 
 ## [1.3.2] - 2025-09-06
 - suppress notes in the special Archive and Template folders from the note chooser in **/add sync'd copy to note** and **/move ...** commands (for @chrismetcalf)