refactor(*): use prettier refactor

main.ts

@@ -1,17 +1,29 @@
 import { App, Plugin, PluginSettingTab, Setting, MarkdownView } from 'obsidian';
-import formatUtil from './formatUtil';
+// @ts-ignore
+import prettier from 'prettier/esm/standalone';
+// @ts-ignore
+import markdownParser from 'prettier/esm/parser-markdown';
+
+const { format } = prettier;
 
 export default class Pangu extends Plugin {
  format(cm: CodeMirror.Editor): void {
  let cursor = cm.getCursor();
  let cursorContent = cm.getRange({ ...cursor, ch: 0 }, cursor);
  const { top } = cm.getScrollInfo();
 
- cursorContent = formatUtil.formatContent(cursorContent);
+ // cursorContent = formatUtil.formatContent(cursorContent);
+ cursorContent = format(cursorContent, {
+ parser: 'markdown',
+ plugins: [markdownParser]
+ });
 
  let content = cm.getValue().trim();
- content = content + '\n\n';
- content = formatUtil.formatContent(content);
+ // content = formatUtil.formatContent(content);
+ content = format(content, {
+ parser: 'markdown',
+ plugins: [markdownParser]
+ })
 
  cm.setValue(content);
 
@@ -24,7 +36,7 @@ export default class Pangu extends Plugin {
  ...cursor,
  ch: newDocLine.indexOf(cursorContent) + cursorContent.length,
  };
- } catch (error) {}
+ } catch (error) { }
 
  cm.setCursor(cursor);
  }
@@ -60,7 +72,7 @@ export default class Pangu extends Plugin {
  console.log('unloading plugin');
  }
 
- async loadSettings() {}
+ async loadSettings() { }
 }
 
 class PanguSettingTab extends PluginSettingTab {

package.json

@@ -23,7 +23,10 @@
  "rollup": "^2.32.1",
  "semver": "^7.3.5",
  "tslib": "^2.0.3",
- "typescript": "^4.0.3"
+ "typescript": "^4.0.3",
+ "@types/prettier": "^2.7.1"
  },
- "dependencies": {}
+ "dependencies": {
+ "prettier": "^2.7.1"
+ }
 }

rollup.config.js

@@ -1,5 +1,5 @@
 import typescript from '@rollup/plugin-typescript';
-import {nodeResolve} from '@rollup/plugin-node-resolve';
+import { nodeResolve } from '@rollup/plugin-node-resolve';
 import commonjs from '@rollup/plugin-commonjs';
 
 export default {
@@ -8,12 +8,8 @@ export default {
  dir: '.',
  sourcemap: 'inline',
  format: 'cjs',
- exports: 'default'
+ exports: 'default',
  },
  external: ['obsidian'],
- plugins: [
- typescript(),
- nodeResolve({browser: true}),
- commonjs(),
- ]
-};
+ plugins: [typescript(), nodeResolve({ browser: true }), commonjs()],
+};

tsconfig.json

@@ -9,14 +9,7 @@
  "noImplicitAny": true,
  "moduleResolution": "node",
  "importHelpers": true,
- "lib": [
- "dom",
- "es5",
- "scripthost",
- "es2015"
- ]
+ "lib": ["dom", "es5", "scripthost", "es2015"]
  },
- "include": [
- "**/*.ts"
- ]
+ "include": ["**/*.ts"]
 }

yarn.lock

@@ -76,6 +76,11 @@
  resolved "https://registry.npmjs.org/@types/pangu/-/pangu-3.3.0.tgz#dceeaabd0ba64e1721b3ccd6b950ef6b7ecff3ef"
  integrity sha512-uD56QlIuQJvfO9sMJKTkJleWyMhZ//TPO0/WmVIwCTomCHZzllm/KZOaN4Og6R7EJXU5sIMunexTqyxy9bCT/g==
 
+"@types/prettier@^2.7.1":
+ version "2.7.1"
+ resolved "https://registry.npmmirror.com/@types/prettier/-/prettier-2.7.1.tgz#dfd20e2dc35f027cdd6c1908e80a5ddc7499670e"
+ integrity sha512-ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow==
+
 "@types/[email protected]":
  version "1.17.1"
  resolved "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6"
@@ -304,6 +309,11 @@ picomatch@^2.2.2:
  resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
+prettier@^2.7.1:
+ version "2.7.1"
+ resolved "https://registry.npmmirror.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
+ integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
+
 resolve@^1.17.0:
  version "1.22.1"
  resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"