Merge pull request #204 from pjkaufman/master

Fix Issue with Yaml FrontMatter Including More Than Initial Frontmatter

src/test.ts

@@ -532,14 +532,41 @@ describe('yaml timestamp', () => {
  });
 });
 describe('Insert yaml attributes', () => {
- it('Inits yaml is not exist', () => {
+ it('Inits yaml if it does not exist', () => {
  const before = dedent`
  `;
  const after = dedent`
  ---
  tags:
  ---
  
+ `;
+ expect(rulesDict['insert-yaml-attributes'].apply(before, {'Text to insert': 'tags:'})).toBe(after);
+ });
+ // accounts for https://github.com/platers/obsidian-linter/issues/176
+ it('Inits yaml when the file has --- in it and no frontmatter', () => {
+ const before = dedent`
+ # Heading
+ Text
+
+ # Heading
+ - Text
+ - Text
+ ---
+
+ `;
+ const after = dedent`
+ ---
+ tags:
+ ---
+ # Heading
+ Text
+
+ # Heading
+ - Text
+ - Text
+ ---
+
  `;
  expect(rulesDict['insert-yaml-attributes'].apply(before, {'Text to insert': 'tags:'})).toBe(after);
  });

src/utils.ts

@@ -8,7 +8,7 @@ import remarkGfm from 'remark-gfm';
 
 export const headerRegex = /^(\s*)(#+)(\s+)(.*)$/;
 export const fencedRegexTemplate = '^XXX\\.*?\n(?:((?:.|\n)*?)\n)?XXX(?=\\s|$)$';
-export const yamlRegex = /^---\n(?:((?:.|\n)*?)\n)?---(?=\n|$)/;
+export const yamlRegex = /^---\n((?:(((?!---)(?:.|\n)*?)\n)?))---(?=\n|$)/;
 export const backtickBlockRegexTemplate = fencedRegexTemplate.replaceAll('X', '`');
 export const tildeBlockRegexTemplate = fencedRegexTemplate.replaceAll('X', '~');
 export const indentedBlockRegex = '^((\t|( {4})).*\n)+';