Merge pull request #1269 from pjkaufman/master

Fix List Ignore Type Ignoring More than It Should when Sublists Are Present

Author: pjkaufman

__tests__/remove-multiple-spaces.test.ts

@@ -239,6 +239,21 @@ ruleTest({
         > > - e.g., \`Customer\` class might have \`getName\`, \`getAddress\`, but also \`sendEmail\` that sends an email to the customer → Weird; not a major responsibility of the customer → ==not cohesive
       `,
     },
+    { // accounts for https://github.com/platers/obsidian-linter/issues/1203
+      testName: 'A nested callout/blockquote should not have list item proceeding space removed',
+      before: dedent`
+        - first item
+             - xxxxxxxxxxxxxxxxxxxxxxxxx
+
+        test    test
+      `,
+      after: dedent`
+        - first item
+             - xxxxxxxxxxxxxxxxxxxxxxxxx
+
+        test test
+      `,
+    },
   ],
 });
 

src/utils/ignore-types.ts

@@ -81,9 +81,13 @@ export function ignoreListOfTypes(ignoreTypes: IgnoreType[], text: string, func:
  * @return {string[]} The mdast nodes values replaced
  */
 function replaceMdastType(text: string, placeholder: string, type: MDAstTypes): IgnoreResults {
-  const positions: Position[] = getPositions(type, text);
+  let positions: Position[] = getPositions(type, text);
   const replacedValues: string[] = [];
 
+  if (type === MDAstTypes.List) {
+    positions = removeOverlappingPositions(positions);
+  }
+
   for (const position of positions) {
     const valueToReplace = text.substring(position.start.offset, position.end.offset);
     replacedValues.push(valueToReplace);
@@ -197,3 +201,22 @@ function replaceCustomIgnore(text: string, customIgnorePlaceholder: string): Ign
 
   return {newText: text, replacedValues: replacedSections};
 }
+
+function removeOverlappingPositions(positions: Position[]): Position[] {
+  if (positions.length < 2) {
+    return positions;
+  }
+
+  let lastPosition: Position = positions.pop();
+  let currentPosition: Position = null;
+  const result: Position[] = [lastPosition];
+  while (positions.length > 0) {
+    currentPosition = positions.pop();
+    if (lastPosition.start.offset >= currentPosition.end.offset || currentPosition.start.offset >= lastPosition.end.offset) {
+      result.unshift(currentPosition);
+      lastPosition = currentPosition;
+    }
+  }
+
+  return result;
+}