Implement automatic settings updating

mayurankv · Aug 25, 2023 · 6d635df · 6d635df
1 parent 5c24658
commit 6d635df
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/src/EditingView.ts b/src/EditingView.ts
@@ -305,7 +305,6 @@ export function createCodeblockCodeMirrorExtensions(settings: CodeStylerSettings
 	}
 	function buildLineDecorations(state: EditorState): DecorationSet {
 		const builder = new RangeSetBuilder<Decoration>();
-		const sourceMode = isSourceMode(state);
 		for (let iter = (state.field(headerDecorations,false) ?? Decoration.none).iter(); iter.value !== null; iter.next()) {
 			const foldStart = state.doc.lineAt(iter.from);
 			const startDelimiter = testOpeningLine(foldStart.text.toString());

diff --git a/src/Settings.ts b/src/Settings.ts
@@ -112,7 +112,6 @@ export interface CodeStylerSettings {
 	decoratePrint: boolean;
 	excludedLanguages: string;
 	excludedCodeblocks: string;
-	specialLanguages: Array<string>; //TODO (@mayurankv) Delete after 1.0.9 released
 	redirectLanguages: Record<string,{colour?: Colour, icon?: string}>;
 	version: string;
 }
@@ -311,12 +310,11 @@ export const DEFAULT_SETTINGS: CodeStylerSettings = {
 	decoratePrint: true,
 	excludedLanguages: "ad-*",
 	excludedCodeblocks: "dataview, dataviewjs, math",
-	specialLanguages: [], //TODO (@mayurankv) Delete after 1.0.9 released
 	redirectLanguages: {},
 	version: "1.0.9",
 };
 
-function convertSettings(settings: CodeStylerSettings): CodeStylerSettings { //TODO (@mayurankv) Add to `main.ts` after 1.0.9 released
+export function convertSettings(settings: CodeStylerSettings): CodeStylerSettings {
 	if (typeof settings?.version === "undefined")
 		return settingsClear();
 	while (semverNewer(DEFAULT_SETTINGS.version,settings.version)) {

diff --git a/src/main.ts b/src/main.ts
@@ -1,6 +1,6 @@
 import { Plugin, MarkdownView, WorkspaceLeaf } from "obsidian";
 
-import { DEFAULT_SETTINGS, LANGUAGE_ICONS_DATA, CodeStylerSettings } from "./Settings";
+import { convertSettings, DEFAULT_SETTINGS, LANGUAGE_ICONS_DATA, CodeStylerSettings } from "./Settings";
 import { SettingsTab } from "./SettingsTab";
 import { removeStylesAndClasses, updateStyling } from "./ApplyStyling";
 import { createCodeblockCodeMirrorExtensions, editingDocumentFold } from "./EditingView";
@@ -108,7 +108,7 @@ export default class CodeStylerPlugin extends Plugin {
 	}
 
 	async loadSettings() {
-		this.settings = Object.assign({},structuredClone(DEFAULT_SETTINGS),await this.loadData());
+		this.settings = Object.assign({},structuredClone(DEFAULT_SETTINGS),convertSettings(await this.loadData()));
 	}
 
 	async saveSettings() {