imdone-core 1.37.1 → 1.40.0

package/lib/adapters/parsers/task/CardContentParser.js

@@ -0,0 +1,256 @@
+const eol = require('eol')
+const Task = require('../../../task')
+const XRegExp = require('xregexp')
+
+const FILE_TYPES = {
+  MARKDOWN: 'markdown',
+  CODE: 'code',
+}
+
+const START_TAG = '<card>'
+const END_TAG = '</card>'
+const CODE_STYLE_PATTERN = '([A-Z]+[A-Z-_]+?)((:)(-?[\\d.]+(?:e-?\\d+)?)?)?[ \\t]+(.+)$'
+const LIST_NAME_PATTERN = '[\\p{L}0-9-_]{2,}' // [a-zA-Z-_]+?
+const HASH_STYLE_REGEX = new XRegExp(
+  `#(${LIST_NAME_PATTERN})(:(-?[\\d.]+(?:e-?\\d+)?)?)?[ \\t]+(.+)$`,
+  'gm'
+)
+const HASH_STYLE_META_ORDER_REGEX = new XRegExp(
+  `#(${LIST_NAME_PATTERN})[ \\t]+(.+)$`, 'gm'
+)
+const LINK_STYLE_REGEX = new XRegExp(
+  `(\\[.*\\]\\s?)?(\\[(.+)\\]\\(#(${LIST_NAME_PATTERN})(:)(-?[\\d.]+(?:e-?\\d+)?)?\\))`,
+  'gm'
+)
+
+function getContentLines(content) {
+  let foundContent = false
+  return eol.split(content).filter((line) => {
+    const hasContent = line.trim()
+    if (!foundContent && hasContent) foundContent = true
+    return foundContent || hasContent
+  })
+}
+
+function isCheckBoxTask (config, line, beforeText) {
+  if (!config.isAddCheckBoxTasks()) return
+
+  const beforeTextCheckData = Task.getCheckedData(beforeText)
+  if (!beforeTextCheckData) return
+
+  const lineCheckData = Task.getCheckedData(line)
+  if (!lineCheckData) return
+
+  return lineCheckData.pad <= beforeTextCheckData.pad
+}
+
+function hasTaskInText(config, text, isCodeFile) {
+  return (
+    (isCodeFile && hasCodeStyleTask(config, text)) ||
+    ((new XRegExp(HASH_STYLE_REGEX).test(text) ||
+      new XRegExp(HASH_STYLE_META_ORDER_REGEX).test(text) ||
+      new XRegExp(LINK_STYLE_REGEX).test(text)) &&
+      config.lists.find((list) => text.includes(`#${list.name}`)))
+  )
+}
+
+function hasCodeStyleTask (config, text) {
+  let result = new RegExp(CODE_STYLE_PATTERN).exec(text)
+  if (!result) return false
+  return config.includeList(result[1])
+}
+
+function getCardTagsTaskContent ({
+  content,
+  fileType
+}) {
+  const isCodeFile = fileType === FILE_TYPES.CODE
+  if (isCodeFile) return
+  
+  const isMarkDownFile = fileType === FILE_TYPES.MARKDOWN
+  let lines = getContentLines(content)
+  const hasCardStartTag =
+    isMarkDownFile && lines.length > 1 && lines[1].trim() === START_TAG
+  if (!hasCardStartTag) return
+
+  let openBlockCommentTokens = 0
+  let closeBlockCommentTokens = 0
+  let hasCardEndTag = false
+  const rawTaskContentLines = []
+  const taskContentLines = []
+  for (let i = 1; i < lines.length; i++) {
+    let line = lines[i]
+    // Check for matching block comments in markdown files
+    if (isMarkDownFile && line.trim().indexOf('<!--') > -1)
+      openBlockCommentTokens++
+    if (isMarkDownFile && line.trim().indexOf('-->') > -1)
+      closeBlockCommentTokens++
+
+    rawTaskContentLines.push(line)
+
+    if (line.trim() === START_TAG) continue
+    if (line.trim() === END_TAG) {
+      hasCardEndTag = true
+      break
+    }
+    taskContentLines.push(line)
+  }
+
+  // Remove extra block comment tokens
+  if (
+    isMarkDownFile &&
+    rawTaskContentLines.length &&
+    rawTaskContentLines[rawTaskContentLines.length - 1].trim() === '-->' &&
+    openBlockCommentTokens !== closeBlockCommentTokens
+  )
+    rawTaskContentLines.pop()
+
+  const isWrappedWithCardTag = hasCardStartTag && hasCardEndTag
+
+  return {
+    rawTaskContentLines,
+    taskContentLines,
+    isWrappedWithCardTag,
+  }
+}
+
+function getCodeFileTaskContent ({
+  config,
+  content,
+  inBlockComment,
+  fileType,
+  lang
+}) {
+  const isCodeFile = fileType === FILE_TYPES.CODE
+  if (!isCodeFile) return
+
+  const rawTaskContentLines = []
+  let lines = getContentLines(content)
+  for (let i = 1; i < lines.length; i++) {
+    let line = lines[i]
+    // Another task ends a task
+    if (hasTaskInText(config, line, isCodeFile)) break
+    if (
+      !inBlockComment &&
+      (line.indexOf(lang.symbol) < 0 ||
+      line.trim().indexOf(lang.symbol) > 0 ||
+      line.trim() === lang.symbol)
+    )
+      break
+    if (lang.block && line.trim() === lang.block.end)
+      break
+    if (lang.block && line.trim() === lang.block.ignore)
+      break
+    if (line && lang && lang.block) line = line.replace(lang.block.end, '')
+    
+    rawTaskContentLines.push(line)
+  }
+  return {
+    rawTaskContentLines,
+    taskContentLines: rawTaskContentLines,
+  }
+}
+
+function getTextFileTaskContent ({
+  config,
+  content,
+  beforeText,
+  fileType,
+}) {
+  const isCodeFile = fileType === FILE_TYPES.CODE
+  if (isCodeFile) return
+
+  let lines = getContentLines(content)
+  const hasCardStartTag = lines.length > 1 && lines[1].trim() === START_TAG
+  if (hasCardStartTag) return
+
+  const isMarkDownFile = fileType === FILE_TYPES.MARKDOWN
+  let openBlockCommentTokens = 0
+  let closeBlockCommentTokens = 0
+  let lastLineBlank = false
+  let endsWithDoubleBlank = false
+  let trailingBlankLines = 0
+  const rawTaskContentLines = []
+
+  for (let i = 1; i < lines.length; i++) {
+    let line = lines[i]
+    // Check for end of task
+    // Another task ends a task
+    if (hasTaskInText(config, line, isCodeFile)) break
+    if (isCheckBoxTask(config, line, beforeText)) break
+
+    // TODO Break this out into a function with an accurate name
+    // Check if task is a list item in markdown and end it if content is not part of a nested list
+    // #urgent
+    // <!-- order:-65 -->
+    if (
+      isMarkDownFile &&
+      beforeText &&
+      /^\s*(\*|-|\d+\.|[a-zA-Z]\.)\s$/.test(beforeText) &&
+      line.search(/\S/) <= beforeText.search(/\S/)
+    ) break
+
+    rawTaskContentLines.push(line)
+
+    // Check for matching block comments in markdown files
+    if (isMarkDownFile && line.trim().indexOf('<!--') > -1)
+      openBlockCommentTokens++
+    if (isMarkDownFile && line.trim().indexOf('-->') > -1)
+      closeBlockCommentTokens++  
+
+    const thisLineBlank = line.trim() === ''
+
+    if (thisLineBlank && lastLineBlank) {
+      endsWithDoubleBlank = true
+      break
+    }
+
+    lastLineBlank = thisLineBlank  
+  }
+
+  if (endsWithDoubleBlank) trailingBlankLines = 2
+  else if (lastLineBlank) trailingBlankLines = 1
+
+  // Remove extra block comment tokens
+  if (
+    isMarkDownFile &&
+    rawTaskContentLines.length &&
+    rawTaskContentLines[rawTaskContentLines.length - 1].trim() === '-->' &&
+    openBlockCommentTokens !== closeBlockCommentTokens
+  )
+    rawTaskContentLines.pop()
+
+  const taskContentLines = trailingBlankLines 
+    ? rawTaskContentLines.slice(0, -trailingBlankLines)
+    : rawTaskContentLines;
+
+  return {
+    rawTaskContentLines,
+    taskContentLines,
+    trailingBlankLines
+  }
+}
+
+function getTaskContent ({
+  config,
+  content,
+  inBlockComment,
+  beforeText,
+  fileType,
+  lang  
+}) {
+  return getCardTagsTaskContent({ content, fileType }) ||
+    getCodeFileTaskContent({ config, content, inBlockComment, fileType, lang }) ||
+    getTextFileTaskContent({ config, content, beforeText, fileType })
+}
+
+module.exports = {
+  FILE_TYPES,
+  getTaskContent,
+  START_TAG,
+  END_TAG,
+  LIST_NAME_PATTERN,
+  HASH_STYLE_REGEX,
+  HASH_STYLE_META_ORDER_REGEX,
+  LINK_STYLE_REGEX
+}

package/lib/card.js

@@ -117,6 +117,7 @@ module.exports = function newCard(task, _project, dontParse) {
       return {
         ..._pick(
           this,
+          ...['beforeText',
           'rawTask',
           'id',
           'text',
@@ -141,7 +142,7 @@ module.exports = function newCard(task, _project, dontParse) {
           'projectPath',
           'relPath',
           'fullPath',
-          'totals'
+          'totals'].sort()
         ),
       }
     }
@@ -149,11 +150,11 @@ module.exports = function newCard(task, _project, dontParse) {
     initData() {
       const props = { ...this.props, content: CONTENT_TOKEN }
       const computed = { ...this.computed }
-      const cardData = this.defaultData
+      const defaultData = this.defaultData
       try {
         for (let [key, value] of Object.entries(computed)) {
           let computedValue = value.toString()
-          const computedProps = { ...props, ...computed, ...cardData }
+          const computedProps = { ...props, ...computed, ...defaultData }
           if (_isFunction(value) && !_isEmpty(props)) {
             try {
               // Call the computed function for a value
@@ -182,13 +183,13 @@ module.exports = function newCard(task, _project, dontParse) {
       }
 
       const pluginData = pluginManager
-        ? { ...pluginManager.getCardProperties(cardData), ...cardData }
-        : cardData
+        ? { ...pluginManager.getCardProperties(defaultData) }
+        : {}
       const data = {
+        ...defaultData,
         ...pluginData,
         ...props,
-        ...computed,
-        ...cardData,
+        ...computed
       }
 
       this.data = { ...data }

package/lib/default-settings.js

@@ -28,6 +28,7 @@ cards:
   orderMeta: true
   maxLines: 6 #override
   addNewCardsToTop: true #override
+  showTagsAndMeta: true #override
 journalTemplate: #override
 theme: 'dark'
 markdownOnly: false #override

package/lib/file.js

@@ -19,7 +19,15 @@ var _clone = require('lodash.clone'),
   Task = require('./task'),
   newCard = require('./card'),
   fastSort = require('fast-sort/dist/sort'),
-  XRegExp = require('xregexp')
+  XRegExp = require('xregexp'),
+ {
+  FILE_TYPES, 
+  getTaskContent,
+  LIST_NAME_PATTERN,
+  HASH_STYLE_REGEX,
+  HASH_STYLE_META_ORDER_REGEX,
+  LINK_STYLE_REGEX,
+ } = require('./adapters/parsers/task/CardContentParser')
 
 const appContext = require('./context/ApplicationContext')
 const { isNumber } = require('./task')
@@ -68,8 +76,6 @@ function File(opts) {
   }
 }
 util.inherits(File, events.EventEmitter)
-const START_TAG = (File.START_TAG = '<card>')
-const END_TAG = (File.END_TAG = '</card>')
 const CODE_BLOCK_REGEX = (File.CODE_BLOCK_REGEX = /`{3}[\s\S]*?`{3}/gm)
 const INLINE_CODE_REGEX = (File.INLINE_CODE_REGEX = /`[\s\S]*?`/g)
 const CODE_STYLE_END = '((:)(-?[\\d.]+(?:e-?\\d+)?)?)?[ \\t]+(.+)$'
@@ -77,28 +83,12 @@ const CODE_STYLE_END = '((:)(-?[\\d.]+(?:e-?\\d+)?)?)?[ \\t]+(.+)$'
 const CODE_STYLE_PATTERN = (File.CODE_STYLE_PATTERN =
   '([A-Z]+[A-Z-_]+?)' + CODE_STYLE_END)
 
-const LIST_NAME_PATTERN = '[\\p{L}0-9-_]{2,}' // [a-zA-Z-_]+?
-File.LIST_NAME_PATTERN = new XRegExp(LIST_NAME_PATTERN)
 File.isListNameValid = function(listName) {
   return new XRegExp(LIST_NAME_PATTERN).test(listName)
 }
 
-const HASH_STYLE_PATTERN = (File.HASH_STYLE_PATTERN = new XRegExp(
-  `#(${LIST_NAME_PATTERN})(:(-?[\\d.]+(?:e-?\\d+)?)?)?[ \\t]+(.+)$`,
-  'gm'
-))
-
-const HASH_STYLE_META_ORDER_PATTERN = (File.HASH_STYLE_META_ORDER_PATTERN =
-  new XRegExp(`#(${LIST_NAME_PATTERN})[ \\t]+(.+)$`, 'gm'))
-
-const LINK_STYLE_PATTERN = (File.LINK_STYLE_PATTERN = new XRegExp(
-  `(\\[.*\\]\\s?)?(\\[(.+)\\]\\(#(${LIST_NAME_PATTERN})(:)(-?[\\d.]+(?:e-?\\d+)?)?\\))`,
-  'gm'
-))
-
 const CHECK_STYLE_PATTERN = (File.CHECK_STYLE_PATTERN =
   /^(\s*- \[([x ])\]\s)(.+$)/gm)
-// var LINK_STYLE_PATTERN_META_ORDER = File.LINK_STYLE_PATTERN_META_ORDER = /(\[.*\]\s?)?(\[(.+)\]\(#([a-zA-Z-_]+?)\))/gm;
 
 var getTaskId = (File.getTaskId = function (path, line, text) {
   var shasum = crypto.createHash('sha1')
@@ -292,9 +282,9 @@ File.prototype.extractCodeStyleTasks = function (config, pos, content) {
   var self = this
   var codeStyleRegex = new RegExp(CODE_STYLE_PATTERN, 'gm')
   var result
-  const inCodeBlock = this.isInBlockComment(content)
+  const inBlockComment = this.isInBlockComment(content)
   const singleLineBlockComment =
-    inCodeBlock && this.isSingleLineBlockComment(content)
+    inBlockComment && this.isSingleLineBlockComment(content)
   while ((result = codeStyleRegex.exec(content)) !== null) {
     var posInContent = pos + result.index
     var line = this.getLineNumber(posInContent)
@@ -315,10 +305,10 @@ File.prototype.extractCodeStyleTasks = function (config, pos, content) {
       const charsInFront = matchCharsInFront ? matchCharsInFront[0].length : 0
       var hasColon =
         result[3] !== undefined
-      const taskStartOnLine = inCodeBlock
+      const taskStartOnLine = inBlockComment
         ? posInContent - charsInFront - linePos
         : pos - linePos
-      var task = self.newTask({
+      var task = self.extractTaskWithDescription({
         taskStartOnLine,
         rawTask,
         config,
@@ -328,7 +318,7 @@ File.prototype.extractCodeStyleTasks = function (config, pos, content) {
         type: Task.Types.CODE,
         hasColon,
         content: self.getContent().substring(linePos),
-        inCodeBlock,
+        inBlockComment,
         singleLineBlockComment,
       })
       self.addTask(task)
@@ -338,7 +328,7 @@ File.prototype.extractCodeStyleTasks = function (config, pos, content) {
 }
 
 File.prototype.extractHashStyleTasks = function (config, pos, content) {
-  var hashStyleRegex = new XRegExp(HASH_STYLE_PATTERN)
+  var hashStyleRegex = new XRegExp(HASH_STYLE_REGEX)
   var lang = this.getLang()
   var result
   while ((result = hashStyleRegex.exec(content)) !== null) {
@@ -355,7 +345,7 @@ File.prototype.extractHashStyleTasks = function (config, pos, content) {
       const blockEndPos = text.indexOf(lang.block.end)
       if (blockEndPos > -1) text = text.substring(0, blockEndPos)
     }
-    var task = this.newTask({
+    var task = this.extractTaskWithDescription({
       config,
       list,
       text,
@@ -375,7 +365,7 @@ File.prototype.extractHashStyleTasks = function (config, pos, content) {
 
 File.prototype.extractLinkStyleTasks = function (config, pos, content) {
   var self = this
-  var linkStyleRegex = new XRegExp(LINK_STYLE_PATTERN)
+  var linkStyleRegex = new XRegExp(LINK_STYLE_REGEX)
   var result
   while ((result = linkStyleRegex.exec(content)) !== null) {
     let [match, before, rawTask, text, list, colon, order] = result
@@ -390,7 +380,7 @@ File.prototype.extractLinkStyleTasks = function (config, pos, content) {
     log(result)
     log('list:%s text:%s order:%d line:%d', list, text, order, line)
 
-    var task = self.newTask({
+    var task = self.extractTaskWithDescription({
       config,
       list,
       text,
@@ -431,7 +421,7 @@ File.prototype.extractCheckboxTasks = function (config, pos, content) {
     const posInContent = result.index + pos + beforeLength
     var line = this.getLineNumber(posInContent)
     if (hasTaskAtLine(line)) continue
-    var task = this.newTask({
+    var task = this.extractTaskWithDescription({
       config,
       list,
       text,
@@ -620,7 +610,7 @@ File.prototype.deleteTask = function (task, config) {
         config
       )
     } else if (task.type === Task.Types.HASHTAG) {
-      this.deleteCodeOrHashTask(HASH_STYLE_PATTERN, task, config)
+      this.deleteCodeOrHashTask(HASH_STYLE_REGEX, task, config)
     }
   } else {
     const fileContent = this.getContentLines()
@@ -661,22 +651,7 @@ File.prototype.modifyTask = function (task, config, noEmit) {
   } else {
     task.updateContent()
     const fileContent = this.getContentLines()
-    let description = task.description.slice()
-    task.preserveBlankLines = hasBlankLines(description.join(eol.auto))
-    if (task.preserveBlankLines) {
-      description.unshift('<card>')
-      description.push('</card>')
-    }
     let text = File.TASK_TYPE_TEMPLATES[task.type](task, config)
-    description = Task.padDescription(description, task.beforeText)
-    if (
-      description &&
-      description.length > 0 &&
-      description[description.length - 1].trim() === ''
-    ) {
-      description.pop()
-    }
-
     const linesBefore = fileContent.slice(0, task.line - 1)
     if (this.isCodeFile()) {
       const linesBeforeLength = linesBefore.join(lineEnd).length
@@ -686,19 +661,19 @@ File.prototype.modifyTask = function (task, config, noEmit) {
       }
     }
 
-    const linesAfter = fileContent.slice(task.lastLine);
-
+    const linesAfter = fileContent.slice(task.line)
     const newContent = [
       ...linesBefore,
       text,
-      ...description,
       ...linesAfter,
     ].join(lineEnd)
 
-    if (this.getContent().trim() === newContent.trim()) return
+    const contentBeforeUpdate = this.getContent()
     this.setContent(newContent)
+    this.modifyDescription(task, config)
+    if (contentBeforeUpdate.trim() == this.getContent().trim()) return
+
     this.setModified(true)
-    task.lastLine = task.line + description.length
     if (!noEmit) {
       this.emit('task.modified', task)
       this.emit('file.modified', this)
@@ -737,7 +712,7 @@ File.prototype.modifyCodeOrHashTask = function (re, task, config, noEmit) {
       if (index < 0) index = 0
       var beforeContent = this.getContent().substring(0, pos)
       var afterContent = this.getContent().substring(re.lastIndex)
-      if (task.inCodeBlock) {
+      if (task.inBlockComment) {
         var blockEnd = text.indexOf(lang.block.end)
         if (blockEnd > -1) {
           const desc =
@@ -797,25 +772,44 @@ File.prototype.modifyTaskFromHtml = function (task, html) {
 }
 
 File.prototype.modifyTaskFromContent = function (task, content, config) {
+  content = trimBlankLines(content, this.isCodeFile())
   task.updateFromContent(content)
   this.modifyTask(task, config)
 }
 
+const trimBlankLines = File.trimBlankLines = function (content, isCodeFile) {
+  if (isCodeFile) {
+    // replace all occurrences of two empty lines in a row with a single empty line
+    return content.replace(/\n\s*\n/g, '\n')
+  } 
+  return content.replace(/\n\s*\n\s*\n/g, '\n\n')
+}
+
 File.prototype.modifyDescription = function (task, config) {
-  // BACKLOG:-170 respect indent of preFix when task is a list item
-  const descStart = this.getLinePos(task.line + 1)
+  // DOING This should be split out by type (code, markdown, etc)
+  // #urgent
+  // <!-- order:-10 -->
   const taskStart = this.getLinePos(task.line)
+  const descStart = this.getLinePos(task.line + 1)
   const contentWithTask = this.getContent().substring(taskStart)
-  let { rawDescription, preserveBlankLines, hasCardEndTag } =
-    this.getRawDescription({
+  let { 
+    rawTaskContentLines,
+    taskContentLines,
+    isWrappedWithCardTag,
+    trailingBlankLines
+  } =
+    this.getTaskContent({
       config,
       content: contentWithTask,
-      inCodeBlock: task.inCodeBlock,
+      inBlockComment: task.inBlockComment,
       beforeText: task.beforeText,
     })
+
   let beforeDescContent = this.getContent().substring(0, descStart)
+
   if (descStart === this.getContent().length && !beforeDescContent.endsWith(lf))
     beforeDescContent += lineEnd
+  
   let content = this.getContent().substring(descStart)
   let spaces = ''
   if (this.isCodeFile() && !this.isMarkDownFile()) {
@@ -830,32 +824,34 @@ File.prototype.modifyDescription = function (task, config) {
   )
   // BACKLOG:-30 Allow this to pad for code files as well
   description = File.padDescription(description, task.beforeText).join(lineEnd)
-  if (rawDescription.length === 0 && description.length > 0) {
+  if (taskContentLines.length === 0 && description.length > 0) {
     beforeDescContent += description + lineEnd
   } else {
-    if (preserveBlankLines) {
-      rawDescription.unshift(START_TAG)
-      if (hasCardEndTag) rawDescription.push(END_TAG)
-    }
-    rawDescription = rawDescription.join(lineEnd)
+    let rawTaskContent = rawTaskContentLines.join(lineEnd)
+    // Add card terminator to description
     if (
       this.isMarkDownFile() &&
       description.length > 0 &&
-      (tools.hasBlankLines(description) || hasCardEndTag)
+      (tools.hasBlankLines(description) || isWrappedWithCardTag || trailingBlankLines)
     ) {
-      task.preserveBlankLines = true
-      description = `${START_TAG}${lineEnd}${description}${lineEnd}${END_TAG}`
+      task.isWrappedWithCardTag = isWrappedWithCardTag // DOING Find out where this is used and stop using it
+                                                       // <!-- order:-30 -->
+      const blankLinesToAdd = isWrappedWithCardTag ? 2 : trailingBlankLines
+      description = `${description}${lineEnd.repeat(blankLinesToAdd)}`
     }
+
+    // Handle code file tasks
     if (
       task.singleLineBlockComment &&
-      rawDescription.length > 0 &&
+      rawTaskContent.length > 0 &&
       description.length === 0
     ) {
-      rawDescription += lineEnd
+      description = lineEnd + description
     }
-    content = content.replace(rawDescription, description)
+    content = content.replace(rawTaskContent, description)
   }
 
+  task.lastLine = task.line + description.split(lineEnd).length
   this.setContent(beforeDescContent + content)
 }
 
@@ -863,7 +859,7 @@ File.padDescription = function (description = [], beforeText = '') {
   return Task.padDescription(description, beforeText)
 }
 
-File.prototype.newTask = function ({
+File.prototype.extractTaskWithDescription = function ({
   taskStartOnLine,
   rawTask,
   config,
@@ -874,7 +870,7 @@ File.prototype.newTask = function ({
   type,
   hasColon,
   content,
-  inCodeBlock,
+  inBlockComment,
   singleLineBlockComment,
   pos,
 }) {
@@ -883,20 +879,20 @@ File.prototype.newTask = function ({
   let description = []
   // BACKLOG:-230 ## add beforeText for code files
   const beforeText = this.getBeforeText(line, pos)
-  let { rawDescription, preserveBlankLines } = this.getRawDescription({
+  let { rawTaskContentLines, taskContentLines, isWrappedWithCardTag } = this.getTaskContent({
     config,
     content,
-    inCodeBlock,
+    inBlockComment,
     beforeText,
   })
 
   if (!singleLineBlockComment) {
     description = this.isCodeFile()
-      ? rawDescription.map((line) => this.trimCommentChars(line))
-      : _clone(rawDescription)
+      ? taskContentLines.map((line) => this.trimCommentChars(line))
+      : _clone(taskContentLines)
   }
   description = Task.trimDescription(description, beforeText)
-  const descriptionStartsWith = this.getDescriptionChars(inCodeBlock)
+  const descriptionStartsWith = this.getDescriptionChars(inBlockComment)
   const frontMatter = this.frontMatter
   text = this.trimCommentBlockEnd(text)
   let commentStartOnLine =
@@ -908,12 +904,12 @@ File.prototype.newTask = function ({
     {
       pos,
       frontMatter,
-      inCodeBlock,
+      inBlockComment,
       singleLineBlockComment,
       rawTask,
       text,
       list,
-      rawDescription,
+      rawTaskContentLines,
       description,
       descriptionStartsWith,
       taskStartOnLine,
@@ -926,7 +922,7 @@ File.prototype.newTask = function ({
       source: self.getSource(),
       type,
       beforeText,
-      preserveBlankLines,
+      isWrappedWithCardTag,
     },
     this.project
   )
@@ -1098,8 +1094,8 @@ File.prototype.ignoreCodeBlocks = function () {
   // BACKLOG:-100 This is not used, but we need a way to ignore tasks in code blocks. Maybe save position ranges
   var cleanContent = this.content
   var replacer = function (block) {
-    block = block.replace(new XRegExp(LINK_STYLE_PATTERN), '**TASK**')
-    block = block.replace(new XRegExp(HASH_STYLE_PATTERN), '**TASK**')
+    block = block.replace(new XRegExp(LINK_STYLE_REGEX), '**TASK**')
+    block = block.replace(new XRegExp(HASH_STYLE_REGEX), '**TASK**')
     return block
   }
 
@@ -1135,105 +1131,31 @@ File.prototype.getBeforeText = function (line, pos) {
     : this.content.substring(this.getLinePos(line), pos)
 }
 
-File.prototype.getDescriptionChars = function (inCodeBlock) {
+File.prototype.getDescriptionChars = function (inBlockComment) {
   if (!this.isCodeFile()) return ''
   const lang = this.getLang()
-  if (inCodeBlock && lang.block && lang.block.ignore) return lang.block.ignore
+  if (inBlockComment && lang.block && lang.block.ignore) return lang.block.ignore
   return lang.symbol
 }
 
-File.prototype.getRawDescription = function ({
-  config,
-  content,
-  inCodeBlock,
-  beforeText,
-}) {
-  const { rawDescription, preserveBlankLines, hasCardEndTag } =
-    this.getTaskContent({ config, content, inCodeBlock, beforeText })
-  const blockEnd = this.getLang().block && this.getLang().block.end
-  if (
-    this.isCodeFile() &&
-    blockEnd &&
-    rawDescription.length > 0 &&
-    rawDescription[rawDescription.length - 1].indexOf(blockEnd) > -1
-  )
-    rawDescription.pop()
-  return { rawDescription, preserveBlankLines, hasCardEndTag }
-}
-
-File.getContentLines = function (content) {
-  let foundContent = false
-  return eol.split(content).filter((line) => {
-    const hasContent = line.trim()
-    if (!foundContent && hasContent) foundContent = true
-    return foundContent || hasContent
-  })
-}
-
 File.prototype.getTaskContent = function ({
   config,
   content,
-  inCodeBlock,
+  inBlockComment,
   beforeText,
 }) {
-  const commentLines = []
-  let lines = File.getContentLines(content)
-  const preserveBlankLines =
-    this.isMarkDownFile() && lines.length > 1 && lines[1].trim() === START_TAG
+  const isMarkDownFile = this.isMarkDownFile()
+  const isCodeFile = this.isCodeFile()
   const lang = this.getLang()
-  let openBlockTokens = 0
-  let closeBlockTokens = 0
-  let hasCardEndTag = false
-  for (let i = preserveBlankLines ? 2 : 1; i < lines.length; i++) {
-    let line = lines[i]
-    if (this.isCheckBoxTask(config, line, beforeText) && !preserveBlankLines)
-      break
-    if (this.isMarkDownFile() && line.trim().indexOf('<!--') > -1)
-      openBlockTokens++
-    if (this.isMarkDownFile() && line.trim().indexOf('-->') > -1)
-      closeBlockTokens++
-
-    if (preserveBlankLines) {
-      if (line.trim() === END_TAG) {
-        hasCardEndTag = true
-        break
-      }
-    } else {
-      if (
-        this.isMarkDownFile() &&
-        beforeText &&
-        /^\s*(\*|-|\d+\.|[a-zA-Z]\.)\s$/.test(beforeText) &&
-        line.search(/\S/) <= beforeText.search(/\S/)
-      )
-        break
-      if (
-        (this.isCodeFile() &&
-          !inCodeBlock &&
-          (line.indexOf(lang.symbol) < 0 ||
-            line.trim().indexOf(lang.symbol) > 0)) ||
-        line.trim() === lang.symbol
-      )
-        break
-      if (this.isCodeFile() && lang.block && line.trim() === lang.block.end)
-        break
-      if (this.isCodeFile() && lang.block && line.trim() === lang.block.ignore)
-        break
-      if (!this.isCodeFile() && line.trim() === '') break
-    }
-    if (this.hasTaskInText(config, line)) break
-
-    if (line && lang.block) line = line.replace(lang.block.end, '')
-
-    if (preserveBlankLines || line.trim() !== '') commentLines.push(line)
-  }
-  if (
-    this.isMarkDownFile() &&
-    commentLines.length &&
-    commentLines[commentLines.length - 1].trim() === '-->' &&
-    openBlockTokens !== closeBlockTokens
-  )
-    commentLines.pop()
-  return { rawDescription: commentLines, preserveBlankLines, hasCardEndTag }
+  const fileType = isMarkDownFile ? FILE_TYPES.MARKDOWN : isCodeFile ? FILE_TYPES.CODE : undefined
+  return getTaskContent({
+    config,
+    content,
+    inBlockComment,
+    beforeText,
+    lang,
+    fileType,
+  })
 }
 
 File.prototype.isCheckBoxTask = function (config, line, beforeText) {
@@ -1322,9 +1244,9 @@ File.prototype.hasCodeStyleTask = function (config, text) {
 File.prototype.hasTaskInText = function (config, text) {
   return (
     this.hasCodeStyleTask(config, text) ||
-    ((new XRegExp(HASH_STYLE_PATTERN).test(text) ||
-      new XRegExp(HASH_STYLE_META_ORDER_PATTERN).test(text) ||
-      new XRegExp(LINK_STYLE_PATTERN).test(text)) &&
+    ((new XRegExp(HASH_STYLE_REGEX).test(text) ||
+      new XRegExp(HASH_STYLE_META_ORDER_REGEX).test(text) ||
+      new XRegExp(LINK_STYLE_REGEX).test(text)) &&
       config.lists.find((list) => text.includes(`#${list.name}`)))
   )
 }

package/lib/repository.js

@@ -1048,10 +1048,6 @@ Repository.prototype.appendTask = function({file, content, list}, cb) {
   }).trimEnd()
   const lines = eol.split(content)
   const text = lines[0]
-  if (tools.hasBlankLines(lines.join(eol.auto))) {
-    lines.splice(1, 0, File.START_TAG)
-    lines.push(File.END_TAG)
-  }
   const taskSyntax = config.getNewCardSyntax()
   const taskPrefix = interpretedTaskPrefix ? `${interpretedTaskPrefix} ` : ''
   let fileContent = file.getContent()
@@ -1092,7 +1088,8 @@ Repository.prototype.appendTask = function({file, content, list}, cb) {
     const inLineOrder = config.orderMeta ? '' : `:${orderString}`
     appendContent = `${taskPrefix}#${list}${inLineOrder} ${text}${eol.lf}${taskContent}`
   }
-  file.setContent(`${fileContent}${sep}${appendContent}`)
+  appendContent = File.trimBlankLines(appendContent)
+  file.setContent(`${fileContent}${sep}${appendContent}${"\n".repeat(2)}`)
   this.writeAndExtract(file, true, cb)
 }
 

package/lib/task.js

@@ -45,15 +45,15 @@ class Task {
     this.context = obj.context || []
     this.meta = obj.meta || {}
     this.metaIndex = obj.metaIndex || {}
-    this.inCodeBlock = obj.inCodeBlock
+    this.inBlockComment = obj.inBlockComment
     this.singleLineBlockComment = obj.singleLineBlockComment
     this.description = obj.description || []
-    this.rawDescription = obj.rawDescription || []
+    this.rawTaskContentLines = obj.rawTaskContentLines || []
     this.taskStartOnLine = obj.taskStartOnLine || 0
     this.commentStartOnLine = obj.commentStartOnLine || 0
     this.descriptionStartsWith = obj.descriptionStartsWith
     this.filteredListName = obj.filteredListName
-    this.preserveBlankLines = obj.preserveBlankLines
+    this.isWrappedWithCardTag = obj.isWrappedWithCardTag
     this.config = config
     this.allMeta = obj.allMeta || {}
     this.allContext = obj.allContext || []
@@ -80,8 +80,7 @@ class Task {
   }
 
   getLastLine() {
-    let lastLine = this.line + this.description.length
-    if (this.preserveBlankLines) lastLine += 2
+    let lastLine = this.line + this.rawTaskContentLines.length
     return lastLine
   }
 
@@ -178,6 +177,8 @@ class Task {
   }
 
   updateFromContent(content) {
+    // replace all occurrences of two empty lines in a row with a single empty line
+    content = content.replace(/\n\s*\n\s*\n/g, '\n\n')
     let lines = eol.split(content)
     this.text = lines.shift().trim()
     if (lines && lines.length > 1 && lines[lines.length - 1].trim() === '') lines.pop()
@@ -223,16 +224,16 @@ Task.padDescription = function (description = [], beforeText = '') {
   return description
 }
 
-Task.trimDescription = function (rawDescription, beforeText) {
+Task.trimDescription = function (rawTaskContentLines, beforeText) {
   const checkedData = Task.getCheckedData(beforeText)
   if (checkedData) {
-    rawDescription = rawDescription.map((line) => {
+    rawTaskContentLines = rawTaskContentLines.map((line) => {
       const lineLength = line.length
       line = line.trimStart()
       return line.padStart(lineLength - checkedData.pad)
     })
   }
-  return rawDescription
+  return rawTaskContentLines
 }
 
 Task.prototype.getCheckedData = function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imdone-core",
-  "version": "1.37.1",
+  "version": "1.40.0",
   "description": "imdone-core",
   "main": "index.js",
   "bin": {