Merge pull request #70 from RyotaUshio/cleanup-before-release-0.2.0

cleanup, dependency resolution

package.json

@@ -23,6 +23,7 @@
 	},
 	"dependencies": {
 		"@lezer/common": "^1.0.3",
+		"@codemirror/language": "^6.0.0",
 		"yaml": "^2.3.1"
 	}
 }

src/callout_view.ts

@@ -1,12 +1,9 @@
-import { Extension } from '@codemirror/state';
-import { Transaction } from '@codemirror/state';
-import { StateField } from '@codemirror/state';
-import { syntaxTree } from '@codemirror/language';
-import { RangeSetBuilder } from '@codemirror/state';
-import { EditorState } from '@codemirror/state';
-import { Decoration, DecorationSet, EditorView, WidgetType } from "@codemirror/view";
-import { SyntaxNodeRef } from '@lezer/common';
 import { finishRenderMath, renderMath } from "obsidian";
+import { Extension, Transaction, StateField, RangeSetBuilder, EditorState } from '@codemirror/state';
+import { Decoration, DecorationSet, EditorView, WidgetType } from "@codemirror/view";
+import { syntaxTree } from '@codemirror/language';
+
+import { nodeText } from 'utils';
 
 
 const DISPLAY_MATH_BEGIN = "formatting_formatting-math_formatting-math-begin_keyword_math_math-block";
@@ -139,10 +136,6 @@ function getMathInfos(state: EditorState): MathInfo[] {
     return mathInfos;
 }
 
-function nodeText(node: SyntaxNodeRef, state: EditorState): string {
-    return state.sliceDoc(node.from, node.to);
-}
-
 function isInBlockquoteOrCallout(state: EditorState): boolean {
     let cursor = state.selection.ranges[0].head;
     let tree = syntaxTree(state);

src/math_callout_title_hider.ts

@@ -1,14 +1,10 @@
-import { mathCalloutTitlePlulgin } from 'math_callouts_view';
 import { RangeSetBuilder } from '@codemirror/state';
 import { syntaxTree } from "@codemirror/language";
 import { Decoration, DecorationSet, EditorView, MatchDecorator, PluginValue, ViewPlugin, ViewUpdate, WidgetType } from "@codemirror/view"
 import { MATH_CALLOUT_PATTERN, formatTitleWithoutSubtitle, matchMathCallout, readMathCalloutMetadata, readMathCalloutSettingsAndTitle } from "autoIndex"
 import MathPlugin from "main";
-import { SmartCalloutModal } from "modals";
 import { App, Editor, MarkdownView, TFile } from "obsidian";
-import { MathSettings } from "settings";
-import { formatTitle, overwriteMathCalloutMetadata, resolveSettings } from "smart_callouts";
-import { nodeText, renderTextWithMath } from "utils";
+import { nodeText } from 'utils';
 
 
 export const MATH_CALLOUT_PATTERN_GLOBAL = new RegExp(MATH_CALLOUT_PATTERN.source, "g");

src/modals.ts

@@ -69,18 +69,16 @@ abstract class MathSettingModal<SettingsType> extends Modal {
 
 
 export class MathCalloutModal extends MathSettingModal<MathSettings> {
-
     constructor(
         app: App,
         plugin: MathPlugin,
         public view: MarkdownView,
         callback: (settings: MathSettings) => void,
-        public buttonText?: string,
-        public headerText?: string, 
+        public buttonText: string,
+        public headerText: string, 
         currentCalloutSettings?: CalloutSettings,
     ) {
         super(app, plugin, callback, currentCalloutSettings);
-        this.buttonText = buttonText ?? "Insert";
     }
 
 

src/utils.ts

@@ -1,3 +1,5 @@
+import { EditorState } from '@codemirror/state';
+import { SyntaxNodeRef } from '@lezer/common';
 
 // Generic utility functions handing files.
 
@@ -203,6 +205,10 @@ export function insertAfter(referenceNode: HTMLElement, newNode: HTMLElement) {
     referenceNode.parentNode?.insertBefore(newNode, referenceNode.nextSibling);
 }
 
+export function nodeText(node: SyntaxNodeRef, state: EditorState): string {
+    return state.sliceDoc(node.from, node.to);
+}
+
 const ROMAN = ["", "C", "CC", "CCC", "CD", "D", "DC", "DCC", "DCCC", "CM",
     "", "X", "XX", "XXX", "XL", "L", "LX", "LXX", "LXXX", "XC",
     "", "I", "II", "III", "IV", "V", "VI", "VII", "VIII", "IX"];
@@ -239,4 +245,4 @@ export const CONVERTER = {
     "Alph": toAlphUpper, 
     "roman": toRomanLower, 
     "Roman": toRomanUpper,
-}
+}