Merge pull request #1343 from pjkaufman/master

Fixed Ignore File and Folder Commands Not Working

Author: pjkaufman

src/main.ts

@@ -200,7 +200,7 @@ export default class LinterPlugin extends Plugin {
           return false;
         }
 
-        this.createFolderLintModal(ctx.file.parent);
+        that.createFolderLintModal(ctx.file.parent);
       },
     });
 
@@ -229,7 +229,7 @@ export default class LinterPlugin extends Plugin {
           return false;
         }
 
-        void this.addFolderToIgnoreList(ctx.file.parent);
+        void that.addFolderToIgnoreList(ctx.file.parent);
       },
     });
 
@@ -241,7 +241,7 @@ export default class LinterPlugin extends Plugin {
           return that.isMarkdownFile(ctx.file) && !that.shouldIgnoreFile(ctx.file);
         }
 
-        void this.addFileToIgnoreList(ctx.file);
+        void that.addFileToIgnoreList(ctx.file);
       },
       icon: iconInfo.ignoreFile.id,
     });

src/rules.ts

@@ -6,12 +6,12 @@ import {
   Option,
   BooleanOption,
 } from './option';
-import {YAMLException} from 'js-yaml';
 import {LinterError} from './linter-error';
 import {getTextInLanguage, LanguageStringKey} from './lang/helpers';
 import {ignoreListOfTypes, IgnoreType} from './utils/ignore-types';
 import {LinterSettings} from './settings-data';
 import {App} from 'obsidian';
+import {YAMLParseError} from 'yaml';
 
 export type Options = { [optionName: string]: any};
 
@@ -188,12 +188,13 @@ export function sortRules(): void {
 
 export function wrapLintError(error: Error, ruleName: string) {
   let errorMessage: string;
-  if (error instanceof YAMLException) {
+  if (error instanceof YAMLParseError) {
     errorMessage = error.toString();
     errorMessage = getTextInLanguage('logs.wrapper-yaml-error').replace('{ERROR_MESSAGE}', errorMessage.substring(errorMessage.indexOf(':') + 1));
   } else {
     errorMessage = getTextInLanguage('logs.wrapper-unknown-error').replace('{ERROR_MESSAGE}', error.message);
   }
 
+  // TODO: clean this up, and see about replacing encountered an with the appropriate getTextInLanguage
   throw new LinterError(`"${ruleName}" encountered an ${errorMessage}`, error);
 }

src/utils/mdast.ts

@@ -117,7 +117,7 @@ export function getPositions(type: MDAstTypes, text: string): Position[] {
  * @return {PositionPlusEmptyIndicator[]} The positions of the list item text in the given text
  * with a status as to whether or not they are empty
  */
-function getListItemTextPositions(text: string, includeEmptyNodes: boolean = false): Position[] {
+function getListItemTextPositions(text: string, includeEmptyNodes: boolean = false): PositionPlusEmptyIndicator[] {
   const ast = parseTextToAST(text);
   const positions: PositionPlusEmptyIndicator[] = [];
   visit(ast, MDAstTypes.ListItem as string, (node) => {