From 36a632f218f2358864af9bd8d7b4369e9d2ec65e Mon Sep 17 00:00:00 2001
From: Riccardo <code@riccardoferretti.com>
Date: Sun, 3 Jan 2021 18:35:33 +0100
Subject: [PATCH] consolidated prettier configuration in root package.json file
 (#429)

also fixed linting and consolidated .gitignore and moved .editorconfig
---
 packages/foam-vscode/.editorconfig => .editorconfig   | 0
 packages/foam-vscode/.eslintrc.json => .eslintrc.json | 0
 .gitignore                                            | 1 +
 .vscode/settings.json                                 | 5 ++++-
 packages/foam-core/src/bootstrap.ts                   | 2 +-
 packages/foam-core/src/services/datastore.ts          | 2 +-
 packages/foam-core/test/core.test.ts                  | 4 ++--
 packages/foam-core/test/markdown-provider.test.ts     | 2 +-
 packages/foam-vscode/.gitignore                       | 3 ---
 packages/foam-vscode/.prettierrc                      | 3 ---
 prettier.config.js                                    | 6 ------
 11 files changed, 10 insertions(+), 18 deletions(-)
 rename packages/foam-vscode/.editorconfig => .editorconfig (100%)
 rename packages/foam-vscode/.eslintrc.json => .eslintrc.json (100%)
 delete mode 100644 packages/foam-vscode/.gitignore
 delete mode 100644 packages/foam-vscode/.prettierrc
 delete mode 100644 prettier.config.js

diff --git a/packages/foam-vscode/.editorconfig b/.editorconfig
similarity index 100%
rename from packages/foam-vscode/.editorconfig
rename to .editorconfig
diff --git a/packages/foam-vscode/.eslintrc.json b/.eslintrc.json
similarity index 100%
rename from packages/foam-vscode/.eslintrc.json
rename to .eslintrc.json
diff --git a/.gitignore b/.gitignore
index ffe1b9f8..2ca25d41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ node_modules
 *.tsbuildinfo
 *.vsix
 *.log
+out
 dist
 docs/_site
 docs/.sass-cache
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5f086aa3..47c076e5 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -17,5 +17,8 @@
         "**/_layouts/**/*",
         "**/_site/**/*",
         "**/node_modules/**/*"
-    ]
+    ],
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true,
+    "prettier.requireConfig": true
 }
\ No newline at end of file
diff --git a/packages/foam-core/src/bootstrap.ts b/packages/foam-core/src/bootstrap.ts
index d9a58380..4bfad583 100644
--- a/packages/foam-core/src/bootstrap.ts
+++ b/packages/foam-core/src/bootstrap.ts
@@ -36,7 +36,7 @@ export const bootstrap = async (config: FoamConfig, services: Services) => {
     const content = await services.dataStore.read(uri);
     graph.setNote(await parser.parse(uri, content));
   });
-  services.dataStore.onDidDelete(async uri => {
+  services.dataStore.onDidDelete(uri => {
     graph.deleteNote(uri);
   });
 
diff --git a/packages/foam-core/src/services/datastore.ts b/packages/foam-core/src/services/datastore.ts
index c7c1ead6..0dcf6c05 100644
--- a/packages/foam-core/src/services/datastore.ts
+++ b/packages/foam-core/src/services/datastore.ts
@@ -105,7 +105,7 @@ export class FileDataStore implements IDataStore, IDisposable {
 
     if (isSome(watcher)) {
       this._disposables.push(
-        watcher.onDidCreate(async uri => {
+        watcher.onDidCreate(uri => {
           if (this.isMatch(uri)) {
             Logger.info(`Created: ${uri.path}`);
             this.onDidCreateEmitter.fire(uri);
diff --git a/packages/foam-core/test/core.test.ts b/packages/foam-core/test/core.test.ts
index 8a92db26..91ecd2fe 100644
--- a/packages/foam-core/test/core.test.ts
+++ b/packages/foam-core/test/core.test.ts
@@ -308,7 +308,7 @@ describe('graph events', () => {
     const graph = new NoteGraph();
     const callback = jest.fn();
     const listener = graph.onDidDeleteNote(callback);
-    const note = graph.setNote(
+    graph.setNote(
       createTestNote({ uri: '/dir1/page-a.md', title: 'My Title' })
     );
     graph.deleteNote(strToUri('non-existing-note'));
@@ -357,7 +357,7 @@ describe('graph events', () => {
 });
 
 describe('graph middleware', () => {
-  it('can intercept calls to the graph', async () => {
+  it('can intercept calls to the graph', () => {
     const graph = createGraph([
       next => ({
         setNote: note => {
diff --git a/packages/foam-core/test/markdown-provider.test.ts b/packages/foam-core/test/markdown-provider.test.ts
index 747df7e6..c6b8c23c 100644
--- a/packages/foam-core/test/markdown-provider.test.ts
+++ b/packages/foam-core/test/markdown-provider.test.ts
@@ -306,7 +306,7 @@ describe('parser plugins', () => {
   };
   const parser = createMarkdownParser([testPlugin]);
 
-  it('can augment the parsing of the file', async () => {
+  it('can augment the parsing of the file', () => {
     const note1 = parser.parse(
       URI.file('/path/to/a'),
       `
diff --git a/packages/foam-vscode/.gitignore b/packages/foam-vscode/.gitignore
deleted file mode 100644
index 4e30e36a..00000000
--- a/packages/foam-vscode/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-out
-.vscode-test/
-*.vsix
diff --git a/packages/foam-vscode/.prettierrc b/packages/foam-vscode/.prettierrc
deleted file mode 100644
index 75fa1341..00000000
--- a/packages/foam-vscode/.prettierrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "tabWidth": 2
-}
diff --git a/prettier.config.js b/prettier.config.js
deleted file mode 100644
index f1284c64..00000000
--- a/prettier.config.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = {
-  trailingComma: 'es5',
-  tabWidth: 2,
-  semi: true,
-  singleQuote: true,
-};