diff --git a/src/Settings.ts b/src/Settings.ts index 5975f69..16e7472 100644 --- a/src/Settings.ts +++ b/src/Settings.ts @@ -63,7 +63,7 @@ export class DynamicTimetableSettingTab extends PluginSettingTab { this.createTextSetting( 'Show Until Regex', 'showUntilRegex', - 'Enter a regex. Tasks will be shown until a line matching this regex is found.', + 'Enter a regex. Tasks will be shown until a line matching this regex is found.' ); const headerNames = Array.isArray(this.plugin.settings.headerNames) ? this.plugin.settings.headerNames.join(', ') diff --git a/src/TaskParser.ts b/src/TaskParser.ts index 27a47fb..1378127 100644 --- a/src/TaskParser.ts +++ b/src/TaskParser.ts @@ -13,7 +13,7 @@ export interface Task { export class TaskParser { private dateDelimiter: RegExp; - private parseUntilRegex: RegExp; + private showUntilRegex: RegExp; constructor( private separator: string, @@ -22,11 +22,11 @@ export class TaskParser { private showStartTimeInTaskName: boolean, private showEstimateInTaskName: boolean, private showCategoryNamesInTask: boolean, - parseUntilRegex: string + showUntilRegex: string ) { this.dateDelimiter = dateDelimiter ? new RegExp(dateDelimiter) : /(?!x)x/; - this.parseUntilRegex = parseUntilRegex - ? new RegExp(parseUntilRegex) + this.showUntilRegex = showUntilRegex + ? new RegExp(showUntilRegex) : /(?!x)x/; } @@ -38,7 +38,7 @@ export class TaskParser { settings.showStartTimeInTaskName, settings.showEstimateInTaskName, settings.showCategoryNamesInTask, - settings.parseUntilRegex + settings.showUntilRegex ); } @@ -61,7 +61,7 @@ export class TaskParser { } return acc; } - if (this.parseUntilRegex.test(task)) { + if (this.showUntilRegex.test(task)) { stopParsing = true; return acc; } diff --git a/src/main.ts b/src/main.ts index c48aa0f..9c1a974 100644 --- a/src/main.ts +++ b/src/main.ts @@ -30,7 +30,7 @@ export interface DynamicTimetableSettings { pathToDictionary: string; showRemainingTime: boolean; customUrlScheme: string; - parseUntilRegex: string; + showUntilRegex: string; [key: string]: | string | boolean @@ -75,7 +75,7 @@ export default class DynamicTimetable extends Plugin { pathToDictionary: '', showRemainingTime: true, customUrlScheme: '', - parseUntilRegex: '', + showUntilRegex: '', }; async onload() {