v0.24.0

* Turning backlinks panel to connections panel

* Added support for filter commands

* Fixed broken imports that were driving tests nuts

* Do not register connections.* commands during test

.all-contributorsrc

@@ -1004,6 +1004,33 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "Skakerman",
+      "name": "Scott Akerman",
+      "avatar_url": "https://avatars.githubusercontent.com/u/15224439?v=4",
+      "profile": "http://scottakerman.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "jimgraham",
+      "name": "Jim Graham",
+      "avatar_url": "https://avatars.githubusercontent.com/u/430293?v=4",
+      "profile": "http://www.jim-graham.net/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "hezhizhen",
+      "name": "Zhizhen He",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7611700?v=4",
+      "profile": "https://t.me/littlepoint",
+      "contributions": [
+        "tool"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.eslintrc.json

@@ -6,21 +6,22 @@
     "sourceType": "module"
   },
   "env": { "node": true, "es6": true },
-  "plugins": ["@typescript-eslint", "import", "jest"],
+  "plugins": ["jest"],
   "extends": [
     "eslint:recommended",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:import/recommended",
     "plugin:import/typescript",
     "plugin:jest/recommended"
   ],
   "rules": {
+    "no-redeclare": "off",
+    "no-unused-vars": "off",
     "no-use-before-define": "off",
     "@typescript-eslint/no-use-before-define": "off",
     "@typescript-eslint/no-explicit-any": "off",
     "@typescript-eslint/no-non-null-assertion": "off",
     "@typescript-eslint/explicit-function-return-type": "off",
     "@typescript-eslint/interface-name-prefix": "off",
+    "@typescript-eslint/no-unused-vars": "warn",
     "import/no-extraneous-dependencies": [
       "error",
       {

.github/workflows/ci.yml

@@ -9,18 +9,28 @@ on:
       - master
 
 jobs:
+  typos-check:
+    name: Spell Check with Typos
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Actions Repository
+        uses: actions/checkout@v3
+      - name: Check spelling with custom config file
+        uses: crate-ci/typos@v1.14.8
+        with:
+          config: ./typos.toml
   lint:
     name: Lint
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v1
       - name: Setup Node
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
-          node-version: '12'
+          node-version: '18'
       - name: Restore Dependencies and VS Code test instance
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             node_modules
@@ -34,21 +44,22 @@ jobs:
 
   test:
     name: Build and Test
-    strategy:
-      matrix:
-        os: [macos-10.15, ubuntu-18.04, windows-2019]
-    runs-on: ${{ matrix.os }}
-    env:
-      OS: ${{ matrix.os }}
+    # strategy:
+    #   matrix:
+    #     os: [macos-12, ubuntu-22.04, windows-2022]
+    # runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-22.04
+    # env:
+    #   OS: ${{ matrix.os }}
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v1
       - name: Setup Node
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
-          node-version: '12'
+          node-version: '18'
       - name: Restore Dependencies and VS Code test instance
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             node_modules

.github/workflows/update-docs.yml

@@ -0,0 +1,43 @@
+name: Update Docs
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - docs/user/**/*
+  workflow_dispatch:
+
+jobs:
+  update-docs:
+    runs-on: ubuntu-22.04
+    timeout-minutes: 10
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          repository: foambubble/foam-template
+          path: foam-template
+      - uses: actions/checkout@v3
+        with:
+          path: foam
+      - name: Copy and fixup user docs files          
+        id: copy
+        run: |
+          rm -r foam-template/docs
+          cp -r foam/docs/user foam-template/docs
+
+          # Strip autogenerated wikileaks references because
+          # they are not an appropriate default user experience.
+          (cd foam-template/docs; sed -i '/\[\/\/begin\]/,/\[\/\/end\]/d' $(find . -type f -name \*.md))
+
+          # Set the commit message format
+          echo "message=Docs sync @ $(cd foam; git log --pretty='format:%h %s')" >> $GITHUB_OUTPUT
+      - uses: peter-evans/create-pull-request@v4
+        with:
+          token: ${{ secrets.FOAM_DOCS_SYNC_TOKEN }}
+          path: foam-template
+          commit-message: ${{ steps.copy.outputs.message }}
+          branch: bot/foam-docs-sync
+          delete-branch: true
+          title: Sync docs from foam
+          body: Copy docs from main foam repo

docs/dev/proposals/inclusion-of-notes.md

@@ -14,7 +14,7 @@ Currently it is not possible within Foam to include other notes into a note. Nex
 
 Initial work and thought on including a note was ignited by issue [#652](https://github.com/foambubble/foam/issues/652). Requested by a user was a likewise functionality as offered in Obsidian. This was simply the ability to include a note.
 
-Whilst researching digital gardening for my own setup, I came across an in-depth overview by [Maggie Appleton](https://maggieappleton.com/roam-garden). Showing examples of her personal Roam Research I see valuable possibilites to connect more information, if we would add additional functionalities to the possibility of including a note. This proposal displays these possible functionalities and markup.
+Whilst researching digital gardening for my own setup, I came across an in-depth overview by [Maggie Appleton](https://maggieappleton.com/roam-garden). Showing examples of her personal Roam Research I see valuable possibilities to connect more information, if we would add additional functionalities to the possibility of including a note. This proposal displays these possible functionalities and markup.
 
 ## New features
 
@@ -29,7 +29,7 @@ The minimal functionality is the ability to fully include a note. Markup used in
 
 ### Include a section of a note
 
-It could be interesting to only include a section of a note instead of the entire note. In order to do so thse user should be able to use the following syntax:
+It could be interesting to only include a section of a note instead of the entire note. In order to do so the user should be able to use the following syntax:
 
 `![[wikilink#section-b]]`
 
@@ -37,11 +37,11 @@ As a result it will include the section title + section content until the next s
 
 ### Include an attribute of a file (note property or frontmatter)
 
-As a user I could be interested in collecting the value of any given proeprty for a note. For example, I might want to include the tags as defined in the frontmatter of note A. This should be possible via the syntax:
+As a user I could be interested in collecting the value of any given property for a note. For example, I might want to include the tags as defined in the frontmatter of note A. This should be possible via the syntax:
 
 `![[wikilink:<property>]]`
 
-The property value should be lookedup by foam defined properties, e.g. title, **or** any property defined in the frontmatter of a note.
+The property value should be looked up by foam defined properties, e.g. title, **or** any property defined in the frontmatter of a note.
 
 So, the example of including the tags of a note should be:
 

docs/dev/proposals/link-reference-definition-improvements.md

@@ -117,7 +117,7 @@ The potential solution:
     enum LinkReferenceDefinitions {
       Off,               // link reference definitions are not generated
       WithExtensions,    // link reference definitions contain .md (or similar) file extensions
-      WithoutExtensions  // link reference definitions do not contain file extenions
+      WithoutExtensions  // link reference definitions do not contain file extensions
     }
 
     ```

docs/dev/releasing-foam.md

@@ -20,6 +20,6 @@
    - select "tags" in top left
    - select the tag that was just released, click "edit" and copy release information from changelog
    - publish (no need to attach artifacts)
-8. Annouce on Discord
+8. Announce on Discord
 
-Steps 1 to 6 should really be replaced by a GitHub action...
+Steps 1 to 6 should really be replaced by a GitHub action...

docs/index.md

@@ -247,6 +247,9 @@ If that sounds like something you're interested in, I'd love to have you along o
       <td align="center" valign="top" width="14.28%"><a href="http://jonathanpberger.com/"><img src="https://avatars.githubusercontent.com/u/41085?v=4?s=60" width="60px;" alt="jonathan berger"/><br /><sub><b>jonathan berger</b></sub></a><br /><a href="https://github.com/foambubble/foam/commits?author=jonathanpberger" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/badsketch"><img src="https://avatars.githubusercontent.com/u/8953212?v=4?s=60" width="60px;" alt="Daniel Wang"/><br /><sub><b>Daniel Wang</b></sub></a><br /><a href="https://github.com/foambubble/foam/commits?author=badsketch" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://yongliangliu.com"><img src="https://avatars.githubusercontent.com/u/41845017?v=4?s=60" width="60px;" alt="Liu YongLiang"/><br /><sub><b>Liu YongLiang</b></sub></a><br /><a href="https://github.com/foambubble/foam/commits?author=tlylt" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://scottakerman.com"><img src="https://avatars.githubusercontent.com/u/15224439?v=4?s=60" width="60px;" alt="Scott Akerman"/><br /><sub><b>Scott Akerman</b></sub></a><br /><a href="https://github.com/foambubble/foam/commits?author=Skakerman" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://www.jim-graham.net/"><img src="https://avatars.githubusercontent.com/u/430293?v=4?s=60" width="60px;" alt="Jim Graham"/><br /><sub><b>Jim Graham</b></sub></a><br /><a href="https://github.com/foambubble/foam/commits?author=jimgraham" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://t.me/littlepoint"><img src="https://avatars.githubusercontent.com/u/7611700?v=4?s=60" width="60px;" alt="Zhizhen He"/><br /><sub><b>Zhizhen He</b></sub></a><br /><a href="#tool-hezhizhen" title="Tools">🔧</a></td>
     </tr>
   </tbody>
 </table>

docs/user/features/commands.md

@@ -2,23 +2,26 @@
 
 Foam has various commands that you can explore by calling the command palette and typing "Foam".
 
-In particular, some commands can be very customizible and can help with custom workflows and use cases.
+In particular, some commands can be very customizable and can help with custom workflows and use cases.
 
 ## foam-vscode.create-note command
 
 This command creates a note.
 Although it works fine on its own, it can be customized to achieve various use cases.
 Here are the settings available for the command:
--  notePath: The path of the note to create. If relative it will be resolved against the workspace root.
+
+- notePath: The path of the note to create. If relative it will be resolved against the workspace root.
 - templatePath: The path of the template to use. If relative it will be resolved against the workspace root.
+- title: The title of the note (that is, the `FOAM_TITLE` variable)
 - text: The text to use for the note. If also a template is provided, the template has precedence
-- variables: Variables to use in the text or template (e.g. `FOAM_TITLE`)
-- date: The date used to resolve the FOAM_DATE_* variables. in `YYYY-MM-DD` format
+- variables: Variables to use in the text or template
+- date: The date used to resolve the FOAM*DATE*\* variables. in `YYYY-MM-DD` format
 - onFileExists?: 'overwrite' | 'open' | 'ask' | 'cancel': What to do in case the target file already exists
 
 To customize a command and associate a key binding to it, open the key binding settings and add the appropriate configuration, here are some examples:
 
 - Create a note called `test note.md` with some text. If the note already exists, ask for a new name
+
 ```
 {
   "key": "alt+f",
@@ -32,6 +35,7 @@ To customize a command and associate a key binding to it, open the key binding s
 ```
 
 - Create a note following the `weekly-note.md` template. If the note already exists, open it
+
 ```
 {
   "key": "alt+g",
@@ -43,3 +47,27 @@ To customize a command and associate a key binding to it, open the key binding s
 }
 ```
 
+## foam-vscode.open-resource command
+
+This command opens a resource.
+
+Normally it receives a `URI`, which identifies the resource to open.
+
+It is also possible to pass in a filter, which will be run against the workspace resources to find one or more matches.
+
+- If there is one match, it will be opened
+- If there is more than one match, a quick pick will show up allowing the user to select the desired resource
+
+Examples:
+
+```
+{
+  "key": "alt+f",
+  "command": "foam-vscode.open-resource",
+  "args": {
+    "filter": {
+      "title": "Weekly Note*"
+    }
+  }
+}
+```

docs/user/features/graph-visualization.md

@@ -62,7 +62,7 @@ It is possible to customize the style of a node based on the `type` property in
 
 There are a few default node types defined by Foam that are displayed in the graph:
 
-- `note` defines the color for regular nodes whose documents have not overriden the `type` property.
+- `note` defines the color for regular nodes whose documents have not overridden the `type` property.
 - `placeholder` defines the color for links that don't match any existing note. This is a [[placeholder]] because no file with such name exists.
   - see [[wikilinks]] for more info <!--NOTE: this placeholder link should NOT have an associated file. This is to demonstrate the custom coloring-->
 - `tag` defines the color for nodes representing #tags, allowing tags to be used as graph nodes similar to backlinks.

docs/user/features/including-notes.md

@@ -4,7 +4,7 @@ In some situations it might be useful to include the content of another note in
 
 ## Including a note
 
-Including a note can be done by adding an `!` before a wikilink defintion. For example `![[wikilink]]`.
+Including a note can be done by adding an `!` before a wikilink definition. For example `![[wikilink]]`.
 
 ## Custom styling
 

docs/user/features/link-reference-definitions.md

@@ -19,6 +19,7 @@ The following example:
   ```
 
 You can open the [raw markdown](https://foambubble.github.io/foam/features/link-reference-definitions.md) to see them at the bottom of this file
+You can open the [raw markdown](https://foambubble.github.io/foam/user/features/link-reference-definitions.md) to see them at the bottom of this file
 
 ## Specification
 

docs/user/features/note-properties.md

@@ -19,7 +19,7 @@ keywords: hello world, bonjour
 ---
 ```
 
-This sets the `type` of this document to `feature` and sets **three** keywords for the document: `hello`, `world`, and `bonjour`. The YAML parser will treat both spaces and commas as the seperators for these YAML properties. If you want to use multi-word values for these properties, you will need to combine the words with dashes or underscores (i.e. instead of `hello world`, use `hello_world` or `hello-world`).
+This sets the `type` of this document to `feature` and sets **three** keywords for the document: `hello`, `world`, and `bonjour`. The YAML parser will treat both spaces and commas as the separators for these YAML properties. If you want to use multi-word values for these properties, you will need to combine the words with dashes or underscores (i.e. instead of `hello world`, use `hello_world` or `hello-world`).
 
 > You can set as many custom properties for a document as you like, but there are a few [special properties](#special-properties) defined by Foam.
 
@@ -27,11 +27,11 @@ This sets the `type` of this document to `feature` and sets **three** keywords f
 
 Some properties have special meaning for Foam:
 
-| Name                 | Description        |
-| -------------------- | ------------------- |
-| `title` | will assign the name to the note that you will see in the graph, regardless of the filename or the first heading (also see how to [[write-notes-in-foam]])      |
-| `type`         | can be used to style notes differently in the graph (also see [[graph-visualization]]). The default type for a document is `note` unless otherwise specified with this property.       |
-| `tags`          | can be used to add tags to a note (see [[tags]])      |
+| Name    | Description                                                                                                                                                                      |
+| ------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `title` | will assign the name to the note that you will see in the graph, regardless of the filename or the first heading (also see how to [[write-notes-in-foam]])                       |
+| `type`  | can be used to style notes differently in the graph (also see [[graph-visualization]]). The default type for a document is `note` unless otherwise specified with this property. |
+| `tags`  | can be used to add tags to a note (see [[tags]])                                                                                                                                 |
 
 For example:
 

docs/user/features/resource-filters.md

@@ -0,0 +1,42 @@
+# Resource Filters
+
+Resource filters can be passed to some Foam commands to limit their scope.
+
+A filter supports the following parameters:
+
+- `tag`: include a resource if it has the given tag (e.g. `{"tag": "#research"}`)
+- `type`: include a resource if it is of the given type (e.g. `{"type": "daily-note"}`)
+- `path`: include a resource if its path matches the given regex (e.g. `{"path": "/projects/*"}`). **Note that this parameter supports regex and not globs.**
+- `expression`: include a resource if it makes the given expression `true`, where `resource` represents the resource being evaluated (e.g. `{"expression": "resource.type ==='weekly-note'"}`)
+- `title`: include a resource if the title matches the given regex (e.g. `{"title": "Team meeting:*"}`)
+
+A filter also supports some logical operators:
+
+- `and`: include a resource if it matches all the sub-parameters (e.g `{"and": [{"tag": "#research"}, {"title": "Paper *"}]}`)
+- `or`: include a resource if it matches any of the sub-parameters (e.g `{"or": [{"tag": "#research"}, {"title": "Paper *"}]}`)
+- `not`: invert the result of the nested filter (e.g. `{"not": {"type": "daily-note"}}`)
+
+Here is an example of a complex filter, for example to show the Foam graph only of a subset of the workspace:
+
+```
+{
+  "key": "alt+f",
+  "command": "foam-vscode.show-graph",
+  "args": {
+    "filter": {
+      "and": [
+        {
+          "or": [
+            { "type": 'daily-note' },
+            { "type": 'weekly-note' },
+            { "path": '/projects/*' },
+          ],
+          "not": {
+            { "tag": '#b' },
+          },
+        },
+      ],
+    }
+  }
+}
+```

docs/user/features/tags.md

@@ -15,6 +15,10 @@ There are two ways of creating a tag:
 
 Tags can also be hierarchical, so you can have `#parent/child` such as #my-tag3/info.
 
+### Tag completion
+
+Typing the `#` character will launch VS Code's "Intellisense." This provider will show a list of possible tags that match the character. If you are editing in the frontmatter [[note-properties|note property]], you can invoke tag completion on the `tags:` line by either typing the `#` character, or using the ["trigger suggest"](https://code.visualstudio.com/docs/editor/intellisense) keybinding (usually `ctrl+space`). If the `#` is used in the frontmatter, it will be removed when the tag is inserted.
+
 ## Using *Tag Explorer*
 
 It's possible to navigate tags via the Tag Explorer panel. Expand the Tag Explorer view in the left side bar which will list all the tags found in current Foam environment. Then, each level of tags can be expanded until the options to search by tag and a list of all files containing a particular tag are shown.
@@ -33,7 +37,7 @@ It is possible to customize the way that tags look in the Markdown Preview panel
 
 > Note: the file path for the stylesheet will be relative to the currently open folder in the workspace when changing this setting for the current workspace. If changing this setting for the user, then the file path will be relative to your global [VSCode settings](https://code.visualstudio.com/docs/getstarted/settings).
 
-The end result will be a CSS file that looks similiar to the content below. Now you can make your tags standout in your note previews.
+The end result will be a CSS file that looks similar to the content below. Now you can make your tags standout in your note previews.
 
 ```css
 .foam-tag{
@@ -49,7 +53,10 @@ The end result will be a CSS file that looks similiar to the content below. Now
 Given the power of backlinks, some people prefer to use them as tags.
 For example you can tag your notes about books with [[book]].
 
+[note-properties|note property]: note-properties.md "Note Properties"
+[graph-visualization]: graph-visualization.md "Graph Visualization"
+
 [//begin]: # "Autogenerated link references for markdown compatibility"
 [note-properties|note property]: note-properties.md "Note Properties"
 [graph-visualization]: graph-visualization.md "Graph Visualization"
-[//end]: # "Autogenerated link references"
+[//end]: # "Autogenerated link references"

docs/user/frequently-asked-questions.md

@@ -5,6 +5,7 @@
 - [Frequently Asked Questions](#frequently-asked-questions)
   - [Links/Graphs/BackLinks don't work. How do I enable them?](#linksgraphsbacklinks-dont-work-how-do-i-enable-them)
   - [I don't want Foam enabled for all my workspaces](#i-dont-want-foam-enabled-for-all-my-workspaces)
+  - [I want to publish the graph view to GitHub pages or Vercel](#i-want-to-publish-the-graph-view-to-github-pages-or-vercel)
 
 ## Links/Graphs/BackLinks don't work. How do I enable them?
 

docs/user/index.md

@@ -1,8 +1,10 @@
 # Using Foam
 
-Foam is a collection VS Code extensions and recipes that power up the editor into a full-blown note taking system.
-This folder contains user documentation describing how to get started using Foam, what its main features are, and strategies for getting the most out of Foam.
-The full docs are included in the `foam-template` repo that most users start from.
+Foam is a collection VS Code extensions and recipes that power up the editor
+into a full-blown note taking system. This folder contains user documentation
+describing how to get started using Foam, what its main features are, and
+strategies for getting the most out of Foam. The full docs are included in the
+`foam-template` repo that most users start from.
 
 > See also [[frequently-asked-questions]].
 
@@ -12,7 +14,7 @@ The full docs are included in the `foam-template` repo that most users start fro
 - [[recommended-extensions]]
 - [[creating-new-notes]]
 - [[write-notes-in-foam]]
-- [[sync-notes-with-soruce-control]]
+- [[sync-notes-with-source-control]]
 - [[keyboard-shortcuts]]
 
 ## Features
@@ -55,7 +57,7 @@ See [[publishing]] for more details.
 [recommended-extensions]: getting-started/recommended-extensions.md "Recommended Extensions"
 [creating-new-notes]: getting-started/creating-new-notes.md "Creating New Notes"
 [write-notes-in-foam]: getting-started/write-notes-in-foam.md "Writing Notes"
-[sync-notes-with-soruce-control]: getting-started/sync-notes-with-soruce-control.md "Sync notes with source control"
+[sync-notes-with-source-control]: getting-started/sync-notes-with-source-control.md "Sync notes with source control"
 [keyboard-shortcuts]: getting-started/keyboard-shortcuts.md "Keyboard Shortcuts"
 [wikilinks]: features/wikilinks.md "Wikilinks"
 [tags]: features/tags.md "Tags"

docs/user/publishing/math-support-with-katex.md

@@ -50,7 +50,7 @@ In our case, we'll be using the latter tag to wrap our {% raw %}`{{ content }}`{
 
 You may have noticed that we only made modifications to the template `_layouts/page.html`, which means that `_layouts/home.html` won't have KaTeX support. If you wan't to render math in Foam's home page, you'll need to make the same modifications to `_layouts/home.html` as well.
 
-Finally, if all goes well, then our site hosted on Vercel will support rendering math equations with KaTeX after commiting these changes to GitHub. Here's a demo of the default template with KaTeX support: [Foam Template with KaTeX support](https://foam-template.vercel.app/).
+Finally, if all goes well, then our site hosted on Vercel will support rendering math equations with KaTeX after committing these changes to GitHub. Here's a demo of the default template with KaTeX support: [Foam Template with KaTeX support](https://foam-template.vercel.app/).
 
 [//begin]: # "Autogenerated link references for markdown compatibility"
 [math-support-with-mathjax]: math-support-with-mathjax.md "Math Support"

docs/user/publishing/publish-to-vercel.md

@@ -65,7 +65,7 @@ gem "jekyll-katex"  # Optional, the package that enables KaTeX math rendering
 
 Besides adding the plugin `jekyll-katex` in `_config.yml` and `Gemfile`, we'll also have to follow the guides in [[math-support-with-katex]] to let our site fully support using KaTeX to render math equations.
 
-### Commiting changes to GitHub repo
+### Committing changes to GitHub repo
 
 Finally, commit the newly created files to GitHub.
 

docs/user/recipes/capture-notes-with-shortcuts-and-github-actions.md

@@ -6,7 +6,7 @@ With this #recipe you can create notes on your iOS device, which will automatica
 
 * You use [Foam for VSCode](https://marketplace.visualstudio.com/items?itemName=foam.foam-vscode) to manage your notes
 * You wish to adopt a practice such as [A writing inbox for transient and incomplete notes](https://notes.andymatuschak.org/A%20writing%20inbox%20for%20transient%20and%20incomplete%20notes)
-* You wish to use [Shorcuts](https://support.apple.com/guide/shortcuts/welcome/ios) to capture quick notes into your Foam notes from your iOS device
+* You wish to use [Shortcuts](https://support.apple.com/guide/shortcuts/welcome/ios) to capture quick notes into your Foam notes from your iOS device
 
 ## Other tools
 

docs/user/recipes/take-notes-from-mobile-phone.md

@@ -53,7 +53,7 @@ If such an app was worth building, it would have to have the following features:
 
 - Instant loading and syncing for quick notes
 - Sleek, simple, beautifully designed user experience.
-- Ability to search and navigate forward links and back links (onlly in paid GitJournal version)
+- Ability to search and navigate forward links and back links (only in paid GitJournal version)
 - Killer feature that makes it the best note taking tool for Foam (?)
 
 Given the effort vs reward ratio, it's a low priority for core team, but if someone wants to work on this, we can provide support! Talk to us on the #mobile-apps channel on [Foam Discord](https://foambubble.github.io/join-discord/w).

docs/user/recipes/write-your-notes-in-github-gist.md

@@ -44,7 +44,7 @@ When editing a file, you can easily navigate `[[links]]` by hovering over them t
 
 You can view a page's backlinks using either of the following techniques:
 
-1. Expanding the file's node in the `Repositories` tree, since it's child nodes will represent backlinks. This makes it easy to browse your pages and their backlinks in a single hierachical view.
+1. Expanding the file's node in the `Repositories` tree, since it's child nodes will represent backlinks. This makes it easy to browse your pages and their backlinks in a single hierarchical view.
 
 1. Opening a file, and then viewing it's backlinks list at the bottom of the editor view. This makes it easy to read a page and then see its backlinks in a contextually rich way.
 

lerna.json

@@ -4,5 +4,5 @@
   ],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.20.7"
+  "version": "0.24.0"
 }

package.json

@@ -22,10 +22,10 @@
   },
   "devDependencies": {
     "all-contributors-cli": "^6.16.1",
-    "lerna": "^3.22.1"
+    "lerna": "^6.4.1"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "husky": {
     "hooks": {
@@ -33,6 +33,7 @@
     }
   },
   "prettier": {
+    "arrowParens": "avoid",
     "printWidth": 80,
     "semi": true,
     "singleQuote": true,

packages/foam-vscode/CHANGELOG.md

@@ -4,6 +4,96 @@ All notable changes to the "foam-vscode" extension will be documented in this fi
 
 Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.
 
+## [0.24.0] - 2023-05-19
+
+Features:
+
+- Converted backlinks panel into more general connections panel (#1230)
+
+Internal:
+
+- Improved janitor code (#1228)
+- Refactored code related to tree view panels (#1226)
+- Lint and cleanup (#1224)
+
+## [0.23.0] - 2023-05-06
+
+Features:
+
+- Added notes explorer (#1223)
+
+Fixes and Improvements:
+
+- Enabled tag completion in front matter (#1191 - thanks @jimgraham)
+- Various improvements to tree views (#1220)
+
+## [0.22.2] - 2023-04-20
+
+Fixes and Improvements:
+
+- Support to show placeholders only for open file in panel (#1201, #988)
+- Show note block in panels on hover preview (#1201, #800)
+- Show tag references within tag explorer (#1201)
+- Improved structure of view related commands (#1201)
+- Ignore `.foam` directory
+
+## [0.22.1] - 2023-04-15
+
+Fixes and Improvements:
+
+- Allow the `#` char to trigger tag autocompletion (#1192, #1189 - thanks @jimgraham)
+
+## [0.22.0] - 2023-04-15
+
+Fixes and Improvements:
+
+- Added support for deep tag hierarchy in Tag Explorer panel (#1134, #1194)
+- Consolidated and improved Backlinks, Placeholders and Orphans panels (#1196)
+- Fixed note resolution when using template without defined path (#1197)
+
+## [0.21.4] - 2023-04-14
+
+Fixes and Improvements:
+
+- Fixed issue with generated daily note template due to path escape (#1188, #1190)
+
+## [0.21.3] - 2023-04-12
+
+Fixes and Improvements:
+
+- Fixed relative path from workspace root in templates (#1188)
+
+## [0.21.2] - 2023-04-11
+
+Fixes and Improvements:
+
+- Fixed embed with relative paths (#1168, #1170)
+- Improved multi-root folder support for daily notes (#1126, #1175)
+- Improved use of tag completion (#1183 - thanks @jimgraham)
+- Fixed relative path use in note creation when using templates (#1170)
+
+Internal:
+
+- Sync user docs with foam-template docs (#1180 - thanks @infogulch)
+
+## [0.21.1] - 2023-02-24
+
+Fixes and Improvements:
+
+- Fixed note creation from placeholder (#1172)
+
+## [0.21.0] - 2023-02-16
+
+Features:
+
+- Added support for filters for the `foam-vscode.open-resource` command (#1161)
+
+## [0.20.8] - 2023-02-10
+
+Internal:
+
+- Updated most dependencies (#1160)
+
 ## [0.20.7] - 2023-01-31
 
 Fixes and Improvements:
@@ -58,7 +148,7 @@ Fixes and Improvements:
 
 ## [0.20.0] - 2022-09-30
 
-New Features:
+Features:
 
 - Added `foam-vscode.create-note` command, which can be very customized for several use cases (#1076)
 
@@ -114,7 +204,7 @@ Internal:
 
 ## [0.19.0] - 2022-07-07
 
-New Features:
+Features:
 
 - Support for attachments (PDF) and images (#1027)
 - Support for opening day notes for other days as well (#1026, thanks @alper)
@@ -594,7 +684,7 @@ Fixes and Improvements:
 
 ## [0.7.1] - 2020-11-27
 
-New Feature:
+Features:
 
 - Foam logging can now be inspected in VsCode Output panel (#377)
 
@@ -606,7 +696,7 @@ Fixes and Improvements:
 
 ## [0.7.0] - 2020-11-25
 
-New Features:
+Features:
 
 - Foam stays in sync with changes in notes
 - Dataviz: Added multiple selection in graph (shift+click on node)
@@ -618,7 +708,7 @@ Fixes and Improvements:
 
 ## [0.6.0] - 2020-11-19
 
-New features:
+Features:
 
 - Added command to create notes from templates (#115 - Thanks @ingalless)
 
@@ -633,7 +723,7 @@ Fixes and Improvements:
 
 ## [0.5.0] - 2020-11-09
 
-New features:
+Features:
 
 - Added tags panel (#311)
 
@@ -647,7 +737,7 @@ Fixes and Improvements:
 
 ## [0.4.0] - 2020-10-28
 
-New features:
+Features:
 
 - Added `Foam: Show Graph` command
 - Added date snippets (/+1d, ...) to create wikilinks to dates in daily note format
@@ -675,7 +765,7 @@ Fixes and improvements:
 
 ## [0.3.0] - 2020-07-25
 
-New features:
+Features:
 
 - [Daily Notes](https://foambubble.github.io/foam/daily-notes)
 - [Janitor](https://foambubble.github.io/foam/workspace-janitor) for updating headings and link references across your workspace

packages/foam-vscode/LICENSE

@@ -0,0 +1,33 @@
+The MIT Licence (MIT)
+
+Copyright 2020 - present Jani Eväkallio <jani.evakallio@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicence, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Where noted, some code uses the following license:
+
+MIT License
+
+Copyright (c) 2015 - present Microsoft Corporation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:

packages/foam-vscode/README.md

@@ -2,7 +2,7 @@
 
 [![Version](https://img.shields.io/visual-studio-marketplace/v/foam.foam-vscode)](https://marketplace.visualstudio.com/items?itemName=foam.foam-vscode)
 [![Downloads](https://img.shields.io/visual-studio-marketplace/d/foam.foam-vscode)](https://marketplace.visualstudio.com/items?itemName=foam.foam-vscode)
-[![Installs](https://img.shields.io/visual-studio-marketplace/i/foam.foam-vscode)](https://marketplace.visualstudio.com/items?itemName=foam.foam-vscode)
+[![Visual Studio Marketplace Installs](https://img.shields.io/visual-studio-marketplace/i/foam.foam-vscode?label=VS%20Code%20Installs)](https://marketplace.visualstudio.com/items?itemName=foam.foam-vscode)
 [![Ratings](https://img.shields.io/visual-studio-marketplace/r/foam.foam-vscode)](https://marketplace.visualstudio.com/items?itemName=foam.foam-vscode)
 
 > You can join the Foam Community on the [Foam Discord](https://foambubble.github.io/join-discord/e)

packages/foam-vscode/package.json

@@ -8,7 +8,7 @@
     "type": "git"
   },
   "homepage": "https://github.com/foambubble/foam",
-  "version": "0.20.7",
+  "version": "0.24.0",
   "license": "MIT",
   "publisher": "foam",
   "engines": {
@@ -22,6 +22,12 @@
     "workspaceContains:.vscode/foam.json"
   ],
   "main": "./out/extension.js",
+  "capabilities": {
+    "untrustedWorkspaces": {
+      "supported": "limited",
+      "description": "No expressions are allowed in filters."
+    }
+  },
   "contributes": {
     "markdown.markdownItPlugins": true,
     "markdown.previewStyles": [
@@ -50,28 +56,34 @@
     "views": {
       "explorer": [
         {
-          "id": "foam-vscode.backlinks",
-          "name": "Backlinks",
+          "id": "foam-vscode.connections",
+          "name": "Connections",
           "icon": "$(references)",
-          "contextualTitle": "Backlinks"
+          "contextualTitle": "Foam"
         },
         {
           "id": "foam-vscode.tags-explorer",
           "name": "Tag Explorer",
           "icon": "$(tag)",
-          "contextualTitle": "Tags Explorer"
+          "contextualTitle": "Foam"
+        },
+        {
+          "id": "foam-vscode.notes-explorer",
+          "name": "Notes",
+          "icon": "$(notebook)",
+          "contextualTitle": "Foam"
         },
         {
           "id": "foam-vscode.orphans",
           "name": "Orphans",
           "icon": "$(debug-gripper)",
-          "contextualTitle": "Orphans"
+          "contextualTitle": "Foam"
         },
         {
           "id": "foam-vscode.placeholders",
           "name": "Placeholders",
           "icon": "$(debug-disconnect)",
-          "contextualTitle": "Placeholders"
+          "contextualTitle": "Foam"
         }
       ]
     },
@@ -81,8 +93,8 @@
         "contents": "No tags found. Notes that contain tags will show up here. You may add tags to a note with a hashtag (#tag) or by adding a tag list to the front matter (tags: tag1, tag2)."
       },
       {
-        "view": "foam-vscode.backlinks",
-        "contents": "No backlinks found for selected resource."
+        "view": "foam-vscode.connections",
+        "contents": "Nothing found for the selected resource and the current filter."
       },
       {
         "view": "foam-vscode.orphans",
@@ -90,29 +102,64 @@
       },
       {
         "view": "foam-vscode.placeholders",
-        "contents": "No placeholders found. Pending links and notes without content will show up here."
+        "contents": "No placeholders found for selected resource or workspace."
       }
     ],
     "menus": {
       "view/title": [
         {
-          "command": "foam-vscode.group-orphans-by-folder",
-          "when": "view == foam-vscode.orphans && foam-vscode.orphans-grouped-by-folder == false",
+          "command": "foam-vscode.views.connections.show:backlinks",
+          "when": "view == foam-vscode.connections && foam-vscode.views.connections.show == 'connections'",
           "group": "navigation"
         },
         {
-          "command": "foam-vscode.group-orphans-off",
-          "when": "view == foam-vscode.orphans && foam-vscode.orphans-grouped-by-folder == true",
+          "command": "foam-vscode.views.connections.show:links",
+          "when": "view == foam-vscode.connections && foam-vscode.views.connections.show == 'backlinks'",
           "group": "navigation"
         },
         {
-          "command": "foam-vscode.group-placeholders-by-folder",
-          "when": "view == foam-vscode.placeholders && foam-vscode.placeholders-grouped-by-folder == false",
+          "command": "foam-vscode.views.connections.show:connections",
+          "when": "view == foam-vscode.connections && foam-vscode.views.connections.show == 'links'",
           "group": "navigation"
         },
         {
-          "command": "foam-vscode.group-placeholders-off",
-          "when": "view == foam-vscode.placeholders && foam-vscode.placeholders-grouped-by-folder == true",
+          "command": "foam-vscode.views.orphans.group-by:folder",
+          "when": "view == foam-vscode.orphans && foam-vscode.views.orphans.group-by == 'off'",
+          "group": "navigation"
+        },
+        {
+          "command": "foam-vscode.views.orphans.group-by:off",
+          "when": "view == foam-vscode.orphans && foam-vscode.views.orphans.group-by == 'folder'",
+          "group": "navigation"
+        },
+        {
+          "command": "foam-vscode.views.placeholders.show:for-current-file",
+          "when": "view == foam-vscode.placeholders && foam-vscode.views.placeholders.show == 'all'",
+          "group": "navigation"
+        },
+        {
+          "command": "foam-vscode.views.placeholders.show:all",
+          "when": "view == foam-vscode.placeholders && foam-vscode.views.placeholders.show == 'for-current-file'",
+          "group": "navigation"
+        },
+        {
+          "command": "foam-vscode.views.placeholders.group-by:folder",
+          "when": "view == foam-vscode.placeholders && foam-vscode.views.placeholders.group-by == 'off'",
+          "group": "navigation"
+        },
+        {
+          "command": "foam-vscode.views.placeholders.group-by:off",
+          "when": "view == foam-vscode.placeholders && foam-vscode.views.placeholders.group-by == 'folder'",
+          "group": "navigation"
+        },
+        {
+          "command": "foam-vscode.views.notes-explorer.show:notes",
+          "when": "view == foam-vscode.notes-explorer && foam-vscode.views.notes-explorer.show == 'all'",
+          "group": "navigation"
+        },
+        {
+          "command": "foam-vscode.views.notes-explorer.show:all",
+          "when": "view == foam-vscode.notes-explorer && foam-vscode.views.notes-explorer.show == 'notes-only'",
           "group": "navigation"
         }
       ],
@@ -126,19 +173,47 @@
           "when": "false"
         },
         {
-          "command": "foam-vscode.group-orphans-by-folder",
+          "command": "foam-vscode.views.connections.show:connections",
           "when": "false"
         },
         {
-          "command": "foam-vscode.group-orphans-off",
+          "command": "foam-vscode.views.connections.show:backlinks",
           "when": "false"
         },
         {
-          "command": "foam-vscode.group-placeholders-by-folder",
+          "command": "foam-vscode.views.connections.show:links",
           "when": "false"
         },
         {
-          "command": "foam-vscode.group-placeholders-off",
+          "command": "foam-vscode.views.orphans.group-by:folder",
+          "when": "false"
+        },
+        {
+          "command": "foam-vscode.views.orphans.group-by:off",
+          "when": "false"
+        },
+        {
+          "command": "foam-vscode.views.placeholders.show:for-current-file",
+          "when": "false"
+        },
+        {
+          "command": "foam-vscode.views.placeholders.show:all",
+          "when": "false"
+        },
+        {
+          "command": "foam-vscode.views.placeholders.group-by:folder",
+          "when": "false"
+        },
+        {
+          "command": "foam-vscode.views.placeholders.group-by:off",
+          "when": "false"
+        },
+        {
+          "command": "foam-vscode.views.notes-explorer.show:all",
+          "when": "false"
+        },
+        {
+          "command": "foam-vscode.views.notes-explorer.show:notes",
           "when": "false"
         },
         {
@@ -173,8 +248,8 @@
         "title": "Foam: Show graph"
       },
       {
-        "command": "foam-vscode.update-wikilinks",
-        "title": "Foam: Update Markdown Reference List"
+        "command": "foam-vscode.update-wikilink-definitions",
+        "title": "Foam: Update wikilink definitions"
       },
       {
         "command": "foam-vscode.open-daily-note",
@@ -209,25 +284,60 @@
         "title": "Foam: Open Resource"
       },
       {
-        "command": "foam-vscode.group-orphans-by-folder",
-        "title": "Foam: Group Orphans By Folder",
+        "command": "foam-vscode.views.orphans.group-by:folder",
+        "title": "Group By Folder",
         "icon": "$(list-tree)"
       },
       {
-        "command": "foam-vscode.group-orphans-off",
-        "title": "Foam: Don't Group Orphans",
+        "command": "foam-vscode.views.connections.show:backlinks",
+        "title": "Show Backlinks",
+        "icon": "$(arrow-left)"
+      },
+      {
+        "command": "foam-vscode.views.connections.show:links",
+        "title": "Show Links",
+        "icon": "$(arrow-right)"
+      },
+      {
+        "command": "foam-vscode.views.connections.show:connections",
+        "title": "Show All",
+        "icon": "$(arrow-swap)"
+      },
+      {
+        "command": "foam-vscode.views.orphans.group-by:off",
+        "title": "Flat list",
         "icon": "$(list-flat)"
       },
       {
-        "command": "foam-vscode.group-placeholders-by-folder",
-        "title": "Foam: Group Placeholders By Folder",
+        "command": "foam-vscode.views.placeholders.show:for-current-file",
+        "title": "Show placeholders in current file",
+        "icon": "$(file)"
+      },
+      {
+        "command": "foam-vscode.views.placeholders.show:all",
+        "title": "Show placeholders in workspace",
+        "icon": "$(files)"
+      },
+      {
+        "command": "foam-vscode.views.placeholders.group-by:folder",
+        "title": "Group By Folder",
         "icon": "$(list-tree)"
       },
       {
-        "command": "foam-vscode.group-placeholders-off",
-        "title": "Foam: Don't Group Placeholders",
+        "command": "foam-vscode.views.placeholders.group-by:off",
+        "title": "Flat list",
         "icon": "$(list-flat)"
       },
+      {
+        "command": "foam-vscode.views.notes-explorer.show:all",
+        "title": "Show all resources",
+        "icon": "$(files)"
+      },
+      {
+        "command": "foam-vscode.views.notes-explorer.show:notes",
+        "title": "Show only notes",
+        "icon": "$(file)"
+      },
       {
         "command": "foam-vscode.create-new-template",
         "title": "Foam: Create New Template"
@@ -369,21 +479,6 @@
           "default": [],
           "markdownDescription": "Specifies the list of glob patterns that will be excluded from the orphans report. To ignore the all the content of a given folder, use `**<folderName>/**/*`"
         },
-        "foam.orphans.groupBy": {
-          "type": [
-            "string"
-          ],
-          "enum": [
-            "off",
-            "folder"
-          ],
-          "enumDescriptions": [
-            "Disable grouping",
-            "Group by folder"
-          ],
-          "default": "folder",
-          "markdownDescription": "Group orphans report entries by."
-        },
         "foam.placeholders.exclude": {
           "type": [
             "array"
@@ -391,21 +486,6 @@
           "default": [],
           "markdownDescription": "Specifies the list of glob patterns that will be excluded from the placeholders report. To ignore the all the content of a given folder, use `**<folderName>/**/*`"
         },
-        "foam.placeholders.groupBy": {
-          "type": [
-            "string"
-          ],
-          "enum": [
-            "off",
-            "folder"
-          ],
-          "enumDescriptions": [
-            "Disable grouping",
-            "Group by folder"
-          ],
-          "default": "folder",
-          "markdownDescription": "Group blank note report entries by."
-        },
         "foam.dateSnippets.afterCompletion": {
           "type": "string",
           "default": "createNote",
@@ -457,7 +537,7 @@
     "test:unit": "node ./out/test/run-tests.js --unit",
     "pretest:e2e": "yarn build",
     "test:e2e": "node ./out/test/run-tests.js --e2e",
-    "lint": "tsdx lint src",
+    "lint": "dts lint src",
     "clean": "rimraf out",
     "watch": "tsc --build ./tsconfig.json --watch",
     "vscode:start-debugging": "yarn clean && yarn watch",
@@ -471,32 +551,31 @@
   },
   "devDependencies": {
     "@types/dateformat": "^3.0.1",
-    "@types/glob": "^7.1.1",
+    "@types/jest": "^27.5.1",
     "@types/lodash": "^4.14.157",
     "@types/markdown-it": "^12.0.1",
     "@types/micromatch": "^4.0.1",
     "@types/node": "^13.11.0",
     "@types/picomatch": "^2.2.1",
     "@types/remove-markdown": "^0.1.1",
-    "@types/vscode": "^1.47.1",
-    "@typescript-eslint/eslint-plugin": "^2.30.0",
-    "@typescript-eslint/parser": "^2.30.0",
-    "esbuild": "^0.14.45",
-    "eslint": "^6.8.0",
-    "eslint-import-resolver-typescript": "^2.5.0",
-    "eslint-plugin-import": "^2.24.2",
-    "eslint-plugin-jest": "^25.3.0",
-    "glob": "^7.1.6",
+    "@types/vscode": "^1.70.0",
+    "@typescript-eslint/eslint-plugin": "^5.51.0",
+    "@typescript-eslint/parser": "^5.51.0",
+    "dts-cli": "^1.6.3",
+    "esbuild": "^0.17.7",
+    "eslint": "^8.33.0",
+    "eslint-import-resolver-typescript": "^3.5.3",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-jest": "^27.2.1",
     "husky": "^4.2.5",
-    "jest": "^26.2.2",
-    "jest-extended": "^0.11.5",
+    "jest": "^27.5.1",
+    "jest-extended": "^3.2.3",
     "markdown-it": "^12.0.4",
     "micromatch": "^4.0.2",
     "rimraf": "^3.0.2",
-    "ts-jest": "^26.4.4",
-    "tsdx": "^0.13.2",
+    "ts-jest": "^27.1.5",
     "tslib": "^2.0.0",
-    "typescript": "^3.9.5",
+    "typescript": "^4.9.5",
     "vscode-test": "^1.3.0",
     "wait-for-expect": "^3.0.2"
   },
@@ -506,7 +585,7 @@
     "github-slugger": "^1.4.0",
     "gray-matter": "^4.0.2",
     "lodash": "^4.17.21",
-    "lru-cache": "^7.12.0",
+    "lru-cache": "^7.14.1",
     "markdown-it-regex": "^0.2.0",
     "remark-frontmatter": "^2.0.0",
     "remark-parse": "^8.0.2",

packages/foam-vscode/src/core/common/snippetParser.test.ts

@@ -361,7 +361,7 @@ describe('SnippetParser', () => {
 		assertIdent('this ${1:is ${2:nested with $var}} and repeating $1');
 	});
 
-	test('Parser, choise marker', () => {
+	test('Parser, choice marker', () => {
 		const { placeholders } = new SnippetParser().parse('${1|one,two,three|}');
 
 		assert.strictEqual(placeholders.length, 1);

packages/foam-vscode/src/core/janitor/apply-text-edit.ts

@@ -1,43 +0,0 @@
-import os from 'os';
-import detectNewline from 'detect-newline';
-import { Position } from '../model/position';
-import { Range } from '../model/range';
-
-export interface TextEdit {
-  range: Range;
-  newText: string;
-}
-
-/**
- *
- * @param text text on which the textEdit will be applied
- * @param textEdit
- * @returns {string} text with the applied textEdit
- */
-export const applyTextEdit = (text: string, textEdit: TextEdit): string => {
-  const eol = detectNewline(text) || os.EOL;
-  const lines = text.split(eol);
-  const characters = text.split('');
-  const startOffset = getOffset(lines, textEdit.range.start, eol);
-  const endOffset = getOffset(lines, textEdit.range.end, eol);
-  const deleteCount = endOffset - startOffset;
-
-  const textToAppend = `${textEdit.newText}`;
-  characters.splice(startOffset, deleteCount, textToAppend);
-  return characters.join('');
-};
-
-const getOffset = (
-  lines: string[],
-  position: Position,
-  eol: string
-): number => {
-  const eolLen = eol.length;
-  let offset = 0;
-  let i = 0;
-  while (i < position.line && i < lines.length) {
-    offset = offset + lines[i].length + eolLen;
-    i++;
-  }
-  return offset + Math.min(position.character, lines[i]?.length ?? 0);
-};

packages/foam-vscode/src/core/janitor/generate-headings.ts

@@ -1,7 +1,7 @@
 import matter from 'gray-matter';
-import { TextEdit } from './apply-text-edit';
 import { Resource } from '../model/note';
 import { Range } from '../model/range';
+import { TextEdit } from '../services/text-edit';
 import { getHeadingFromFileName } from '../utils';
 
 export const generateHeading = async (

packages/foam-vscode/src/core/janitor/generate-link-references.test.ts

@@ -141,7 +141,7 @@ describe('generateLinkReferences', () => {
       newText: textForNote(
         `
 [//begin]: # "Autogenerated link references for markdown compatibility"
-[Note being refered as angel]: <Note being refered as angel> "Note being refered as angel"
+[Note being referred as angel]: <Note being referred as angel> "Note being referred as angel"
 [//end]: # "Autogenerated link references"`
       ),
       range: Range.create(3, 0, 3, 0),
@@ -183,13 +183,11 @@ describe('generateLinkReferences', () => {
     const note = findBySlug('file-with-explicit-and-implicit-link-references');
     const expected = {
       newText: textForNote(
-        `[^footerlink]: https://foambubble.github.io/
-[linkrefenrece]: https://foambubble.github.io/
-[//begin]: # "Autogenerated link references for markdown compatibility"
+        `[//begin]: # "Autogenerated link references for markdown compatibility"
 [first-document]: first-document "First Document"
 [//end]: # "Autogenerated link references"`
       ),
-      range: Range.create(5, 0, 10, 42),
+      range: Range.create(8, 0, 10, 42),
     };
 
     const noteText = await _workspace.readAsMarkdown(note.uri);

packages/foam-vscode/src/core/janitor/generate-link-references.ts

@@ -1,11 +1,8 @@
-import { Resource } from '../model/note';
+import { NoteLinkDefinition, Resource } from '../model/note';
 import { Range } from '../model/range';
-import {
-  createMarkdownReferences,
-  stringifyMarkdownLinkReferenceDefinition,
-} from '../services/markdown-provider';
+import { createMarkdownReferences } from '../services/markdown-provider';
 import { FoamWorkspace } from '../model/workspace';
-import { TextEdit } from './apply-text-edit';
+import { TextEdit } from '../services/text-edit';
 import { Position } from '../model/position';
 
 export const LINK_REFERENCE_DEFINITION_HEADER = `[//begin]: # "Autogenerated link references for markdown compatibility"`;
@@ -22,112 +19,62 @@ export const generateLinkReferences = async (
     return null;
   }
 
-  const markdownReferences = createMarkdownReferences(
+  const newWikilinkDefinitions = createMarkdownReferences(
     workspace,
-    note.uri,
+    note,
     includeExtensions
   );
 
+  const beginDelimiterDef = note.definitions.find(
+    ({ label }) => label === '//begin'
+  );
+  const endDelimiterDef = note.definitions.find(
+    ({ label }) => label === '//end'
+  );
+
+  const lines = text.split(eol);
+
+  const targetRange =
+    beginDelimiterDef && endDelimiterDef
+      ? Range.createFromPosition(
+          beginDelimiterDef.range.start,
+          endDelimiterDef.range.end
+        )
+      : Range.create(
+          lines.length - 1,
+          lines[lines.length - 1].length,
+          lines.length - 1,
+          lines[lines.length - 1].length
+        );
+
   const newReferences =
-    markdownReferences.length === 0
+    newWikilinkDefinitions.length === 0
       ? ''
       : [
           LINK_REFERENCE_DEFINITION_HEADER,
-          ...markdownReferences.map(stringifyMarkdownLinkReferenceDefinition),
+          ...newWikilinkDefinitions.map(NoteLinkDefinition.format),
           LINK_REFERENCE_DEFINITION_FOOTER,
         ].join(eol);
 
-  if (note.definitions.length === 0) {
-    if (newReferences.length === 0) {
-      return null;
-    }
+  // check if the new references match the existing references
+  const existingReferences = lines
+    .slice(targetRange.start.line, targetRange.end.line + 1)
+    .join(eol);
 
-    const lines = text.split(eol);
-    const end = Position.create(
-      lines.length - 1,
-      lines[lines.length - 1].length
-    );
-    const padding = end.character === 0 ? eol : `${eol}${eol}`;
-    return {
-      newText: `${padding}${newReferences}`,
-      range: Range.createFromPosition(end, end),
-    };
-  } else {
-    const first = note.definitions[0];
-    const last = note.definitions[note.definitions.length - 1];
+  // adjust padding based on whether there are existing definitions
+  // and, if not, whether we are on an empty line at the end of the file
+  const padding =
+    newWikilinkDefinitions.length === 0 || // no definitions
+    !Position.isEqual(targetRange.start, targetRange.end) // replace existing definitions
+      ? ''
+      : targetRange.start.character > 0 // not an empty line
+      ? `${eol}${eol}`
+      : eol;
 
-    let nonGeneratedReferenceDefinitions = note.definitions;
-
-    // if we have more definitions then referenced pages AND the page refers to a page
-    // we expect non-generated link definitions to be present
-    // Collect all non-generated definitions, by removing the generated ones
-    if (
-      note.definitions.length > markdownReferences.length &&
-      markdownReferences.length > 0
-    ) {
-      // remove all autogenerated definitions
-      const beginIndex = note.definitions.findIndex(
-        ({ label }) => label === '//begin'
-      );
-      const endIndex = note.definitions.findIndex(
-        ({ label }) => label === '//end'
-      );
-
-      const generatedDefinitions = [...note.definitions].splice(
-        beginIndex,
-        endIndex - beginIndex + 1
-      );
-
-      nonGeneratedReferenceDefinitions = note.definitions.filter(
-        x => !generatedDefinitions.includes(x)
-      );
-    }
-
-    // When we only have explicitly defined link definitions &&
-    // no indication of previously defined generated links &&
-    // there is no reference to another page, return null
-    if (
-      nonGeneratedReferenceDefinitions.length > 0 &&
-      note.definitions.findIndex(({ label }) => label === '//begin') < 0 &&
-      markdownReferences.length === 0
-    ) {
-      return null;
-    }
-
-    // Format link definitions for non-generated links
-    const nonGeneratedReferences = nonGeneratedReferenceDefinitions
-      .map(stringifyMarkdownLinkReferenceDefinition)
-      .join(eol);
-
-    const oldReferences = note.definitions
-      .map(stringifyMarkdownLinkReferenceDefinition)
-      .join(eol);
-
-    // When the newly formatted references match the old ones, OR
-    // when non-generated references are present, but no new ones are generated
-    // return null
-    if (
-      oldReferences === newReferences ||
-      (nonGeneratedReferenceDefinitions.length > 0 &&
-        newReferences === '' &&
-        markdownReferences.length > 0)
-    ) {
-      return null;
-    }
-
-    let fullReferences = `${newReferences}`;
-    // If there are any non-generated definitions, add those to the output as well
-    if (
-      nonGeneratedReferenceDefinitions.length > 0 &&
-      markdownReferences.length > 0
-    ) {
-      fullReferences = `${nonGeneratedReferences}${eol}${newReferences}`;
-    }
-
-    return {
-      // @todo: do we need to ensure new lines?
-      newText: `${fullReferences}`,
-      range: Range.createFromPosition(first.range!.start, last.range!.end),
-    };
-  }
+  return existingReferences === newReferences
+    ? null
+    : {
+        newText: `${padding}${newReferences}`,
+        range: targetRange,
+      };
 };

packages/foam-vscode/src/core/model/graph.test.ts

@@ -22,12 +22,7 @@ describe('Graph', () => {
     const noteD = createTestNote({ uri: '/Page D.md' });
     const noteE = createTestNote({ uri: '/page e.md' });
 
-    workspace
-      .set(noteA)
-      .set(noteB)
-      .set(noteC)
-      .set(noteD)
-      .set(noteE);
+    workspace.set(noteA).set(noteB).set(noteC).set(noteD).set(noteE);
     const graph = FoamGraph.fromWorkspace(workspace);
 
     expect(graph.getBacklinks(noteB.uri).map(l => l.source)).toEqual([
@@ -69,9 +64,7 @@ describe('Graph', () => {
       uri: '/note-b.md',
       links: [{ to: noteA.uri.path }, { to: noteA.uri.path }],
     });
-    const ws = createTestWorkspace()
-      .set(noteA)
-      .set(noteB);
+    const ws = createTestWorkspace().set(noteA).set(noteB);
     const graph = FoamGraph.fromWorkspace(ws);
     expect(graph.getBacklinks(noteA.uri)).toEqual([
       {
@@ -95,9 +88,7 @@ describe('Graph', () => {
       uri: '/note-b.md',
       links: [{ to: noteA.uri.path }, { to: noteA.uri.path }],
     });
-    const ws = createTestWorkspace()
-      .set(noteA)
-      .set(noteB);
+    const ws = createTestWorkspace().set(noteA).set(noteB);
     const graph = FoamGraph.fromWorkspace(ws, true);
 
     expect(graph.getBacklinks(noteA.uri).length).toEqual(2);
@@ -165,9 +156,7 @@ describe('Graph', () => {
       uri: '/path/to/more/attachment-b.pdf',
     });
     const ws = createTestWorkspace();
-    ws.set(noteA)
-      .set(attachmentA)
-      .set(attachmentB);
+    ws.set(noteA).set(attachmentA).set(attachmentB);
     const graph = FoamGraph.fromWorkspace(ws);
 
     expect(graph.getBacklinks(attachmentA.uri).map(l => l.source)).toEqual([
@@ -189,9 +178,7 @@ describe('Graph', () => {
       uri: '/path/to/attachment-a.pdf',
     });
     const ws = createTestWorkspace();
-    ws.set(noteA)
-      .set(attachmentA)
-      .set(attachmentABis);
+    ws.set(noteA).set(attachmentA).set(attachmentABis);
     const graph = FoamGraph.fromWorkspace(ws);
 
     expect(graph.getLinks(noteA.uri).map(l => l.target)).toEqual([
@@ -211,9 +198,7 @@ describe('Graph', () => {
       uri: '/path/to/attachment-a.pdf',
     });
     const ws = createTestWorkspace();
-    ws.set(noteA)
-      .set(attachmentABis)
-      .set(attachmentA);
+    ws.set(noteA).set(attachmentABis).set(attachmentA);
     const graph = FoamGraph.fromWorkspace(ws);
 
     expect(graph.getLinks(noteA.uri).map(l => l.target)).toEqual([
@@ -323,9 +308,7 @@ describe('Regenerating graph after workspace changes', () => {
       uri: '/path/to/more/page-c.md',
     });
     const ws = createTestWorkspace();
-    ws.set(noteA)
-      .set(noteB)
-      .set(noteC);
+    ws.set(noteA).set(noteB).set(noteC);
     let graph = FoamGraph.fromWorkspace(ws);
 
     expect(graph.getLinks(noteA.uri).map(l => l.target)).toEqual([noteB.uri]);
@@ -512,9 +495,7 @@ describe('Updating graph on workspace state', () => {
       uri: '/path/to/more/page-c.md',
     });
     const ws = createTestWorkspace();
-    ws.set(noteA)
-      .set(noteB)
-      .set(noteC);
+    ws.set(noteA).set(noteB).set(noteC);
     const graph = FoamGraph.fromWorkspace(ws, true);
 
     expect(graph.getLinks(noteA.uri).map(l => l.target)).toEqual([noteB.uri]);

packages/foam-vscode/src/core/model/note.ts

@@ -5,6 +5,7 @@ export interface ResourceLink {
   type: 'wikilink' | 'link';
   rawText: string;
   range: Range;
+  isEmbed: boolean;
 }
 
 export interface NoteLinkDefinition {
@@ -14,6 +15,19 @@ export interface NoteLinkDefinition {
   range?: Range;
 }
 
+export abstract class NoteLinkDefinition {
+  static format(definition: NoteLinkDefinition) {
+    const url =
+      definition.url.indexOf(' ') > 0 ? `<${definition.url}>` : definition.url;
+    let text = `[${definition.label}]: ${url}`;
+    if (definition.title) {
+      text = `${text} "${definition.title}"`;
+    }
+
+    return text;
+  }
+}
+
 export interface Tag {
   label: string;
   range: Range;

packages/foam-vscode/src/core/model/range.ts

@@ -69,4 +69,8 @@ export abstract class Range {
   static isBefore(a: Range, b: Range): number {
     return a.start.line - b.start.line || a.start.character - b.start.character;
   }
+
+  static toString(range: Range): string {
+    return `${range.start.line}:${range.start.character} - ${range.end.line}:${range.end.character}`;
+  }
 }

packages/foam-vscode/src/core/model/uri.ts

@@ -26,7 +26,8 @@ import * as pathUtils from '../utils/path';
 
 const _empty = '';
 const _slash = '/';
-const _regexp = /^(([^:/?#]{2,}?):)?(\/\/([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?/;
+const _regexp =
+  /^(([^:/?#]{2,}?):)?(\/\/([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?/;
 
 export class URI {
   readonly scheme: string;

packages/foam-vscode/src/core/model/workspace.test.ts

@@ -87,6 +87,13 @@ describe('Workspace resources', () => {
     const res = ws.find('test-file#my-section');
     expect(res.uri.fragment).toEqual('my-section');
   });
+
+  it('should find absolute files even when no basedir is provided', () => {
+    const noteA = createTestNote({ uri: '/a/path/to/file.md' });
+    const ws = createTestWorkspace().set(noteA);
+
+    expect(ws.find('/a/path/to/file.md').uri.path).toEqual(noteA.uri.path);
+  });
 });
 
 describe('Identifier computation', () => {
@@ -100,10 +107,7 @@ describe('Identifier computation', () => {
     const third = createTestNote({
       uri: '/another/path/for/page-a.md',
     });
-    const ws = new FoamWorkspace()
-      .set(first)
-      .set(second)
-      .set(third);
+    const ws = new FoamWorkspace().set(first).set(second).set(third);
 
     expect(ws.getIdentifier(first.uri)).toEqual('to/page-a');
     expect(ws.getIdentifier(second.uri)).toEqual('way/for/page-a');
@@ -120,10 +124,7 @@ describe('Identifier computation', () => {
     const third = createTestNote({
       uri: '/another/path/for/page-a.md',
     });
-    const ws = new FoamWorkspace()
-      .set(first)
-      .set(second)
-      .set(third);
+    const ws = new FoamWorkspace().set(first).set(second).set(third);
 
     expect(ws.getIdentifier(first.uri.withFragment('section name'))).toEqual(
       'to/page-a#section name'
@@ -176,11 +177,7 @@ describe('Identifier computation', () => {
     const noteD = createTestNote({ uri: '/path/to/note-d.md' });
     const noteABis = createTestNote({ uri: '/path/to/another/note-a.md' });
 
-    workspace
-      .set(noteA)
-      .set(noteB)
-      .set(noteC)
-      .set(noteD);
+    workspace.set(noteA).set(noteB).set(noteC).set(noteD);
     expect(workspace.getIdentifier(noteABis.uri)).toEqual('another/note-a');
     expect(
       workspace.getIdentifier(noteABis.uri, [noteB.uri, noteA.uri])

packages/foam-vscode/src/core/model/workspace.ts

@@ -121,14 +121,16 @@ export class FoamWorkspace implements IDisposable {
     if (FoamWorkspace.isIdentifier(path)) {
       resource = this.listByIdentifier(path)[0];
     } else {
-      if (isAbsolute(path) || isSome(baseUri)) {
-        if (getExtension(path) !== '.md') {
-          const uri = baseUri.resolve(path + '.md');
-          resource = uri ? this._resources.get(normalize(uri.path)) : null;
-        }
-        if (!resource) {
-          const uri = baseUri.resolve(path);
-          resource = uri ? this._resources.get(normalize(uri.path)) : null;
+      const candidates = [path, path + '.md'];
+      for (const candidate of candidates) {
+        const searchKey = isAbsolute(candidate)
+          ? candidate
+          : isSome(baseUri)
+          ? baseUri.resolve(candidate).path
+          : null;
+        resource = this._resources.get(normalize(searchKey));
+        if (resource) {
+          break;
         }
       }
     }

packages/foam-vscode/src/core/services/datastore.ts

@@ -86,7 +86,7 @@ export class GenericDataStore implements IDataStore {
 /**
  * A matcher that instead of using globs uses a list of files to
  * check the matches.
- * The {@link refresh} function has been added to the interface to accomodate
+ * The {@link refresh} function has been added to the interface to accommodate
  * this matcher, far from ideal but to be refactored later
  */
 export class FileListBasedMatcher implements IMatcher {

packages/foam-vscode/src/core/services/markdown-link.test.ts

@@ -107,6 +107,7 @@ describe('MarkdownLink', () => {
         type: 'link',
         rawText: '[link](#section)',
         range: Range.create(0, 0),
+        isEmbed: false,
       };
       const parsed = MarkdownLink.analyzeLink(link);
       expect(parsed.target).toEqual('');
@@ -161,7 +162,7 @@ describe('MarkdownLink', () => {
         target: 'new-link',
       });
       expect(edit.newText).toEqual(`[[new-link#section]]`);
-      expect(edit.selection).toEqual(link.range);
+      expect(edit.range).toEqual(link.range);
     });
     it('should rename the section only', () => {
       const link = parser.parse(
@@ -172,7 +173,7 @@ describe('MarkdownLink', () => {
         section: 'new-section',
       });
       expect(edit.newText).toEqual(`[[wikilink#new-section]]`);
-      expect(edit.selection).toEqual(link.range);
+      expect(edit.range).toEqual(link.range);
     });
     it('should rename both target and section', () => {
       const link = parser.parse(
@@ -184,7 +185,7 @@ describe('MarkdownLink', () => {
         section: 'new-section',
       });
       expect(edit.newText).toEqual(`[[new-link#new-section]]`);
-      expect(edit.selection).toEqual(link.range);
+      expect(edit.range).toEqual(link.range);
     });
     it('should be able to remove the section', () => {
       const link = parser.parse(
@@ -195,7 +196,7 @@ describe('MarkdownLink', () => {
         section: '',
       });
       expect(edit.newText).toEqual(`[[wikilink]]`);
-      expect(edit.selection).toEqual(link.range);
+      expect(edit.range).toEqual(link.range);
     });
     it('should be able to rename the alias', () => {
       const link = parser.parse(getRandomURI(), `this is a [[wikilink|alias]]`)
@@ -204,7 +205,7 @@ describe('MarkdownLink', () => {
         alias: 'new-alias',
       });
       expect(edit.newText).toEqual(`[[wikilink|new-alias]]`);
-      expect(edit.selection).toEqual(link.range);
+      expect(edit.range).toEqual(link.range);
     });
   });
 
@@ -216,7 +217,7 @@ describe('MarkdownLink', () => {
         target: 'to/another-path.md',
       });
       expect(edit.newText).toEqual(`[link](to/another-path.md)`);
-      expect(edit.selection).toEqual(link.range);
+      expect(edit.range).toEqual(link.range);
     });
     it('should rename the section only', () => {
       const link = parser.parse(
@@ -227,7 +228,7 @@ describe('MarkdownLink', () => {
         section: 'section2',
       });
       expect(edit.newText).toEqual(`[link](to/path.md#section2)`);
-      expect(edit.selection).toEqual(link.range);
+      expect(edit.range).toEqual(link.range);
     });
     it('should rename both target and section', () => {
       const link = parser.parse(
@@ -239,7 +240,7 @@ describe('MarkdownLink', () => {
         section: 'section2',
       });
       expect(edit.newText).toEqual(`[link](to/another-path.md#section2)`);
-      expect(edit.selection).toEqual(link.range);
+      expect(edit.range).toEqual(link.range);
     });
     it('should be able to remove the section', () => {
       const link = parser.parse(
@@ -250,7 +251,7 @@ describe('MarkdownLink', () => {
         section: '',
       });
       expect(edit.newText).toEqual(`[link](to/path.md)`);
-      expect(edit.selection).toEqual(link.range);
+      expect(edit.range).toEqual(link.range);
     });
   });
 });

packages/foam-vscode/src/core/services/markdown-link.ts

@@ -46,16 +46,17 @@ export abstract class MarkdownLink {
     const newAlias = delta.alias ?? alias ?? '';
     const sectionDivider = newSection ? '#' : '';
     const aliasDivider = newAlias ? '|' : '';
+    const embed = link.isEmbed ? '!' : '';
     if (link.type === 'wikilink') {
       return {
-        newText: `[[${newTarget}${sectionDivider}${newSection}${aliasDivider}${newAlias}]]`,
-        selection: link.range,
+        newText: `${embed}[[${newTarget}${sectionDivider}${newSection}${aliasDivider}${newAlias}]]`,
+        range: link.range,
       };
     }
     if (link.type === 'link') {
       return {
-        newText: `[${newAlias}](${newTarget}${sectionDivider}${newSection})`,
-        selection: link.range,
+        newText: `${embed}[${newAlias}](${newTarget}${sectionDivider}${newSection})`,
+        range: link.range,
       };
     }
     throw new Error(

packages/foam-vscode/src/core/services/markdown-parser.test.ts

@@ -1,8 +1,13 @@
-import { createMarkdownParser, ParserPlugin } from './markdown-parser';
+import {
+  createMarkdownParser,
+  getBlockFor,
+  ParserPlugin,
+} from './markdown-parser';
 import { Logger } from '../utils/log';
 import { URI } from '../model/uri';
 import { Range } from '../model/range';
 import { getRandomURI } from '../../test/test-utils';
+import { Position } from '../model/position';
 
 Logger.setLevel('error');
 
@@ -39,6 +44,7 @@ describe('Markdown parsing', () => {
       const link = note.links[0];
       expect(link.type).toEqual('link');
       expect(link.rawText).toEqual('[link to page b](../doc/page-b.md)');
+      expect(link.isEmbed).toBeFalsy();
     });
 
     it('should detect links that have formatting in label', () => {
@@ -48,6 +54,15 @@ describe('Markdown parsing', () => {
       expect(note.links.length).toEqual(1);
       const link = note.links[0];
       expect(link.type).toEqual('link');
+      expect(link.isEmbed).toBeFalsy();
+    });
+
+    it('should detect embed links', () => {
+      const note = createNoteFromMarkdown('this is ![link](../doc/page-b.md)');
+      expect(note.links.length).toEqual(1);
+      const link = note.links[0];
+      expect(link.type).toEqual('link');
+      expect(link.isEmbed).toBeTruthy();
     });
 
     it('should detect wikilinks', () => {
@@ -61,6 +76,16 @@ describe('Markdown parsing', () => {
       link = note.links[1];
       expect(link.type).toEqual('wikilink');
       expect(link.rawText).toEqual('[[a file]]');
+      expect(link.isEmbed).toBeFalsy();
+    });
+
+    it('should detect wikilink embeds', () => {
+      const note = createNoteFromMarkdown('Some content and ![[an embed]]');
+      expect(note.links.length).toEqual(1);
+      const link = note.links[0];
+      expect(link.type).toEqual('wikilink');
+      expect(link.rawText).toEqual('![[an embed]]');
+      expect(link.isEmbed).toBeTruthy();
     });
 
     it('should detect wikilinks that have aliases', () => {
@@ -74,6 +99,7 @@ describe('Markdown parsing', () => {
       link = note.links[1];
       expect(link.type).toEqual('wikilink');
       expect(link.rawText).toEqual('[[other link | spaced]]');
+      expect(link.isEmbed).toBeFalsy();
     });
 
     it('should skip wikilinks in codeblocks', () => {
@@ -438,3 +464,121 @@ But with some content.
     ]);
   });
 });
+
+describe('Block detection for lists', () => {
+  const md = `
+- this is block 1
+- this is [[block]] 2
+  - this is block 2.1
+- this is block 3
+  - this is block 3.1
+    - this is block 3.1.1
+  - this is block 3.2
+- this is block 4
+this is a simple line
+this is another simple line
+  `;
+
+  it('can detect block', () => {
+    const { block } = getBlockFor(md, 1);
+    expect(block).toEqual('- this is block 1');
+  });
+
+  it('supports nested blocks 1', () => {
+    const { block } = getBlockFor(md, 2);
+    expect(block).toEqual(`- this is [[block]] 2
+  - this is block 2.1`);
+  });
+
+  it('supports nested blocks 2', () => {
+    const { block } = getBlockFor(md, 5);
+    expect(block).toEqual(`  - this is block 3.1
+    - this is block 3.1.1`);
+  });
+
+  it('returns the line if no block is detected', () => {
+    const { block } = getBlockFor(md, 9);
+    expect(block).toEqual(`this is a simple line`);
+  });
+
+  it('is compatible with Range object', () => {
+    const note = parser.parse(URI.file('/path/to/a'), md);
+    const { start } = note.links[0].range;
+    const { block } = getBlockFor(md, start);
+    expect(block).toEqual(`- this is [[block]] 2
+  - this is block 2.1`);
+  });
+});
+
+describe('block detection for sections', () => {
+  const markdown = `
+# Section 1
+- this is block 1
+- this is [[block]] 2
+  - this is block 2.1
+
+# Section 2
+this is a simple line
+this is another simple line
+
+## Section 2.1
+  - this is block 3.1
+    - this is block 3.1.1
+  - this is block 3.2
+
+# Section 3
+# Section 4
+some text
+some text
+`;
+
+  it('should return correct block for valid markdown string with line number', () => {
+    const { block, nLines } = getBlockFor(markdown, 1);
+    expect(block).toEqual(`# Section 1
+- this is block 1
+- this is [[block]] 2
+  - this is block 2.1
+`);
+    expect(nLines).toEqual(5);
+  });
+
+  it('should return correct block for valid markdown string with position', () => {
+    const { block, nLines } = getBlockFor(markdown, 6);
+    expect(block).toEqual(`# Section 2
+this is a simple line
+this is another simple line
+
+## Section 2.1
+  - this is block 3.1
+    - this is block 3.1.1
+  - this is block 3.2
+`);
+    expect(nLines).toEqual(9);
+  });
+
+  it('should return single line for section with no content', () => {
+    const { block, nLines } = getBlockFor(markdown, 15);
+    expect(block).toEqual('# Section 3');
+    expect(nLines).toEqual(1);
+  });
+
+  it('should return till end of file for last section', () => {
+    const { block, nLines } = getBlockFor(markdown, 16);
+    expect(block).toEqual(`# Section 4
+some text
+some text`);
+    expect(nLines).toEqual(3);
+  });
+
+  it('should return single line for non-existing line number', () => {
+    const { block, nLines } = getBlockFor(markdown, 100);
+    expect(block).toEqual('');
+    expect(nLines).toEqual(1);
+  });
+
+  it('should return single line for non-existing position', () => {
+    const { block, nLines } = getBlockFor(markdown, Position.create(100, 2));
+    expect(block).toEqual('');
+    expect(nLines).toEqual(1);
+  });
+});

packages/foam-vscode/src/core/services/markdown-parser.ts

@@ -241,7 +241,7 @@ const sectionsPlugin: ParserPlugin = {
       astPointToFoamPosition(tree.position.end).line + 1,
       0
     );
-    // Close all the remainig sections
+    // Close all the remaining sections
     while (sectionStack.length > 0) {
       const section = sectionStack.pop();
       note.sections.push({
@@ -268,7 +268,7 @@ const titlePlugin: ParserPlugin = {
     }
   },
   onDidFindProperties: (props, note) => {
-    // Give precendence to the title from the frontmatter if it exists
+    // Give precedence to the title from the frontmatter if it exists
     note.title = props.title?.toString() ?? note.title;
   },
   onDidVisitTree: (tree, note) => {
@@ -299,18 +299,33 @@ const wikilinkPlugin: ParserPlugin = {
   name: 'wikilink',
   visit: (node, note, noteSource) => {
     if (node.type === 'wikiLink') {
+      const isEmbed =
+        noteSource.charAt(node.position!.start.offset - 1) === '!';
+
       const literalContent = noteSource.substring(
-        node.position!.start.offset!,
+        isEmbed
+          ? node.position!.start.offset! - 1
+          : node.position!.start.offset!,
         node.position!.end.offset!
       );
 
+      const range = isEmbed
+        ? Range.create(
+            node.position.start.line - 1,
+            node.position.start.column - 2,
+            node.position.end.line - 1,
+            node.position.end.column - 1
+          )
+        : astPositionToFoamRange(node.position!);
+
       note.links.push({
         type: 'wikilink',
         rawText: literalContent,
-        range: astPositionToFoamRange(node.position!),
+        range,
+        isEmbed,
       });
     }
-    if (node.type === 'link') {
+    if (node.type === 'link' || node.type === 'image') {
       const targetUri = (node as any).url;
       const uri = note.uri.resolve(targetUri);
       if (uri.scheme !== 'file' || uri.path === note.uri.path) {
@@ -324,6 +339,7 @@ const wikilinkPlugin: ParserPlugin = {
         type: 'link',
         rawText: literalContent,
         range: astPositionToFoamRange(node.position!),
+        isEmbed: literalContent.startsWith('!'),
       });
     }
   },
@@ -408,3 +424,46 @@ const astPositionToFoamRange = (pos: AstPosition): Range =>
     pos.end.line - 1,
     pos.end.column - 1
   );
+
+const blockParser = unified().use(markdownParse, { gfm: true });
+export const getBlockFor = (
+  markdown: string,
+  line: number | Position
+): { block: string; nLines: number } => {
+  const searchLine = typeof line === 'number' ? line : line.line;
+  const tree = blockParser.parse(markdown);
+  const lines = markdown.split('\n');
+  let startLine = -1;
+  let endLine = -1;
+
+  // For list items, we also include the sub-lists
+  visit(tree, ['listItem'], (node: any) => {
+    if (node.position.start.line === searchLine + 1) {
+      startLine = node.position.start.line - 1;
+      endLine = node.position.end.line;
+      return visit.EXIT;
+    }
+  });
+
+  // For headings, we also include the sub-sections
+  let headingLevel = -1;
+  visit(tree, ['heading'], (node: any) => {
+    if (startLine > -1 && node.depth <= headingLevel) {
+      endLine = node.position.start.line - 1;
+      return visit.EXIT;
+    }
+    if (node.position.start.line === searchLine + 1) {
+      headingLevel = node.depth;
+      startLine = node.position.start.line - 1;
+      endLine = lines.length - 1; // in case it's the last section
+    }
+  });
+
+  let nLines = startLine == -1 ? 1 : endLine - startLine;
+  let block =
+    startLine == -1
+      ? lines[searchLine] ?? ''
+      : lines.slice(startLine, endLine).join('\n');
+
+  return { block, nLines };
+};

packages/foam-vscode/src/core/services/markdown-provider.test.ts

@@ -51,10 +51,7 @@ describe('Link resolution', () => {
       );
       const noteB = createNoteFromMarkdown('Page b', '/path/one/page b.md');
       const noteB2 = createNoteFromMarkdown('Page b 2', '/path/two/page b.md');
-      workspace
-        .set(noteA)
-        .set(noteB)
-        .set(noteB2);
+      workspace.set(noteA).set(noteB).set(noteB2);
       expect(workspace.resolveLink(noteA, noteA.links[0])).toEqual(noteB2.uri);
     });
 
@@ -63,10 +60,7 @@ describe('Link resolution', () => {
       const noteA = createNoteFromMarkdown('Link to [[page b]]', '/page-a.md');
       const noteB = createNoteFromMarkdown('Page b', '/path/one/page b.md');
       const noteB2 = createNoteFromMarkdown('Page b2', '/path/two/page b.md');
-      workspace
-        .set(noteA)
-        .set(noteB)
-        .set(noteB2);
+      workspace.set(noteA).set(noteB).set(noteB2);
       expect(workspace.resolveLink(noteA, noteA.links[0])).toEqual(noteB.uri);
     });
 
@@ -80,10 +74,7 @@ describe('Link resolution', () => {
       const noteB3 = createTestNote({ uri: '/path/to/yet/page-b.md' });
 
       const ws = createTestWorkspace();
-      ws.set(noteA)
-        .set(noteB1)
-        .set(noteB2)
-        .set(noteB3);
+      ws.set(noteA).set(noteB1).set(noteB2).set(noteB3);
 
       expect(ws.resolveLink(noteA, noteA.links[0])).toEqual(noteB2.uri);
       expect(ws.resolveLink(noteA, noteA.links[1])).toEqual(noteB3.uri);
@@ -97,10 +88,7 @@ describe('Link resolution', () => {
       );
       const noteB = createNoteFromMarkdown('Page b', '/path/one/page b.md');
       const noteB2 = createNoteFromMarkdown('Page b2', '/path/two/page b.md');
-      workspace
-        .set(noteA)
-        .set(noteB)
-        .set(noteB2);
+      workspace.set(noteA).set(noteB).set(noteB2);
       expect(workspace.resolveLink(noteA, noteA.links[0])).toEqual(noteB2.uri);
       expect(workspace.resolveLink(noteA, noteA.links[1])).toEqual(noteB.uri);
     });
@@ -157,9 +145,7 @@ describe('Link resolution', () => {
         ],
       });
       const noteB = createTestNote({ uri: '/somewhere/PAGE-B.md' });
-      const ws = createTestWorkspace()
-        .set(noteA)
-        .set(noteB);
+      const ws = createTestWorkspace().set(noteA).set(noteB);
 
       expect(ws.resolveLink(noteA, noteA.links[0])).toEqual(
         noteB.uri.withFragment('section')
@@ -258,10 +244,7 @@ describe('Link resolution', () => {
       );
 
       const ws = createTestWorkspace();
-      ws.set(noteA)
-        .set(noteB)
-        .set(noteC)
-        .set(noteD);
+      ws.set(noteA).set(noteB).set(noteC).set(noteD);
 
       expect(ws.resolveLink(noteB, noteB.links[0])).toEqual(noteA.uri);
       expect(ws.resolveLink(noteC, noteC.links[0])).toEqual(noteA.uri);

packages/foam-vscode/src/core/services/markdown-provider.ts

@@ -12,6 +12,7 @@ import { IDisposable } from '../common/lifecycle';
 import { ResourceProvider } from '../model/provider';
 import { MarkdownLink } from './markdown-link';
 import { IDataStore } from './datastore';
+import { uniqBy } from 'lodash';
 
 export class MarkdownResourceProvider implements ResourceProvider {
   private disposables: IDisposable[] = [];
@@ -106,27 +107,19 @@ export class MarkdownResourceProvider implements ResourceProvider {
 
 export function createMarkdownReferences(
   workspace: FoamWorkspace,
-  noteUri: URI,
+  source: Resource | URI,
   includeExtension: boolean
 ): NoteLinkDefinition[] {
-  const source = workspace.find(noteUri);
-  // Should never occur since we're already in a file,
-  if (source?.type !== 'note') {
-    console.warn(
-      `Note ${noteUri.toString()} note found in workspace when attempting \
-to generate markdown reference list`
-    );
-    return [];
-  }
+  const resource = source instanceof URI ? workspace.find(source) : source;
 
-  return source.links
+  const definitions = resource.links
     .filter(link => link.type === 'wikilink')
     .map(link => {
-      const targetUri = workspace.resolveLink(source, link);
+      const targetUri = workspace.resolveLink(resource, link);
       const target = workspace.find(targetUri);
       if (isNone(target)) {
         Logger.warn(
-          `Link ${targetUri.toString()} in ${noteUri.toString()} is not valid.`
+          `Link ${targetUri.toString()} in ${resource.uri.toString()} is not valid.`
         );
         return null;
       }
@@ -135,7 +128,7 @@ to generate markdown reference list`
         return null;
       }
 
-      let relativeUri = target.uri.relativeTo(noteUri.getDirectory());
+      let relativeUri = target.uri.relativeTo(resource.uri.getDirectory());
       if (!includeExtension && relativeUri.path.endsWith('.md')) {
         relativeUri = relativeUri.changeExtension('*', '');
       }
@@ -152,17 +145,5 @@ to generate markdown reference list`
     })
     .filter(isSome)
     .sort();
-}
-
-export function stringifyMarkdownLinkReferenceDefinition(
-  definition: NoteLinkDefinition
-) {
-  const url =
-    definition.url.indexOf(' ') > 0 ? `<${definition.url}>` : definition.url;
-  let text = `[${definition.label}]: ${url}`;
-  if (definition.title) {
-    text = `${text} "${definition.title}"`;
-  }
-
-  return text;
+  return uniqBy(definitions, def => NoteLinkDefinition.format(def));
 }

packages/foam-vscode/src/core/services/resource-filter.test.ts

@@ -0,0 +1,116 @@
+import { Logger } from '../utils/log';
+import { createTestNote } from '../../test/test-utils';
+import { createFilter } from './resource-filter';
+
+Logger.setLevel('error');
+
+describe('Resource Filter', () => {
+  describe('Filter parameters', () => {
+    it('should support expressions when code execution is enabled', () => {
+      const noteA = createTestNote({
+        uri: 'note-a.md',
+        type: 'type-1',
+      });
+      const noteB = createTestNote({
+        uri: 'note-b.md',
+        type: 'type-2',
+      });
+
+      const filter = createFilter(
+        {
+          expression: 'resource.type === "type-1"',
+        },
+        true
+      );
+      expect(filter(noteA)).toBeTruthy();
+      expect(filter(noteB)).toBeFalsy();
+    });
+
+    it('should not allow expressions when code execution is not enabled', () => {
+      const noteA = createTestNote({
+        uri: 'note-a.md',
+        type: 'type-1',
+      });
+      const noteB = createTestNote({
+        uri: 'note-b.md',
+        type: 'type-2',
+      });
+
+      const filter = createFilter(
+        {
+          expression: 'resource.type === "type-1"',
+        },
+        false
+      );
+      expect(filter(noteA)).toBeTruthy();
+      expect(filter(noteB)).toBeTruthy();
+    });
+
+    it('should support resource type', () => {
+      const noteA = createTestNote({
+        uri: 'note-a.md',
+        type: 'type-1',
+      });
+      const noteB = createTestNote({
+        uri: 'note-b.md',
+        type: 'type-2',
+      });
+
+      const filter = createFilter(
+        {
+          type: 'type-1',
+        },
+        false
+      );
+      expect(filter(noteA)).toBeTruthy();
+      expect(filter(noteB)).toBeFalsy();
+    });
+
+    it('should support resource title', () => {
+      const noteA = createTestNote({
+        uri: 'note-a.md',
+        title: 'title-1',
+      });
+      const noteB = createTestNote({
+        uri: 'note-b.md',
+        title: 'title-2',
+      });
+      const noteC = createTestNote({
+        uri: 'note-c.md',
+        title: 'another title',
+      });
+
+      const filter = createFilter(
+        {
+          title: '^title',
+        },
+        false
+      );
+      expect(filter(noteA)).toBeTruthy();
+      expect(filter(noteB)).toBeTruthy();
+      expect(filter(noteC)).toBeFalsy();
+    });
+  });
+
+  describe('Filter operators', () => {
+    it('should support the OR operator', () => {
+      const noteA = createTestNote({
+        uri: 'note-a.md',
+        type: 'type-1',
+      });
+      const noteB = createTestNote({
+        uri: 'note-b.md',
+        type: 'type-2',
+      });
+
+      const filter = createFilter(
+        {
+          or: [{ type: 'type-1' }, { type: 'type-2' }],
+        },
+        false
+      );
+      expect(filter(noteA)).toBeTruthy();
+      expect(filter(noteB)).toBeTruthy();
+    });
+  });
+});

packages/foam-vscode/src/core/services/resource-filter.ts

@@ -0,0 +1,77 @@
+import { negate } from 'lodash';
+import { Resource } from '../model/note';
+
+export interface FilterDescriptor
+  extends FilterDescriptorOp,
+    FilterDescriptorParam {}
+
+interface FilterDescriptorOp {
+  and?: FilterDescriptor[];
+  or?: FilterDescriptor[];
+  not?: FilterDescriptor;
+}
+
+interface FilterDescriptorParam {
+  /**
+   * A regex of the path to include
+   */
+  path?: string;
+
+  /**
+   * A tag
+   */
+  tag?: string;
+
+  /**
+   * A note type
+   */
+  type?: string;
+
+  /**
+   * The title of the note
+   */
+  title?: string;
+
+  /**
+   * An expression to evaluate to JS, use `resource` to reference the resource object
+   */
+  expression?: string;
+}
+
+type ResourceFilter = (r: Resource) => boolean;
+
+export function createFilter(
+  filter: FilterDescriptor,
+  enableCode: boolean
+): ResourceFilter {
+  filter = filter ?? {};
+  const expressionFn =
+    enableCode && filter.expression
+      ? resource => eval(filter.expression) // eslint-disable-line no-eval
+      : undefined;
+  return resource => {
+    if (expressionFn && !expressionFn(resource)) {
+      return false;
+    }
+    if (filter.type && resource.type !== filter.type) {
+      return false;
+    }
+    if (filter.title && !resource.title.match(filter.title)) {
+      return false;
+    }
+    if (filter.and) {
+      return filter.and
+        .map(pred => createFilter(pred, enableCode))
+        .every(fn => fn(resource));
+    }
+    if (filter.or) {
+      return filter.or
+        .map(pred => createFilter(pred, enableCode))
+        .some(fn => fn(resource));
+    }
+    if (filter.not) {
+      return negate(createFilter(filter.not, enableCode))(resource);
+    }
+    return true;
+  };
+}

packages/foam-vscode/src/core/services/text-edit.test.ts

@@ -1,6 +1,6 @@
 import { Range } from '../model/range';
 import { Logger } from '../utils/log';
-import { applyTextEdit } from './apply-text-edit';
+import { TextEdit } from './text-edit';
 
 Logger.setLevel('error');
 
@@ -23,7 +23,7 @@ describe('applyTextEdit', () => {
 3. this is third line
 4. this is fourth line`;
 
-    const actual = applyTextEdit(text, textEdit);
+    const actual = TextEdit.apply(text, textEdit);
 
     expect(actual).toBe(expected);
   });
@@ -45,7 +45,7 @@ describe('applyTextEdit', () => {
 3. this is third line
 `;
 
-    const actual = applyTextEdit(text, textEdit);
+    const actual = TextEdit.apply(text, textEdit);
 
     expect(actual).toBe(expected);
   });
@@ -68,7 +68,7 @@ describe('applyTextEdit', () => {
 3. this is third line
 `;
 
-    const actual = applyTextEdit(text, textEdit);
+    const actual = TextEdit.apply(text, textEdit);
 
     expect(actual).toBe(expected);
   });

packages/foam-vscode/src/core/services/text-edit.ts

@@ -0,0 +1,44 @@
+import detectNewline from 'detect-newline';
+import { Position } from '../model/position';
+import { Range } from '../model/range';
+
+export interface TextEdit {
+  range: Range;
+  newText: string;
+}
+
+export abstract class TextEdit {
+  /**
+   *
+   * @param text text on which the textEdit will be applied
+   * @param textEdit
+   * @returns {string} text with the applied textEdit
+   */
+  public static apply(text: string, textEdit: TextEdit): string {
+    const eol = detectNewline.graceful(text);
+    const lines = text.split(eol);
+    const characters = text.split('');
+    const startOffset = getOffset(lines, textEdit.range.start, eol);
+    const endOffset = getOffset(lines, textEdit.range.end, eol);
+    const deleteCount = endOffset - startOffset;
+
+    const textToAppend = `${textEdit.newText}`;
+    characters.splice(startOffset, deleteCount, textToAppend);
+    return characters.join('');
+  }
+}
+
+const getOffset = (
+  lines: string[],
+  position: Position,
+  eol: string
+): number => {
+  const eolLen = eol.length;
+  let offset = 0;
+  let i = 0;
+  while (i < position.line && i < lines.length) {
+    offset = offset + lines[i].length + eolLen;
+    i++;
+  }
+  return offset + Math.min(position.character, lines[i]?.length ?? 0);
+};

packages/foam-vscode/src/core/utils/core.ts

@@ -21,7 +21,4 @@ export function isNumeric(value: string): boolean {
 }
 
 export const hash = (text: string) =>
-  crypto
-    .createHash('sha1')
-    .update(text)
-    .digest('hex');
+  crypto.createHash('sha1').update(text).digest('hex');

packages/foam-vscode/src/core/utils/hashtags.ts

@@ -1,6 +1,8 @@
 import { isSome } from './core';
-const HASHTAG_REGEX = /(?<=^|\s)#([0-9]*[\p{L}\p{Emoji_Presentation}/_-][\p{L}\p{Emoji_Presentation}\p{N}/_-]*)/gmu;
-const WORD_REGEX = /(?<=^|\s)([0-9]*[\p{L}\p{Emoji_Presentation}/_-][\p{L}\p{Emoji_Presentation}\p{N}/_-]*)/gmu;
+export const HASHTAG_REGEX =
+  /(?<=^|\s)#([0-9]*[\p{L}\p{Emoji_Presentation}/_-][\p{L}\p{Emoji_Presentation}\p{N}/_-]*)/gmu;
+const WORD_REGEX =
+  /(?<=^|\s)([0-9]*[\p{L}\p{Emoji_Presentation}/_-][\p{L}\p{Emoji_Presentation}\p{N}/_-]*)/gmu;
 
 export const extractHashtags = (
   text: string

packages/foam-vscode/src/dated-notes.spec.ts

@@ -1,72 +1,72 @@
-import { workspace } from 'vscode';
-import { createDailyNoteIfNotExists, getDailyNotePath } from './dated-notes';
-import { isWindows } from './core/common/platform';
-import {
-  cleanWorkspace,
-  closeEditors,
-  createFile,
-  deleteFile,
-  showInEditor,
-  withModifiedFoamConfiguration,
-} from './test/test-utils-vscode';
-import { fromVsCodeUri } from './utils/vsc-utils';
-
-describe('getDailyNotePath', () => {
-  const date = new Date('2021-02-07T00:00:00Z');
-  const year = date.getFullYear();
-  const month = date.getMonth() + 1;
-  const day = date.getDate();
-  const isoDate = `${year}-0${month}-0${day}`;
-
-  test('Adds the root directory to relative directories', async () => {
-    const config = 'journal';
-
-    const expectedPath = fromVsCodeUri(
-      workspace.workspaceFolders[0].uri
-    ).joinPath(config, `${isoDate}.md`);
-
-    await withModifiedFoamConfiguration('openDailyNote.directory', config, () =>
-      expect(getDailyNotePath(date).toFsPath()).toEqual(expectedPath.toFsPath())
-    );
-  });
-
-  test('Uses absolute directories without modification', async () => {
-    const config = isWindows
-      ? 'C:\\absolute_path\\journal'
-      : '/absolute_path/journal';
-    const expectedPath = isWindows
-      ? `${config}\\${isoDate}.md`
-      : `${config}/${isoDate}.md`;
-
-    await withModifiedFoamConfiguration('openDailyNote.directory', config, () =>
-      expect(getDailyNotePath(date).toFsPath()).toMatch(expectedPath)
-    );
-  });
-});
-
-describe('Daily note template', () => {
-  it('Uses the daily note variables in the template', async () => {
-    const targetDate = new Date(2021, 8, 12);
-
-    const template = await createFile(
-      // eslint-disable-next-line no-template-curly-in-string
-      'hello ${FOAM_DATE_MONTH_NAME} ${FOAM_DATE_DATE} hello',
-      ['.foam', 'templates', 'daily-note.md']
-    );
-
-    const uri = getDailyNotePath(targetDate);
-
-    await createDailyNoteIfNotExists(targetDate);
-
-    const doc = await showInEditor(uri);
-    const content = doc.editor.document.getText();
-    expect(content).toEqual('hello September 12 hello');
-
-    await deleteFile(template.uri);
-  });
-
-  afterAll(async () => {
-    await cleanWorkspace();
-    await closeEditors();
-  });
-});
+import { workspace } from 'vscode';
+import { createDailyNoteIfNotExists, getDailyNotePath } from './dated-notes';
+import { isWindows } from './core/common/platform';
+import {
+  cleanWorkspace,
+  closeEditors,
+  createFile,
+  deleteFile,
+  showInEditor,
+  withModifiedFoamConfiguration,
+} from './test/test-utils-vscode';
+import { fromVsCodeUri } from './utils/vsc-utils';
+
+describe('getDailyNotePath', () => {
+  const date = new Date('2021-02-07T00:00:00Z');
+  const year = date.getFullYear();
+  const month = date.getMonth() + 1;
+  const day = date.getDate();
+  const isoDate = `${year}-0${month}-0${day}`;
+
+  test('Adds the root directory to relative directories', async () => {
+    const config = 'journal';
+
+    const expectedPath = fromVsCodeUri(
+      workspace.workspaceFolders[0].uri
+    ).joinPath(config, `${isoDate}.md`);
+
+    await withModifiedFoamConfiguration('openDailyNote.directory', config, () =>
+      expect(getDailyNotePath(date).toFsPath()).toEqual(expectedPath.toFsPath())
+    );
+  });
+
+  test('Uses absolute directories without modification', async () => {
+    const config = isWindows
+      ? 'C:\\absolute_path\\journal'
+      : '/absolute_path/journal';
+    const expectedPath = isWindows
+      ? `${config}\\${isoDate}.md`
+      : `${config}/${isoDate}.md`;
+
+    await withModifiedFoamConfiguration('openDailyNote.directory', config, () =>
+      expect(getDailyNotePath(date).toFsPath()).toMatch(expectedPath)
+    );
+  });
+});
+
+describe('Daily note template', () => {
+  it('Uses the daily note variables in the template', async () => {
+    const targetDate = new Date(2021, 8, 12);
+
+    const template = await createFile(
+      // eslint-disable-next-line no-template-curly-in-string
+      'hello ${FOAM_DATE_MONTH_NAME} ${FOAM_DATE_DATE} hello',
+      ['.foam', 'templates', 'daily-note.md']
+    );
+
+    const uri = getDailyNotePath(targetDate);
+
+    await createDailyNoteIfNotExists(targetDate);
+
+    const doc = await showInEditor(uri);
+    const content = doc.editor.document.getText();
+    expect(content).toEqual('hello September 12 hello');
+
+    await deleteFile(template.uri);
+  });
+
+  afterAll(async () => {
+    await cleanWorkspace();
+    await closeEditors();
+  });
+});

packages/foam-vscode/src/dated-notes.ts

@@ -1,8 +1,6 @@
-import { workspace } from 'vscode';
 import dateFormat from 'dateformat';
 import { focusNote } from './utils';
 import { URI } from './core/model/uri';
-import { toVsCodeUri } from './utils/vsc-utils';
 import { NoteFactory } from './services/templates';
 import { getFoamVsCodeConfig } from './services/config';
 import { asAbsoluteWorkspaceUri } from './services/editor';
@@ -76,7 +74,7 @@ export function getDailyNoteFileName(date: Date): string {
  * this function will create all folders in the path.
  *
  * @param currentDate The current date, to be used as a title.
- * @returns Wether the file was created.
+ * @returns Whether the file was created.
  */
 export async function createDailyNoteIfNotExists(targetDate: Date) {
   const pathFromLegacyConfiguration = getDailyNotePath(targetDate);
@@ -86,9 +84,7 @@ export async function createDailyNoteIfNotExists(targetDate: Date) {
 
   const templateFallbackText = `---
 foam_template:
-  filepath: "${workspace.asRelativePath(
-    toVsCodeUri(pathFromLegacyConfiguration)
-  )}"
+  filepath: "${pathFromLegacyConfiguration.toFsPath().replace(/\\/g, '\\\\')}"
 ---
 # ${dateFormat(targetDate, titleFormat, false)}
 `;

packages/foam-vscode/src/extension.ts

@@ -1,3 +1,5 @@
+/*global markdownit:readonly*/
+
 import { workspace, ExtensionContext, window, commands } from 'vscode';
 import { MarkdownResourceProvider } from './core/services/markdown-provider';
 import { bootstrap } from './core/model/foam';
@@ -27,11 +29,8 @@ export async function activate(context: ExtensionContext) {
 
     // Prepare Foam
     const excludes = getIgnoredFilesSetting().map(g => g.toString());
-    const {
-      matcher,
-      dataStore,
-      excludePatterns,
-    } = await createMatcherAndDataStore(excludes);
+    const { matcher, dataStore, excludePatterns } =
+      await createMatcherAndDataStore(excludes);
 
     Logger.info('Loading from directories:');
     for (const folder of workspace.workspaceFolders) {
@@ -55,7 +54,7 @@ export async function activate(context: ExtensionContext) {
     ]);
 
     // Load the features
-    const resPromises = features.map(f => f.activate(context, foamPromise));
+    const resPromises = features.map(feature => feature(context, foamPromise));
 
     const foam = await foamPromise;
     Logger.info(`Loaded ${foam.workspace.list().length} resources`);

packages/foam-vscode/src/features/commands/copy-without-brackets.ts

@@ -1,17 +1,14 @@
 import { window, env, ExtensionContext, commands } from 'vscode';
-import { FoamFeature } from '../../types';
 import { removeBrackets } from '../../utils';
 
-const feature: FoamFeature = {
-  activate: (context: ExtensionContext) => {
-    context.subscriptions.push(
-      commands.registerCommand(
-        'foam-vscode.copy-without-brackets',
-        copyWithoutBrackets
-      )
-    );
-  },
-};
+export default async function activate(context: ExtensionContext) {
+  context.subscriptions.push(
+    commands.registerCommand(
+      'foam-vscode.copy-without-brackets',
+      copyWithoutBrackets
+    )
+  );
+}
 
 async function copyWithoutBrackets() {
   // Get the active text editor
@@ -34,5 +31,3 @@ async function copyWithoutBrackets() {
     window.showInformationMessage('Successfully copied to clipboard!');
   }
 }
-
-export default feature;

packages/foam-vscode/src/features/commands/create-new-template.spec.ts

@@ -1,28 +0,0 @@
-import { commands, window } from 'vscode';
-import * as editor from '../../services/editor';
-
-describe('create-note-from-default-template command', () => {
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('can be cancelled while resolving FOAM_TITLE', async () => {
-    const spy = jest
-      .spyOn(window, 'showInputBox')
-      .mockImplementation(jest.fn(() => Promise.resolve(undefined)));
-
-    const docCreatorSpy = jest.spyOn(editor, 'createDocAndFocus');
-
-    await commands.executeCommand(
-      'foam-vscode.create-note-from-default-template'
-    );
-
-    expect(spy).toBeCalledWith({
-      prompt: `Enter a title for the new note`,
-      value: 'Title of my New Note',
-      validateInput: expect.anything(),
-    });
-
-    expect(docCreatorSpy).toHaveBeenCalledTimes(0);
-  });
-});

packages/foam-vscode/src/features/commands/create-new-template.ts

@@ -1,16 +1,8 @@
 import { commands, ExtensionContext } from 'vscode';
-import { FoamFeature } from '../../types';
 import { createTemplate } from '../../services/templates';
 
-const feature: FoamFeature = {
-  activate: (context: ExtensionContext) => {
-    context.subscriptions.push(
-      commands.registerCommand(
-        'foam-vscode.create-new-template',
-        createTemplate
-      )
-    );
-  },
-};
-
-export default feature;
+export default async function activate(context: ExtensionContext) {
+  context.subscriptions.push(
+    commands.registerCommand('foam-vscode.create-new-template', createTemplate)
+  );
+}

packages/foam-vscode/src/features/commands/create-note-from-default-template.spec.ts

@@ -1,28 +0,0 @@
-import { commands, window } from 'vscode';
-import * as editor from '../../services/editor';
-
-describe('create-note-from-default-template command', () => {
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('can be cancelled while resolving FOAM_TITLE', async () => {
-    const spy = jest
-      .spyOn(window, 'showInputBox')
-      .mockImplementation(jest.fn(() => Promise.resolve(undefined)));
-
-    const docCreatorSpy = jest.spyOn(editor, 'createDocAndFocus');
-
-    await commands.executeCommand(
-      'foam-vscode.create-note-from-default-template'
-    );
-
-    expect(spy).toBeCalledWith({
-      prompt: `Enter a title for the new note`,
-      value: 'Title of my New Note',
-      validateInput: expect.anything(),
-    });
-
-    expect(docCreatorSpy).toHaveBeenCalledTimes(0);
-  });
-});

packages/foam-vscode/src/features/commands/create-note-from-default-template.ts

@@ -1,42 +0,0 @@
-import { commands, window, ExtensionContext } from 'vscode';
-import { FoamFeature } from '../../types';
-import { getDefaultTemplateUri, NoteFactory } from '../../services/templates';
-import { Resolver } from '../../services/variable-resolver';
-
-/**
- * Create a new note from the default template.
- *
- * @deprecated use 'foam-vscode.create-note' instead
- */
-const feature: FoamFeature = {
-  activate: (context: ExtensionContext) => {
-    context.subscriptions.push(
-      commands.registerCommand(
-        'foam-vscode.create-note-from-default-template',
-        () => {
-          window.showWarningMessage(
-            "This command is deprecated, use 'Foam: Create Note' (foam-vscode.create-note) instead"
-          );
-          const resolver = new Resolver(new Map(), new Date());
-
-          return NoteFactory.createFromTemplate(
-            getDefaultTemplateUri(),
-            resolver,
-            undefined,
-            `---
-foam_template:
-  name: New Note
-  description: Foam's default new note template
----
-# \${FOAM_TITLE}
-
-\${FOAM_SELECTED_TEXT}
-`
-          );
-        }
-      )
-    );
-  },
-};
-
-export default feature;

packages/foam-vscode/src/features/commands/create-note-from-template.spec.ts

@@ -14,7 +14,7 @@ describe('create-note-from-template command', () => {
 
     await commands.executeCommand('foam-vscode.create-note-from-template');
 
-    expect(spy).toBeCalledWith(['Yes', 'No'], {
+    expect(spy).toHaveBeenCalledWith(['Yes', 'No'], {
       placeHolder:
         'No templates available. Would you like to create one instead?',
     });
@@ -38,7 +38,7 @@ describe('create-note-from-template command', () => {
 
     await commands.executeCommand('foam-vscode.create-note-from-template');
 
-    expect(spy).toBeCalledWith(
+    expect(spy).toHaveBeenCalledWith(
       [
         expect.objectContaining({ label: 'template-a.md' }),
         expect.objectContaining({ label: 'template-b.md' }),
@@ -71,7 +71,7 @@ Template A
 
     await commands.executeCommand('foam-vscode.create-note-from-template');
 
-    expect(spy).toBeCalledWith(
+    expect(spy).toHaveBeenCalledWith(
       [
         expect.objectContaining({
           label: 'My Template',

packages/foam-vscode/src/features/commands/create-note-from-template.ts

@@ -1,25 +1,20 @@
 import { commands, ExtensionContext } from 'vscode';
-import { FoamFeature } from '../../types';
 import { askUserForTemplate, NoteFactory } from '../../services/templates';
 import { Resolver } from '../../services/variable-resolver';
 
-const feature: FoamFeature = {
-  activate: (context: ExtensionContext) => {
-    context.subscriptions.push(
-      commands.registerCommand(
-        'foam-vscode.create-note-from-template',
-        async () => {
-          const templateUri = await askUserForTemplate();
+export default async function activate(context: ExtensionContext) {
+  context.subscriptions.push(
+    commands.registerCommand(
+      'foam-vscode.create-note-from-template',
+      async () => {
+        const templateUri = await askUserForTemplate();
 
-          if (templateUri) {
-            const resolver = new Resolver(new Map(), new Date());
+        if (templateUri) {
+          const resolver = new Resolver(new Map(), new Date());
 
-            await NoteFactory.createFromTemplate(templateUri, resolver);
-          }
+          await NoteFactory.createFromTemplate(templateUri, resolver);
         }
-      )
-    );
-  },
-};
-
-export default feature;
+      }
+    )
+  );
+}

packages/foam-vscode/src/features/commands/create-note.spec.ts

@@ -10,6 +10,7 @@ import {
   showInEditor,
 } from '../../test/test-utils-vscode';
 import { fromVsCodeUri } from '../../utils/vsc-utils';
+import { CREATE_NOTE_COMMAND } from './create-note';
 
 describe('create-note command', () => {
   afterEach(() => {
@@ -22,7 +23,7 @@ describe('create-note command', () => {
       .mockImplementationOnce(jest.fn(() => Promise.resolve('Test note')));
 
     await commands.executeCommand('foam-vscode.create-note');
-    expect(spy).toBeCalled();
+    expect(spy).toHaveBeenCalled();
     const target = asAbsoluteWorkspaceUri(URI.file('Test note.md'));
     expectSameUri(target, window.activeTextEditor?.document.uri);
     await deleteFile(target);
@@ -124,7 +125,7 @@ describe('create-note command', () => {
       text: 'test ask',
       onFileExists: 'ask',
     });
-    expect(spy).toBeCalled();
+    expect(spy).toHaveBeenCalled();
 
     await deleteFile(target);
   });
@@ -183,8 +184,22 @@ describe('create-note command', () => {
       text: 'test asking',
       onRelativeNotePath: 'ask',
     });
-    expect(spy).toBeCalled();
+    expect(spy).toHaveBeenCalled();
 
     await deleteFile(base);
   });
 });
+
+describe('factories', () => {
+  describe('forPlaceholder', () => {
+    it('adds the .md extension to notes created for placeholders', async () => {
+      await closeEditors();
+      const command = CREATE_NOTE_COMMAND.forPlaceholder('my-placeholder');
+      await commands.executeCommand(command.name, command.params);
+
+      const doc = window.activeTextEditor.document;
+      expect(doc.uri.path).toMatch(/my-placeholder.md$/);
+      expect(doc.getText()).toMatch(/^# my-placeholder/);
+    });
+  });
+});

packages/foam-vscode/src/features/commands/create-note.ts

@@ -1,5 +1,4 @@
 import * as vscode from 'vscode';
-import { FoamFeature } from '../../types';
 import { URI } from '../../core/model/uri';
 import {
   askUserForTemplate,
@@ -7,10 +6,16 @@ import {
   getPathFromTitle,
   NoteFactory,
 } from '../../services/templates';
-import { Foam } from '../../core/model/foam';
 import { Resolver } from '../../services/variable-resolver';
 import { asAbsoluteWorkspaceUri, fileExists } from '../../services/editor';
 import { isSome } from '../../core/utils';
+import { CommandDescriptor } from '../../utils/commands';
+
+export default async function activate(context: vscode.ExtensionContext) {
+  context.subscriptions.push(
+    vscode.commands.registerCommand(CREATE_NOTE_COMMAND.command, createNote)
+  );
+}
 
 interface CreateNoteArgs {
   /**
@@ -34,11 +39,15 @@ interface CreateNoteArgs {
   /**
    * Variables to use in the text or template
    */
-  variables?: Map<string, string>;
+  variables?: { [key: string]: string };
   /**
    * The date used to resolve the FOAM_DATE_* variables. in YYYY-MM-DD format
    */
   date?: string;
+  /**
+   * The title of the note (translates into the FOAM_TITLE variable)
+   */
+  title?: string;
   /**
    * What to do in case the target file already exists
    */
@@ -64,6 +73,9 @@ async function createNote(args: CreateNoteArgs) {
     new Map(Object.entries(args.variables ?? {})),
     date
   );
+  if (args.title) {
+    resolver.define('FOAM_TITLE', args.title);
+  }
   const text = args.text ?? DEFAULT_NEW_NOTE_TEXT;
   const noteUri = args.notePath && URI.file(args.notePath);
   let templateUri: URI;
@@ -101,20 +113,24 @@ async function createNote(args: CreateNoteArgs) {
 
 export const CREATE_NOTE_COMMAND = {
   command: 'foam-vscode.create-note',
-  title: 'Foam: Create Note',
 
-  asURI: (args: CreateNoteArgs) =>
-    vscode.Uri.parse(`command:${CREATE_NOTE_COMMAND.command}`).with({
-      query: encodeURIComponent(JSON.stringify(args)),
-    }),
-};
-
-const feature: FoamFeature = {
-  activate: (context: vscode.ExtensionContext, foamPromise: Promise<Foam>) => {
-    context.subscriptions.push(
-      vscode.commands.registerCommand(CREATE_NOTE_COMMAND.command, createNote)
-    );
+  forPlaceholder: (
+    placeholder: string,
+    extra: Partial<CreateNoteArgs> = {}
+  ): CommandDescriptor<CreateNoteArgs> => {
+    const title = placeholder.endsWith('.md')
+      ? placeholder.replace(/\.md$/, '')
+      : placeholder;
+    const notePath = placeholder.endsWith('.md')
+      ? placeholder
+      : placeholder + '.md';
+    return {
+      name: CREATE_NOTE_COMMAND.command,
+      params: {
+        title,
+        notePath,
+        ...extra,
+      },
+    };
   },
 };
-
-export default feature;

packages/foam-vscode/src/features/commands/index.ts

@@ -1,5 +1,4 @@
 export { default as copyWithoutBracketsCommand } from './copy-without-brackets';
-export { default as createFromDefaultTemplateCommand } from './create-note-from-default-template';
 export { default as createFromTemplateCommand } from './create-note-from-template';
 export { default as createNewTemplate } from './create-new-template';
 export { default as janitorCommand } from './janitor';

packages/foam-vscode/src/features/commands/janitor.ts

@@ -5,12 +5,7 @@ import {
   commands,
   ProgressLocation,
 } from 'vscode';
-import { FoamFeature } from '../../types';
-
-import {
-  getWikilinkDefinitionSetting,
-  LinkReferenceDefinitionsSetting,
-} from '../../settings';
+import { getWikilinkDefinitionSetting } from '../../settings';
 import {
   toVsCodePosition,
   toVsCodeRange,
@@ -20,18 +15,19 @@ import { Foam } from '../../core/model/foam';
 import { Resource } from '../../core/model/note';
 import { generateHeading, generateLinkReferences } from '../../core/janitor';
 import { Range } from '../../core/model/range';
-import { applyTextEdit } from '../../core/janitor/apply-text-edit';
 import detectNewline from 'detect-newline';
+import { TextEdit } from '../../core/services/text-edit';
 
-const feature: FoamFeature = {
-  activate: (context: ExtensionContext, foamPromise: Promise<Foam>) => {
-    context.subscriptions.push(
-      commands.registerCommand('foam-vscode.janitor', async () =>
-        janitor(await foamPromise)
-      )
-    );
-  },
-};
+export default async function activate(
+  context: ExtensionContext,
+  foamPromise: Promise<Foam>
+) {
+  context.subscriptions.push(
+    commands.registerCommand('foam-vscode.janitor', async () =>
+      janitor(await foamPromise)
+    )
+  );
+}
 
 async function janitor(foam: Foam) {
   try {
@@ -109,14 +105,14 @@ async function runJanitor(foam: Foam) {
     }
 
     const definitions =
-      wikilinkSetting === LinkReferenceDefinitionsSetting.off
+      wikilinkSetting === 'off'
         ? null
         : await generateLinkReferences(
             note,
             noteText,
             noteEol,
             foam.workspace,
-            wikilinkSetting === LinkReferenceDefinitionsSetting.withExtensions
+            wikilinkSetting === 'withExtensions'
           );
     if (definitions) {
       updatedDefinitionListCount += 1;
@@ -130,8 +126,8 @@ async function runJanitor(foam: Foam) {
     // Note: The ordering matters. Definitions need to be inserted
     // before heading, since inserting a heading changes line numbers below
     let text = noteText;
-    text = definitions ? applyTextEdit(text, definitions) : text;
-    text = heading ? applyTextEdit(text, heading) : text;
+    text = definitions ? TextEdit.apply(text, definitions) : text;
+    text = heading ? TextEdit.apply(text, heading) : text;
 
     return workspace.fs.writeFile(toVsCodeUri(note.uri), Buffer.from(text));
   });
@@ -151,14 +147,14 @@ async function runJanitor(foam: Foam) {
     // Get edits
     const heading = await generateHeading(note, noteText, eol);
     const definitions =
-      wikilinkSetting === LinkReferenceDefinitionsSetting.off
+      wikilinkSetting === 'off'
         ? null
         : await generateLinkReferences(
             note,
             noteText,
             eol,
             foam.workspace,
-            wikilinkSetting === LinkReferenceDefinitionsSetting.withExtensions
+            wikilinkSetting === 'withExtensions'
           );
 
     if (heading || definitions) {
@@ -192,5 +188,3 @@ async function runJanitor(foam: Foam) {
     changedAnyFiles: updatedHeadingCount + updatedDefinitionListCount,
   };
 }
-
-export default feature;

packages/foam-vscode/src/features/commands/open-daily-note-for-date.spec.ts

@@ -9,7 +9,7 @@ describe('open-daily-note-for-date command', () => {
 
     await commands.executeCommand('foam-vscode.open-daily-note-for-date');
 
-    expect(spy).toBeCalledWith(
+    expect(spy).toHaveBeenCalledWith(
       expect.objectContaining([
         expect.objectContaining({
           label: expect.stringContaining(

packages/foam-vscode/src/features/commands/open-daily-note-for-date.ts

@@ -1,32 +1,33 @@
 import { ExtensionContext, commands, window, QuickPickItem } from 'vscode';
-import { FoamFeature } from '../../types';
 import { openDailyNoteFor } from '../../dated-notes';
 import { FoamWorkspace } from '../../core/model/workspace';
 import { range } from 'lodash';
 import dateFormat from 'dateformat';
+import { Foam } from '../../core/model/foam';
 
-const feature: FoamFeature = {
-  activate: (context: ExtensionContext, foamPromise) => {
-    context.subscriptions.push(
-      commands.registerCommand(
-        'foam-vscode.open-daily-note-for-date',
-        async () => {
-          const ws = (await foamPromise).workspace;
-          const date = await window
-            .showQuickPick<DateItem>(generateDateItems(ws), {
-              placeHolder: 'Choose or type a date (YYYY-MM-DD)',
-              matchOnDescription: true,
-              matchOnDetail: true,
-            })
-            .then(item => {
-              return item?.date;
-            });
-          return openDailyNoteFor(date);
-        }
-      )
-    );
-  },
-};
+export default async function activate(
+  context: ExtensionContext,
+  foamPromise: Promise<Foam>
+) {
+  context.subscriptions.push(
+    commands.registerCommand(
+      'foam-vscode.open-daily-note-for-date',
+      async () => {
+        const ws = (await foamPromise).workspace;
+        const date = await window
+          .showQuickPick<DateItem>(generateDateItems(ws), {
+            placeHolder: 'Choose or type a date (YYYY-MM-DD)',
+            matchOnDescription: true,
+            matchOnDetail: true,
+          })
+          .then(item => {
+            return item?.date;
+          });
+        return openDailyNoteFor(date);
+      }
+    )
+  );
+}
 
 class DateItem implements QuickPickItem {
   public label: string;
@@ -68,5 +69,3 @@ function generateDateItems(ws: FoamWorkspace): DateItem[] {
 
   return items;
 }
-
-export default feature;

packages/foam-vscode/src/features/commands/open-daily-note.ts

@@ -1,20 +1,15 @@
 import { ExtensionContext, commands } from 'vscode';
-import { FoamFeature } from '../../types';
 import { getFoamVsCodeConfig } from '../../services/config';
 import { openDailyNoteFor } from '../../dated-notes';
 
-const feature: FoamFeature = {
-  activate: (context: ExtensionContext, foamPromise) => {
-    context.subscriptions.push(
-      commands.registerCommand('foam-vscode.open-daily-note', () =>
-        openDailyNoteFor(new Date())
-      )
-    );
+export default async function activate(context: ExtensionContext) {
+  context.subscriptions.push(
+    commands.registerCommand('foam-vscode.open-daily-note', () =>
+      openDailyNoteFor(new Date())
+    )
+  );
 
-    if (getFoamVsCodeConfig('openDailyNote.onStartup', false)) {
-      commands.executeCommand('foam-vscode.open-daily-note');
-    }
-  },
-};
-
-export default feature;
+  if (getFoamVsCodeConfig('openDailyNote.onStartup', false)) {
+    commands.executeCommand('foam-vscode.open-daily-note');
+  }
+}

packages/foam-vscode/src/features/commands/open-dated-note.ts

@@ -1,24 +1,19 @@
 import { ExtensionContext, commands } from 'vscode';
-import { FoamFeature } from '../../types';
 import { getFoamVsCodeConfig } from '../../services/config';
 import {
   createDailyNoteIfNotExists,
   openDailyNoteFor,
 } from '../../dated-notes';
 
-const feature: FoamFeature = {
-  activate: (context: ExtensionContext) => {
-    context.subscriptions.push(
-      commands.registerCommand('foam-vscode.open-dated-note', date => {
-        switch (getFoamVsCodeConfig('dateSnippets.afterCompletion')) {
-          case 'navigateToNote':
-            return openDailyNoteFor(date);
-          case 'createNote':
-            return createDailyNoteIfNotExists(date);
-        }
-      })
-    );
-  },
-};
-
-export default feature;
+export default async function activate(context: ExtensionContext) {
+  context.subscriptions.push(
+    commands.registerCommand('foam-vscode.open-dated-note', date => {
+      switch (getFoamVsCodeConfig('dateSnippets.afterCompletion')) {
+        case 'navigateToNote':
+          return openDailyNoteFor(date);
+        case 'createNote':
+          return createDailyNoteIfNotExists(date);
+      }
+    })
+  );
+}

packages/foam-vscode/src/features/commands/open-random-note.ts

@@ -1,31 +1,29 @@
 import { ExtensionContext, commands, window } from 'vscode';
-import { FoamFeature } from '../../types';
 import { focusNote } from '../../utils';
 import { Foam } from '../../core/model/foam';
 
-const feature: FoamFeature = {
-  activate: (context: ExtensionContext, foamPromise: Promise<Foam>) => {
-    context.subscriptions.push(
-      commands.registerCommand('foam-vscode.open-random-note', async () => {
-        const foam = await foamPromise;
-        const currentFile = window.activeTextEditor?.document.uri.path;
-        const notes = foam.workspace.list().filter(r => r.uri.isMarkdown());
-        if (notes.length <= 1) {
-          window.showInformationMessage(
-            'Could not find another note to open. If you believe this is a bug, please file an issue.'
-          );
-          return;
-        }
+export default async function activate(
+  context: ExtensionContext,
+  foamPromise: Promise<Foam>
+) {
+  context.subscriptions.push(
+    commands.registerCommand('foam-vscode.open-random-note', async () => {
+      const foam = await foamPromise;
+      const currentFile = window.activeTextEditor?.document.uri.path;
+      const notes = foam.workspace.list().filter(r => r.uri.isMarkdown());
+      if (notes.length <= 1) {
+        window.showInformationMessage(
+          'Could not find another note to open. If you believe this is a bug, please file an issue.'
+        );
+        return;
+      }
 
-        let randomNoteIndex = Math.floor(Math.random() * notes.length);
-        if (notes[randomNoteIndex].uri.path === currentFile) {
-          randomNoteIndex = (randomNoteIndex + 1) % notes.length;
-        }
+      let randomNoteIndex = Math.floor(Math.random() * notes.length);
+      if (notes[randomNoteIndex].uri.path === currentFile) {
+        randomNoteIndex = (randomNoteIndex + 1) % notes.length;
+      }
 
-        focusNote(notes[randomNoteIndex].uri, false);
-      })
-    );
-  },
-};
-
-export default feature;
+      focusNote(notes[randomNoteIndex].uri, false);
+    })
+  );
+}

packages/foam-vscode/src/features/commands/open-resource.spec.ts

@@ -0,0 +1,99 @@
+import { commands, window } from 'vscode';
+import { CommandDescriptor } from '../../utils/commands';
+import { OpenResourceArgs, OPEN_COMMAND } from './open-resource';
+import * as filter from '../../core/services/resource-filter';
+import { URI } from '../../core/model/uri';
+import { closeEditors, createFile } from '../../test/test-utils-vscode';
+import { deleteFile } from '../../services/editor';
+import waitForExpect from 'wait-for-expect';
+
+describe('open-resource command', () => {
+  beforeEach(async () => {
+    await jest.resetAllMocks();
+    await closeEditors();
+  });
+
+  it('URI param has precedence over filter', async () => {
+    const spy = jest.spyOn(filter, 'createFilter');
+    const noteA = await createFile('Note A for open command');
+
+    const command: CommandDescriptor<OpenResourceArgs> = {
+      name: OPEN_COMMAND.command,
+      params: {
+        uri: noteA.uri,
+        filter: { title: 'note 1' },
+      },
+    };
+    await commands.executeCommand(command.name, command.params);
+
+    waitForExpect(() => {
+      expect(window.activeTextEditor.document.uri.path).toEqual(noteA.uri.path);
+    });
+    expect(spy).not.toHaveBeenCalled();
+
+    await deleteFile(noteA.uri);
+  });
+
+  it('URI param accept URI object, or path', async () => {
+    const noteA = await createFile('Note A for open command');
+
+    const uriCommand: CommandDescriptor<OpenResourceArgs> = {
+      name: OPEN_COMMAND.command,
+      params: {
+        uri: URI.file('path/to/file.md'),
+      },
+    };
+    await commands.executeCommand(uriCommand.name, uriCommand.params);
+    waitForExpect(() => {
+      expect(window.activeTextEditor.document.uri.path).toEqual(noteA.uri.path);
+    });
+
+    await closeEditors();
+
+    const pathCommand: CommandDescriptor<OpenResourceArgs> = {
+      name: OPEN_COMMAND.command,
+      params: {
+        uri: URI.file('path/to/file.md'),
+      },
+    };
+    await commands.executeCommand(pathCommand.name, pathCommand.params);
+    waitForExpect(() => {
+      expect(window.activeTextEditor.document.uri.path).toEqual(noteA.uri.path);
+    });
+    await deleteFile(noteA.uri);
+  });
+
+  it('User is notified if no resource is found', async () => {
+    const spy = jest.spyOn(window, 'showInformationMessage');
+
+    const command: CommandDescriptor<OpenResourceArgs> = {
+      name: OPEN_COMMAND.command,
+      params: {
+        filter: { title: 'note 1 with no existing title' },
+      },
+    };
+    await commands.executeCommand(command.name, command.params);
+
+    waitForExpect(() => {
+      expect(spy).toHaveBeenCalled();
+    });
+  });
+
+  it('filter with multiple results will show a quick pick', async () => {
+    const spy = jest
+      .spyOn(window, 'showQuickPick')
+      .mockImplementationOnce(jest.fn(() => Promise.resolve(undefined)));
+
+    const command: CommandDescriptor<OpenResourceArgs> = {
+      name: OPEN_COMMAND.command,
+      params: {
+        filter: { title: '.*' },
+      },
+    };
+    await commands.executeCommand(command.name, command.params);
+
+    waitForExpect(() => {
+      expect(spy).toHaveBeenCalled();
+    });
+  });
+});

packages/foam-vscode/src/features/commands/open-resource.ts

@@ -1,68 +1,113 @@
 import * as vscode from 'vscode';
-import { FoamFeature } from '../../types';
 import { URI } from '../../core/model/uri';
-import { fromVsCodeUri, toVsCodeUri } from '../../utils/vsc-utils';
-import { NoteFactory } from '../../services/templates';
+import { toVsCodeUri } from '../../utils/vsc-utils';
 import { Foam } from '../../core/model/foam';
+import {
+  createFilter,
+  FilterDescriptor,
+} from '../../core/services/resource-filter';
+import { CommandDescriptor } from '../../utils/commands';
+import { FoamWorkspace } from '../../core/model/workspace';
+import { Resource } from '../../core/model/note';
+import { isSome, isNone } from '../../core/utils';
+
+export default async function activate(
+  context: vscode.ExtensionContext,
+  foamPromise: Promise<Foam>
+) {
+  const foam = await foamPromise;
+  context.subscriptions.push(
+    vscode.commands.registerCommand(OPEN_COMMAND.command, args => {
+      return openResource(foam.workspace, args);
+    })
+  );
+}
+
+export interface OpenResourceArgs {
+  /**
+   * The URI of the resource to open.
+   * If present the `filter` param is ignored
+   */
+  uri?: URI | string | vscode.Uri;
+
+  /**
+   * The filter object that describes which notes to consider
+   * for opening
+   */
+  filter?: FilterDescriptor;
+}
 
 export const OPEN_COMMAND = {
   command: 'foam-vscode.open-resource',
   title: 'Foam: Open Resource',
 
-  asURI: (uri: URI) =>
-    vscode.Uri.parse(`command:${OPEN_COMMAND.command}`).with({
-      query: encodeURIComponent(JSON.stringify({ uri })),
-    }),
-};
-
-const feature: FoamFeature = {
-  activate: (context: vscode.ExtensionContext, foamPromise: Promise<Foam>) => {
-    context.subscriptions.push(
-      vscode.commands.registerCommand(
-        OPEN_COMMAND.command,
-        async (params: { uri: URI }) => {
-          const uri = new URI(params.uri);
-          switch (uri.scheme) {
-            case 'file': {
-              const targetUri =
-                uri.path === vscode.window.activeTextEditor?.document.uri.path
-                  ? vscode.window.activeTextEditor?.document.uri
-                  : toVsCodeUri(uri.asPlain());
-              // if the doc is already open, reuse the same colunm
-              const targetEditor = vscode.window.visibleTextEditors.find(
-                ed => targetUri.path === ed.document.uri.path
-              );
-              const column = targetEditor?.viewColumn;
-              return vscode.commands.executeCommand('vscode.open', targetUri);
-            }
-            case 'placeholder': {
-              const title = uri.getName();
-              if (uri.isAbsolute()) {
-                return NoteFactory.createForPlaceholderWikilink(
-                  title,
-                  URI.file(uri.path)
-                );
-              }
-              const basedir =
-                vscode.workspace.workspaceFolders.length > 0
-                  ? vscode.workspace.workspaceFolders[0].uri
-                  : vscode.window.activeTextEditor?.document.uri
-                  ? vscode.window.activeTextEditor!.document.uri
-                  : undefined;
-              if (basedir === undefined) {
-                return;
-              }
-              const target = fromVsCodeUri(basedir)
-                .resolve(uri, true)
-                .changeExtension('', '.md');
-              await NoteFactory.createForPlaceholderWikilink(title, target);
-              return;
-            }
-          }
-        }
-      )
-    );
+  forURI: (uri: URI): CommandDescriptor<OpenResourceArgs> => {
+    return {
+      name: OPEN_COMMAND.command,
+      params: {
+        uri: uri,
+      },
+    };
   },
 };
 
-export default feature;
+async function openResource(workspace: FoamWorkspace, args?: OpenResourceArgs) {
+  args = args ?? {};
+
+  let item: { uri: URI } | null = null;
+
+  if (args.uri) {
+    const path = typeof args.uri === 'string' ? args.uri : args.uri.path;
+    item = workspace.find(path);
+  }
+
+  if (isNone(item) && args.filter) {
+    const resources = workspace.list();
+    const candidates = resources.filter(
+      createFilter(args.filter, vscode.workspace.isTrusted)
+    );
+
+    if (candidates.length === 0) {
+      vscode.window.showInformationMessage(
+        'Foam: No note matches given filters.'
+      );
+      return;
+    }
+
+    item =
+      candidates.length === 1
+        ? candidates[0]
+        : await vscode.window.showQuickPick(
+            candidates.map(createQuickPickItemForResource)
+          );
+  }
+
+  if (isSome(item)) {
+    const targetUri =
+      item.uri.path === vscode.window.activeTextEditor?.document.uri.path
+        ? vscode.window.activeTextEditor?.document.uri
+        : toVsCodeUri(item.uri.asPlain());
+    return vscode.commands.executeCommand('vscode.open', targetUri);
+  }
+}
+
+interface ResourceItem extends vscode.QuickPickItem {
+  label: string;
+  description: string;
+  uri: URI;
+  detail?: string;
+}
+
+const createQuickPickItemForResource = (resource: Resource): ResourceItem => {
+  const icon = 'file';
+  const sections = resource.sections
+    .map(s => s.label)
+    .filter(l => l !== resource.title);
+  const detail = sections.length > 0 ? 'Sections: ' + sections.join(', ') : '';
+  return {
+    label: `$(${icon}) ${resource.title}`,
+    description: vscode.workspace.asRelativePath(resource.uri.toFsPath()),
+    uri: resource.uri,
+    detail: detail,
+  };
+};

packages/foam-vscode/src/features/commands/update-graph.ts

@@ -1,17 +1,16 @@
 import { commands, ExtensionContext } from 'vscode';
-import { FoamFeature } from '../../types';
+import { Foam } from '../../core/model/foam';
 
 export const UPDATE_GRAPH_COMMAND_NAME = 'foam-vscode.update-graph';
 
-const feature: FoamFeature = {
-  activate: (context: ExtensionContext, foamPromise) => {
-    context.subscriptions.push(
-      commands.registerCommand(UPDATE_GRAPH_COMMAND_NAME, async () => {
-        const foam = await foamPromise;
-        return foam.graph.update();
-      })
-    );
-  },
-};
-
-export default feature;
+export default async function activate(
+  context: ExtensionContext,
+  foamPromise: Promise<Foam>
+) {
+  context.subscriptions.push(
+    commands.registerCommand(UPDATE_GRAPH_COMMAND_NAME, async () => {
+      const foam = await foamPromise;
+      return foam.graph.update();
+    })
+  );
+}

packages/foam-vscode/src/features/commands/update-wikilinks.ts

@@ -1,4 +1,3 @@
-import { uniq } from 'lodash';
 import {
   CancellationToken,
   CodeLens,
@@ -12,209 +11,164 @@ import {
   workspace,
   Position,
 } from 'vscode';
-import {
-  hasEmptyTrailing,
-  docConfig,
-  loadDocConfig,
-  isMdEditor,
-  mdDocSelector,
-  getText,
-} from '../../utils';
-import { FoamFeature } from '../../types';
-import {
-  getWikilinkDefinitionSetting,
-  LinkReferenceDefinitionsSetting,
-} from '../../settings';
+import { isMdEditor, mdDocSelector } from '../../utils';
 import { Foam } from '../../core/model/foam';
 import { FoamWorkspace } from '../../core/model/workspace';
-import {
-  createMarkdownReferences,
-  stringifyMarkdownLinkReferenceDefinition,
-} from '../../core/services/markdown-provider';
 import {
   LINK_REFERENCE_DEFINITION_FOOTER,
   LINK_REFERENCE_DEFINITION_HEADER,
+  generateLinkReferences,
 } from '../../core/janitor/generate-link-references';
-import { fromVsCodeUri } from '../../utils/vsc-utils';
+import { fromVsCodeUri, toVsCodeRange } from '../../utils/vsc-utils';
+import { getEditorEOL } from '../../services/editor';
+import { ResourceParser } from '../../core/model/note';
+import { getWikilinkDefinitionSetting } from '../../settings';
+import { IMatcher } from '../../core/services/datastore';
 
-const feature: FoamFeature = {
-  activate: async (context: ExtensionContext, foamPromise: Promise<Foam>) => {
-    const foam = await foamPromise;
+export default async function activate(
+  context: ExtensionContext,
+  foamPromise: Promise<Foam>
+) {
+  const foam = await foamPromise;
 
-    context.subscriptions.push(
-      commands.registerCommand('foam-vscode.update-wikilinks', () =>
-        updateReferenceList(foam.workspace)
-      ),
-      workspace.onWillSaveTextDocument(e => {
-        if (
-          e.document.languageId === 'markdown' &&
-          foam.services.matcher.isMatch(fromVsCodeUri(e.document.uri))
-        ) {
-          e.waitUntil(updateReferenceList(foam.workspace));
-        }
-      }),
-      languages.registerCodeLensProvider(
-        mdDocSelector,
-        new WikilinkReferenceCodeLensProvider(foam.workspace)
+  context.subscriptions.push(
+    commands.registerCommand('foam-vscode.update-wikilink-definitions', () => {
+      return updateWikilinkDefinitions(
+        foam.workspace,
+        foam.services.parser,
+        foam.services.matcher
+      );
+    }),
+    workspace.onWillSaveTextDocument(e => {
+      e.waitUntil(
+        updateWikilinkDefinitions(
+          foam.workspace,
+          foam.services.parser,
+          foam.services.matcher
+        )
+      );
+    }),
+    languages.registerCodeLensProvider(
+      mdDocSelector,
+      new WikilinkReferenceCodeLensProvider(
+        foam.workspace,
+        foam.services.parser
       )
-    );
-  },
-};
-
-async function createReferenceList(foam: FoamWorkspace) {
-  const editor = window.activeTextEditor;
-
-  if (!editor || !isMdEditor(editor)) {
-    return;
-  }
-
-  const refs = await generateReferenceList(foam, editor.document);
-  if (refs && refs.length) {
-    await editor.edit(function(editBuilder) {
-      if (editor) {
-        const spacing = hasEmptyTrailing(editor.document)
-          ? docConfig.eol
-          : docConfig.eol + docConfig.eol;
-
-        editBuilder.insert(
-          new Position(editor.document.lineCount, 0),
-          spacing + refs.join(docConfig.eol)
-        );
-      }
-    });
-  }
+    )
+  );
 }
 
-async function updateReferenceList(foam: FoamWorkspace) {
+async function updateWikilinkDefinitions(
+  fWorkspace: FoamWorkspace,
+  fParser: ResourceParser,
+  fMatcher: IMatcher
+) {
   const editor = window.activeTextEditor;
-
-  if (!editor || !isMdEditor(editor)) {
-    return;
-  }
-
-  loadDocConfig();
-
   const doc = editor.document;
-  const range = detectReferenceListRange(doc);
 
-  if (!range) {
-    await createReferenceList(foam);
-  } else {
-    const refs = generateReferenceList(foam, doc);
-
-    // references must always be preceded by an empty line
-    const spacing = doc.lineAt(range.start.line - 1).isEmptyOrWhitespace
-      ? ''
-      : docConfig.eol;
-
-    await editor.edit(editBuilder => {
-      editBuilder.replace(range, spacing + refs.join(docConfig.eol));
-    });
-  }
-}
-
-function generateReferenceList(
-  foam: FoamWorkspace,
-  doc: TextDocument
-): string[] {
-  const wikilinkSetting = getWikilinkDefinitionSetting();
-
-  if (wikilinkSetting === LinkReferenceDefinitionsSetting.off) {
-    return [];
+  if (!isMdEditor(editor) || !fMatcher.isMatch(fromVsCodeUri(doc.uri))) {
+    return;
   }
 
-  const note = foam.get(fromVsCodeUri(doc.uri));
+  const setting = getWikilinkDefinitionSetting();
+  const eol = getEditorEOL();
+  const text = doc.getText();
 
-  // Should never happen as `doc` is usually given by `editor.document`, which
-  // binds to an opened note.
-  if (!note) {
-    console.warn(
-      `Can't find note for URI ${doc.uri.path} before attempting to generate its markdown reference list`
-    );
-    return [];
+  if (setting === 'off') {
+    const { range } = detectDocumentWikilinkDefinitions(text, eol);
+    if (range) {
+      await editor.edit(editBuilder => {
+        editBuilder.delete(toVsCodeRange(range));
+      });
+    }
+    return;
   }
 
-  const references = uniq(
-    createMarkdownReferences(
-      foam,
-      note.uri,
-      wikilinkSetting === LinkReferenceDefinitionsSetting.withExtensions
-    ).map(stringifyMarkdownLinkReferenceDefinition)
+  const resource = fParser.parse(fromVsCodeUri(doc.uri), text);
+  const update = await generateLinkReferences(
+    resource,
+    text,
+    eol,
+    fWorkspace,
+    setting === 'withExtensions'
   );
 
-  if (references.length) {
-    return [
-      LINK_REFERENCE_DEFINITION_HEADER,
-      ...references,
-      LINK_REFERENCE_DEFINITION_FOOTER,
-    ];
+  if (update) {
+    await editor.edit(editBuilder => {
+      const gap = doc.lineAt(update.range.start.line - 1).isEmptyOrWhitespace
+        ? ''
+        : eol;
+      editBuilder.replace(toVsCodeRange(update.range), gap + update.newText);
+    });
   }
-
-  return [];
 }
 
 /**
- * Find the range of existing reference list
- * @param doc
+ * Detects the range of the wikilink definitions in the document.
  */
-function detectReferenceListRange(doc: TextDocument): Range | null {
-  const fullText = doc.getText();
+function detectDocumentWikilinkDefinitions(text: string, eol: string) {
+  const lines = text.split(eol);
 
-  const headerIndex = fullText.indexOf(LINK_REFERENCE_DEFINITION_HEADER);
-  const footerIndex = fullText.lastIndexOf(LINK_REFERENCE_DEFINITION_FOOTER);
-
-  if (headerIndex < 0) {
-    return null;
-  }
-
-  const headerLine =
-    fullText.substring(0, headerIndex).split(docConfig.eol).length - 1;
-
-  const footerLine =
-    fullText.substring(0, footerIndex).split(docConfig.eol).length - 1;
-
-  if (headerLine >= footerLine) {
-    return null;
-  }
-
-  return new Range(
-    new Position(headerLine, 0),
-    new Position(footerLine, LINK_REFERENCE_DEFINITION_FOOTER.length)
+  const headerLine = lines.findIndex(
+    line => line === LINK_REFERENCE_DEFINITION_HEADER
   );
+  const footerLine = lines.findIndex(
+    line => line === LINK_REFERENCE_DEFINITION_FOOTER
+  );
+
+  if (headerLine < 0 || footerLine < 0 || headerLine >= footerLine) {
+    return { range: null, definitions: null };
+  }
+
+  const range = new Range(
+    new Position(headerLine, 0),
+    new Position(footerLine, lines[footerLine].length)
+  );
+  const definitions = lines.slice(headerLine, footerLine).join(eol);
+
+  return { range, definitions };
 }
 
+/**
+ * Provides a code lens to update the wikilink definitions in the document.
+ */
 class WikilinkReferenceCodeLensProvider implements CodeLensProvider {
-  private foam: FoamWorkspace;
+  constructor(
+    private fWorkspace: FoamWorkspace,
+    private fParser: ResourceParser
+  ) {}
 
-  constructor(foam: FoamWorkspace) {
-    this.foam = foam;
-  }
-
-  public provideCodeLenses(
+  public async provideCodeLenses(
     document: TextDocument,
     _: CancellationToken
-  ): CodeLens[] | Thenable<CodeLens[]> {
-    loadDocConfig();
+  ): Promise<CodeLens[]> {
+    const eol = getEditorEOL();
+    const text = document.getText();
 
-    const range = detectReferenceListRange(document);
+    const { range } = detectDocumentWikilinkDefinitions(text, eol);
     if (!range) {
       return [];
     }
+    const setting = getWikilinkDefinitionSetting();
 
-    const refs = generateReferenceList(this.foam, document);
-    const oldRefs = getText(range).replace(/\r?\n|\r/g, docConfig.eol);
-    const newRefs = refs.join(docConfig.eol);
+    const resource = this.fParser.parse(fromVsCodeUri(document.uri), text);
+    const update = await generateLinkReferences(
+      resource,
+      text,
+      eol,
+      this.fWorkspace,
+      setting === 'withExtensions'
+    );
 
-    const status = oldRefs === newRefs ? 'up to date' : 'out of date';
+    const status = update == null ? 'up to date' : 'out of date';
 
     return [
       new CodeLens(range, {
+        command:
+          update == null ? '' : 'foam-vscode.update-wikilink-definitions',
+        title: `Wikilink definitions (${status})`,
         arguments: [],
-        title: `Link references (${status})`,
-        command: '',
       }),
     ];
   }
 }
-
-export default feature;

packages/foam-vscode/src/features/date-snippets.ts

@@ -9,7 +9,17 @@ import {
 } from 'vscode';
 import { getDailyNoteFileName } from '../dated-notes';
 import { getFoamVsCodeConfig } from '../services/config';
-import { FoamFeature } from '../types';
+
+export default async function activate(context: ExtensionContext) {
+  context.subscriptions.push(
+    languages.registerCompletionItemProvider('markdown', completions, '/'),
+    languages.registerCompletionItemProvider(
+      'markdown',
+      datesCompletionProvider,
+      '/'
+    )
+  );
+}
 
 interface DateSnippet {
   snippet: string;
@@ -198,18 +208,3 @@ export const datesCompletionProvider: CompletionItemProvider = {
     return new CompletionList(completionItems, true);
   },
 };
-
-const feature: FoamFeature = {
-  activate: (context: ExtensionContext) => {
-    context.subscriptions.push(
-      languages.registerCompletionItemProvider('markdown', completions, '/'),
-      languages.registerCompletionItemProvider(
-        'markdown',
-        datesCompletionProvider,
-        '/'
-      )
-    );
-  },
-};
-
-export default feature;

packages/foam-vscode/src/features/document-decorator.ts

@@ -1,6 +1,5 @@
 import { debounce } from 'lodash';
 import * as vscode from 'vscode';
-import { FoamFeature } from '../types';
 import { ResourceParser } from '../core/model/note';
 import { FoamWorkspace } from '../core/model/workspace';
 import { Foam } from '../core/model/foam';
@@ -14,67 +13,62 @@ const placeholderDecoration = vscode.window.createTextEditorDecorationType({
   cursor: 'pointer',
 });
 
-const updateDecorations = (
-  parser: ResourceParser,
-  workspace: FoamWorkspace
-) => (editor: vscode.TextEditor) => {
-  if (!editor || editor.document.languageId !== 'markdown') {
-    return;
-  }
-  const note = parser.parse(
-    fromVsCodeUri(editor.document.uri),
-    editor.document.getText()
-  );
-  const placeholderRanges = [];
-  note.links.forEach(link => {
-    const linkUri = workspace.resolveLink(note, link);
-    if (linkUri.isPlaceholder()) {
-      placeholderRanges.push(
-        Range.create(
-          link.range.start.line,
-          link.range.start.character + (link.type === 'wikilink' ? 2 : 0),
-          link.range.end.line,
-          link.range.end.character - (link.type === 'wikilink' ? 2 : 0)
-        )
-      );
+const updateDecorations =
+  (parser: ResourceParser, workspace: FoamWorkspace) =>
+  (editor: vscode.TextEditor) => {
+    if (!editor || editor.document.languageId !== 'markdown') {
+      return;
     }
-  });
-  editor.setDecorations(placeholderDecoration, placeholderRanges);
-};
-
-const feature: FoamFeature = {
-  activate: async (
-    context: vscode.ExtensionContext,
-    foamPromise: Promise<Foam>
-  ) => {
-    const foam = await foamPromise;
-    let activeEditor = vscode.window.activeTextEditor;
-
-    const immediatelyUpdateDecorations = updateDecorations(
-      foam.services.parser,
-      foam.workspace
+    const note = parser.parse(
+      fromVsCodeUri(editor.document.uri),
+      editor.document.getText()
     );
+    const placeholderRanges = [];
+    note.links.forEach(link => {
+      const linkUri = workspace.resolveLink(note, link);
+      if (linkUri.isPlaceholder()) {
+        placeholderRanges.push(
+          Range.create(
+            link.range.start.line,
+            link.range.start.character + (link.type === 'wikilink' ? 2 : 0),
+            link.range.end.line,
+            link.range.end.character - (link.type === 'wikilink' ? 2 : 0)
+          )
+        );
+      }
+    });
+    editor.setDecorations(placeholderDecoration, placeholderRanges);
+  };
 
-    const debouncedUpdateDecorations = debounce(
-      immediatelyUpdateDecorations,
-      500
-    );
+export default async function activate(
+  context: vscode.ExtensionContext,
+  foamPromise: Promise<Foam>
+) {
+  const foam = await foamPromise;
+  let activeEditor = vscode.window.activeTextEditor;
 
-    immediatelyUpdateDecorations(activeEditor);
+  const immediatelyUpdateDecorations = updateDecorations(
+    foam.services.parser,
+    foam.workspace
+  );
 
-    context.subscriptions.push(
-      placeholderDecoration,
-      vscode.window.onDidChangeActiveTextEditor(editor => {
-        activeEditor = editor;
-        immediatelyUpdateDecorations(activeEditor);
-      }),
-      vscode.workspace.onDidChangeTextDocument(event => {
-        if (activeEditor && event.document === activeEditor.document) {
-          debouncedUpdateDecorations(activeEditor);
-        }
-      })
-    );
-  },
-};
+  const debouncedUpdateDecorations = debounce(
+    immediatelyUpdateDecorations,
+    500
+  );
 
-export default feature;
+  immediatelyUpdateDecorations(activeEditor);
+
+  context.subscriptions.push(
+    placeholderDecoration,
+    vscode.window.onDidChangeActiveTextEditor(editor => {
+      activeEditor = editor;
+      immediatelyUpdateDecorations(activeEditor);
+    }),
+    vscode.workspace.onDidChangeTextDocument(event => {
+      if (activeEditor && event.document === activeEditor.document) {
+        debouncedUpdateDecorations(activeEditor);
+      }
+    })
+  );
+}

packages/foam-vscode/src/features/hover-provider.spec.ts

@@ -92,9 +92,7 @@ describe('Hover provider', () => {
       );
       const noteA = parser.parse(fileA.uri, fileA.content);
       const noteB = parser.parse(fileB.uri, fileB.content);
-      const ws = createWorkspace()
-        .set(noteA)
-        .set(noteB);
+      const ws = createWorkspace().set(noteA).set(noteB);
       const graph = FoamGraph.fromWorkspace(ws);
 
       const provider = new HoverProvider(hoverEnabled, ws, graph, parser);
@@ -133,9 +131,7 @@ describe('Hover provider', () => {
       const noteA = parser.parse(fileA.uri, fileA.content);
       const noteB = parser.parse(fileB.uri, fileB.content);
 
-      const ws = createWorkspace()
-        .set(noteA)
-        .set(noteB);
+      const ws = createWorkspace().set(noteA).set(noteB);
       const graph = FoamGraph.fromWorkspace(ws);
 
       const { doc } = await showInEditor(noteA.uri);
@@ -164,9 +160,7 @@ describe('Hover provider', () => {
       const noteA = parser.parse(fileA.uri, fileA.content);
       const noteB = parser.parse(fileB.uri, fileB.content);
 
-      const ws = createWorkspace()
-        .set(noteA)
-        .set(noteB);
+      const ws = createWorkspace().set(noteA).set(noteB);
       const graph = FoamGraph.fromWorkspace(ws);
 
       const { doc } = await showInEditor(noteA.uri);
@@ -190,9 +184,7 @@ describe('Hover provider', () => {
       );
       const noteA = parser.parse(fileA.uri, fileA.content);
       const noteB = parser.parse(fileB.uri, fileB.content);
-      const ws = createWorkspace()
-        .set(noteA)
-        .set(noteB);
+      const ws = createWorkspace().set(noteA).set(noteB);
       const graph = FoamGraph.fromWorkspace(ws);
 
       const { doc } = await showInEditor(noteA.uri);
@@ -220,9 +212,7 @@ The content of file B`);
       );
       const noteA = parser.parse(fileA.uri, fileA.content);
       const noteB = parser.parse(fileB.uri, fileB.content);
-      const ws = createWorkspace()
-        .set(noteA)
-        .set(noteB);
+      const ws = createWorkspace().set(noteA).set(noteB);
       const graph = FoamGraph.fromWorkspace(ws);
 
       const { doc } = await showInEditor(noteA.uri);

packages/foam-vscode/src/features/hover-provider.ts

@@ -1,6 +1,5 @@
 import { uniqWith } from 'lodash';
 import * as vscode from 'vscode';
-import { FoamFeature } from '../types';
 import { getNoteTooltip, mdDocSelector, isSome } from '../utils';
 import { fromVsCodeUri, toVsCodeRange } from '../utils/vsc-utils';
 import {
@@ -14,34 +13,32 @@ import { Range } from '../core/model/range';
 import { FoamGraph } from '../core/model/graph';
 import { OPEN_COMMAND } from './commands/open-resource';
 import { CREATE_NOTE_COMMAND } from './commands/create-note';
+import { commandAsURI } from '../utils/commands';
 
 export const CONFIG_KEY = 'links.hover.enable';
 
-const feature: FoamFeature = {
-  activate: async (
-    context: vscode.ExtensionContext,
-    foamPromise: Promise<Foam>
-  ) => {
-    const isHoverEnabled: ConfigurationMonitor<boolean> = monitorFoamVsCodeConfig(
-      CONFIG_KEY
-    );
+export default async function activate(
+  context: vscode.ExtensionContext,
+  foamPromise: Promise<Foam>
+) {
+  const isHoverEnabled: ConfigurationMonitor<boolean> =
+    monitorFoamVsCodeConfig(CONFIG_KEY);
 
-    const foam = await foamPromise;
+  const foam = await foamPromise;
 
-    context.subscriptions.push(
-      isHoverEnabled,
-      vscode.languages.registerHoverProvider(
-        mdDocSelector,
-        new HoverProvider(
-          isHoverEnabled,
-          foam.workspace,
-          foam.graph,
-          foam.services.parser
-        )
+  context.subscriptions.push(
+    isHoverEnabled,
+    vscode.languages.registerHoverProvider(
+      mdDocSelector,
+      new HoverProvider(
+        isHoverEnabled,
+        foam.workspace,
+        foam.graph,
+        foam.services.parser
       )
-    );
-  },
-};
+    )
+  );
+}
 
 export class HoverProvider implements vscode.HoverProvider {
   constructor(
@@ -87,7 +84,7 @@ export class HoverProvider implements vscode.HoverProvider {
     );
 
     const links = sources.slice(0, 10).map(ref => {
-      const command = OPEN_COMMAND.asURI(ref);
+      const command = commandAsURI(OPEN_COMMAND.forURI(ref));
       return `- [${this.workspace.get(ref).title}](${command.toString()})`;
     });
 
@@ -109,27 +106,14 @@ export class HoverProvider implements vscode.HoverProvider {
         : this.workspace.get(targetUri).title;
     }
 
-    // If placeholder, offer to create a new note from template (compared to default link provider - not from template)
-    const basedir =
-      vscode.workspace.workspaceFolders.length > 0
-        ? vscode.workspace.workspaceFolders[0].uri
-        : vscode.window.activeTextEditor?.document.uri
-        ? vscode.window.activeTextEditor!.document.uri
-        : undefined;
-    if (basedir === undefined) {
-      return;
-    }
-    const target = fromVsCodeUri(basedir)
-      .resolve(targetUri, true)
-      .changeExtension('', '.md');
-    const args = {
-      text: target.getName(),
-      notePath: target.path,
+    const command = CREATE_NOTE_COMMAND.forPlaceholder(targetUri.path, {
       askForTemplate: true,
-    };
-    const command = CREATE_NOTE_COMMAND.asURI(args);
+      onFileExists: 'open',
+    });
     const newNoteFromTemplate = new vscode.MarkdownString(
-      `[Create note from template for '${targetUri.getName()}'](${command})`
+      `[Create note from template for '${targetUri.getName()}'](${commandAsURI(
+        command
+      ).toString()})`
     );
     newNoteFromTemplate.isTrusted = true;
 
@@ -144,5 +128,3 @@ export class HoverProvider implements vscode.HoverProvider {
     return hover;
   }
 }
-
-export default feature;

packages/foam-vscode/src/features/index.ts

@@ -4,7 +4,7 @@ import * as panels from './panels';
 import dateSnippets from './date-snippets';
 import hoverProvider from './hover-provider';
 import preview from './preview';
-import completionProvider, { completionCursorMove } from './link-completion';
+import completionProvider from './link-completion';
 import tagCompletionProvider from './tag-completion';
 import linkDecorations from './document-decorator';
 import navigationProviders from './navigation-provider';
@@ -23,5 +23,4 @@ export const features: FoamFeature[] = [
   preview,
   completionProvider,
   tagCompletionProvider,
-  completionCursorMove,
 ];

packages/foam-vscode/src/features/link-completion.ts

@@ -5,7 +5,6 @@ import { Resource } from '../core/model/note';
 import { URI } from '../core/model/uri';
 import { FoamWorkspace } from '../core/model/workspace';
 import { getFoamVsCodeConfig } from '../services/config';
-import { FoamFeature } from '../types';
 import { getNoteTooltip, mdDocSelector } from '../utils';
 import { fromVsCodeUri, toVsCodeUri } from '../utils/vsc-utils';
 
@@ -21,88 +20,76 @@ const COMPLETION_CURSOR_MOVE = {
 export const WIKILINK_REGEX = /\[\[[^[\]]*(?!.*\]\])/;
 export const SECTION_REGEX = /\[\[([^[\]]*#(?!.*\]\]))/;
 
-const feature: FoamFeature = {
-  activate: async (
-    context: vscode.ExtensionContext,
-    foamPromise: Promise<Foam>
-  ) => {
-    const foam = await foamPromise;
-    context.subscriptions.push(
-      vscode.languages.registerCompletionItemProvider(
-        mdDocSelector,
-        new WikilinkCompletionProvider(foam.workspace, foam.graph),
-        '['
-      ),
-      vscode.languages.registerCompletionItemProvider(
-        mdDocSelector,
-        new SectionCompletionProvider(foam.workspace),
-        '#'
-      )
-    );
-  },
-};
+export default async function activate(
+  context: vscode.ExtensionContext,
+  foamPromise: Promise<Foam>
+) {
+  const foam = await foamPromise;
+  context.subscriptions.push(
+    vscode.languages.registerCompletionItemProvider(
+      mdDocSelector,
+      new WikilinkCompletionProvider(foam.workspace, foam.graph),
+      '['
+    ),
+    vscode.languages.registerCompletionItemProvider(
+      mdDocSelector,
+      new SectionCompletionProvider(foam.workspace),
+      '#'
+    ),
 
-/**
- * always jump to the closing bracket, but jump back the cursor when commit
- * by alias divider `|` and section divider `#`
- * See https://github.com/foambubble/foam/issues/962,
- */
+    /**
+     * always jump to the closing bracket, but jump back the cursor when commit
+     * by alias divider `|` and section divider `#`
+     * See https://github.com/foambubble/foam/issues/962,
+     */
+    vscode.commands.registerCommand(
+      COMPLETION_CURSOR_MOVE.command,
+      async () => {
+        const activeEditor = vscode.window.activeTextEditor;
+        const document = activeEditor.document;
+        const currentPosition = activeEditor.selection.active;
+        const cursorChange = vscode.window.onDidChangeTextEditorSelection(
+          async e => {
+            const changedPosition = e.selections[0].active;
+            const preChar = document
+              .lineAt(changedPosition.line)
+              .text.charAt(changedPosition.character - 1);
 
-export const completionCursorMove: FoamFeature = {
-  activate: (context: vscode.ExtensionContext, foamPromise: Promise<Foam>) => {
-    context.subscriptions.push(
-      vscode.commands.registerCommand(
-        COMPLETION_CURSOR_MOVE.command,
-        async () => {
-          const activeEditor = vscode.window.activeTextEditor;
-          const document = activeEditor.document;
-          const currentPosition = activeEditor.selection.active;
-          const cursorChange = vscode.window.onDidChangeTextEditorSelection(
-            async e => {
-              const changedPosition = e.selections[0].active;
-              const preChar = document
-                .lineAt(changedPosition.line)
-                .text.charAt(changedPosition.character - 1);
+            const { character: selectionChar, line: selectionLine } =
+              e.selections[0].active;
 
-              const {
-                character: selectionChar,
-                line: selectionLine,
-              } = e.selections[0].active;
+            const { line: completionLine, character: completionChar } =
+              currentPosition;
 
-              const {
-                line: completionLine,
-                character: completionChar,
-              } = currentPosition;
+            const inCompleteBySectionDivider =
+              linkCommitCharacters.includes(preChar) &&
+              selectionLine === completionLine &&
+              selectionChar === completionChar + 1;
 
-              const inCompleteBySectionDivider =
-                linkCommitCharacters.includes(preChar) &&
-                selectionLine === completionLine &&
-                selectionChar === completionChar + 1;
-
-              cursorChange.dispose();
-              if (inCompleteBySectionDivider) {
-                await vscode.commands.executeCommand('cursorMove', {
-                  to: 'left',
-                  by: 'character',
-                  value: 2,
-                });
-              }
+            cursorChange.dispose();
+            if (inCompleteBySectionDivider) {
+              await vscode.commands.executeCommand('cursorMove', {
+                to: 'left',
+                by: 'character',
+                value: 2,
+              });
             }
-          );
+          }
+        );
 
-          await vscode.commands.executeCommand('cursorMove', {
-            to: 'right',
-            by: 'character',
-            value: 2,
-          });
-        }
-      )
-    );
-  },
-};
+        await vscode.commands.executeCommand('cursorMove', {
+          to: 'right',
+          by: 'character',
+          value: 2,
+        });
+      }
+    )
+  );
+}
 
 export class SectionCompletionProvider
-  implements vscode.CompletionItemProvider<vscode.CompletionItem> {
+  implements vscode.CompletionItemProvider<vscode.CompletionItem>
+{
   constructor(private ws: FoamWorkspace) {}
 
   provideCompletionItems(
@@ -162,7 +149,8 @@ export class SectionCompletionProvider
 }
 
 export class WikilinkCompletionProvider
-  implements vscode.CompletionItemProvider<vscode.CompletionItem> {
+  implements vscode.CompletionItemProvider<vscode.CompletionItem>
+{
   constructor(private ws: FoamWorkspace, private graph: FoamGraph) {}
 
   provideCompletionItems(
@@ -293,9 +281,8 @@ class ResourceCompletionItem extends vscode.CompletionItem {
 }
 
 function getCompletionLabelSetting() {
-  const labelStyle: 'path' | 'title' | 'identifier' = getFoamVsCodeConfig(
-    'completion.label'
-  );
+  const labelStyle: 'path' | 'title' | 'identifier' =
+    getFoamVsCodeConfig('completion.label');
   return labelStyle;
 }
 
@@ -310,5 +297,3 @@ const normalize = (text: string) => text.toLocaleLowerCase().trim();
 function wikilinkRequiresAlias(resource: Resource) {
   return normalize(resource.uri.getName()) !== normalize(resource.title);
 }
-
-export default feature;

packages/foam-vscode/src/features/navigation-provider.spec.ts

@@ -1,5 +1,4 @@
 import * as vscode from 'vscode';
-import { URI } from '../core/model/uri';
 import { createTestWorkspace } from '../test/test-utils';
 import {
   cleanWorkspace,
@@ -8,10 +7,11 @@ import {
   showInEditor,
 } from '../test/test-utils-vscode';
 import { NavigationProvider } from './navigation-provider';
-import { OPEN_COMMAND } from './commands/open-resource';
 import { toVsCodeUri } from '../utils/vsc-utils';
 import { createMarkdownParser } from '../core/services/markdown-parser';
 import { FoamGraph } from '../core/model/graph';
+import { commandAsURI } from '../utils/commands';
+import { CREATE_NOTE_COMMAND } from './commands/create-note';
 
 describe('Document navigation', () => {
   const parser = createMarkdownParser([]);
@@ -82,7 +82,11 @@ describe('Document navigation', () => {
 
       expect(links.length).toEqual(1);
       expect(links[0].target).toEqual(
-        OPEN_COMMAND.asURI(URI.placeholder('a placeholder'))
+        commandAsURI(
+          CREATE_NOTE_COMMAND.forPlaceholder('a placeholder', {
+            onFileExists: 'open',
+          })
+        )
       );
       expect(links[0].range).toEqual(new vscode.Range(0, 20, 0, 33));
     });

packages/foam-vscode/src/features/navigation-provider.ts

@@ -1,8 +1,6 @@
 import * as vscode from 'vscode';
-import { FoamFeature } from '../types';
 import { mdDocSelector } from '../utils';
 import { toVsCodeRange, toVsCodeUri, fromVsCodeUri } from '../utils/vsc-utils';
-import { OPEN_COMMAND } from './commands/open-resource';
 import { Foam } from '../core/model/foam';
 import { FoamWorkspace } from '../core/model/workspace';
 import { Resource, ResourceLink, ResourceParser } from '../core/model/note';
@@ -10,36 +8,36 @@ import { URI } from '../core/model/uri';
 import { Range } from '../core/model/range';
 import { FoamGraph } from '../core/model/graph';
 import { Position } from '../core/model/position';
+import { CREATE_NOTE_COMMAND } from './commands/create-note';
+import { commandAsURI } from '../utils/commands';
 
-const feature: FoamFeature = {
-  activate: async (
-    context: vscode.ExtensionContext,
-    foamPromise: Promise<Foam>
-  ) => {
-    const foam = await foamPromise;
+export default async function activate(
+  context: vscode.ExtensionContext,
+  foamPromise: Promise<Foam>
+) {
+  const foam = await foamPromise;
 
-    const navigationProvider = new NavigationProvider(
-      foam.workspace,
-      foam.graph,
-      foam.services.parser
-    );
+  const navigationProvider = new NavigationProvider(
+    foam.workspace,
+    foam.graph,
+    foam.services.parser
+  );
 
-    context.subscriptions.push(
-      vscode.languages.registerDefinitionProvider(
-        mdDocSelector,
-        navigationProvider
-      ),
-      vscode.languages.registerDocumentLinkProvider(
-        mdDocSelector,
-        navigationProvider
-      ),
-      vscode.languages.registerReferenceProvider(
-        mdDocSelector,
-        navigationProvider
-      )
-    );
-  },
-};
+  context.subscriptions.push(
+    vscode.languages.registerDefinitionProvider(
+      mdDocSelector,
+      navigationProvider
+    ),
+    vscode.languages.registerDocumentLinkProvider(
+      mdDocSelector,
+      navigationProvider
+    ),
+    vscode.languages.registerReferenceProvider(
+      mdDocSelector,
+      navigationProvider
+    )
+  );
+}
 
 /**
  * Provides navigation and references for Foam links.
@@ -57,7 +55,8 @@ export class NavigationProvider
   implements
     vscode.DefinitionProvider,
     vscode.DocumentLinkProvider,
-    vscode.ReferenceProvider {
+    vscode.ReferenceProvider
+{
   constructor(
     private workspace: FoamWorkspace,
     private graph: FoamGraph,
@@ -65,7 +64,7 @@ export class NavigationProvider
   ) {}
 
   /**
-   * Provide references for links and placholders
+   * Provide references for links and placeholders
    */
   public provideReferences(
     document: vscode.TextDocument,
@@ -162,7 +161,9 @@ export class NavigationProvider
     return targets
       .filter(o => o.target.isPlaceholder()) // links to resources are managed by the definition provider
       .map(o => {
-        const command = OPEN_COMMAND.asURI(o.target);
+        const command = CREATE_NOTE_COMMAND.forPlaceholder(o.target.path, {
+          onFileExists: 'open',
+        });
 
         const documentLink = new vscode.DocumentLink(
           new vscode.Range(
@@ -171,12 +172,10 @@ export class NavigationProvider
             o.link.range.end.line,
             o.link.range.end.character - 2
           ),
-          command
+          commandAsURI(command)
         );
         documentLink.tooltip = `Create note for '${o.target.path}'`;
         return documentLink;
       });
   }
 }
-
-export default feature;

packages/foam-vscode/src/features/panels/backlinks.spec.ts

@@ -6,12 +6,13 @@ import {
   createNote,
   getUriInWorkspace,
 } from '../../test/test-utils-vscode';
-import { BacklinksTreeDataProvider, BacklinkTreeItem } from './backlinks';
-import { ResourceTreeItem } from '../../utils/grouped-resources-tree-data-provider';
-import { OPEN_COMMAND } from '../commands/open-resource';
-import { toVsCodeUri } from '../../utils/vsc-utils';
+import { ConnectionsTreeDataProvider } from './backlinks';
+import { MapBasedMemento, toVsCodeUri } from '../../utils/vsc-utils';
 import { FoamGraph } from '../../core/model/graph';
-import { URI } from '../../core/model/uri';
+import {
+  ResourceRangeTreeItem,
+  ResourceTreeItem,
+} from './utils/tree-view-utils';
 
 describe('Backlinks panel', () => {
   beforeAll(async () => {
@@ -20,11 +21,6 @@ describe('Backlinks panel', () => {
     await createNote(noteB);
     await createNote(noteC);
   });
-  afterAll(async () => {
-    graph.dispose();
-    ws.dispose();
-    await cleanWorkspace();
-  });
 
   // TODO: this should really just be the workspace folder, use that once #806 is fixed
   const rootUri = getUriInWorkspace('just-a-ref.md');
@@ -44,24 +40,28 @@ describe('Backlinks panel', () => {
     uri: './note-c.md',
     links: [{ slug: 'note-a' }],
   });
-  ws.set(noteA)
-    .set(noteB)
-    .set(noteC);
+  ws.set(noteA).set(noteB).set(noteC);
   const graph = FoamGraph.fromWorkspace(ws, true);
 
-  const provider = new BacklinksTreeDataProvider(ws, graph);
+  const provider = new ConnectionsTreeDataProvider(
+    ws,
+    graph,
+    new MapBasedMemento(),
+    false
+  );
+
+  afterAll(async () => {
+    graph.dispose();
+    ws.dispose();
+    provider.dispose();
+    await cleanWorkspace();
+  });
 
   beforeEach(async () => {
     await closeEditors();
     provider.target = undefined;
   });
 
-  // Skipping these as still figuring out how to interact with the provider
-  // running in the test instance of VS Code
-  it.skip('does not target excluded files', async () => {
-    provider.target = URI.file('/excluded-file.txt');
-    expect(await provider.getChildren()).toEqual([]);
-  });
   it.skip('targets active editor', async () => {
     const docA = await workspace.openTextDocument(toVsCodeUri(noteA.uri));
     const docB = await workspace.openTextDocument(toVsCodeUri(noteB.uri));
@@ -75,6 +75,7 @@ describe('Backlinks panel', () => {
 
   it('shows linking resources alphaetically by name', async () => {
     provider.target = noteA.uri;
+    await provider.refresh();
     const notes = (await provider.getChildren()) as ResourceTreeItem[];
     expect(notes.map(n => n.resource.uri.path)).toEqual([
       noteB.uri.path,
@@ -83,34 +84,45 @@ describe('Backlinks panel', () => {
   });
   it('shows references in range order', async () => {
     provider.target = noteA.uri;
+    await provider.refresh();
     const notes = (await provider.getChildren()) as ResourceTreeItem[];
     const linksFromB = (await provider.getChildren(
       notes[0]
-    )) as BacklinkTreeItem[];
-    expect(linksFromB.map(l => l.link)).toEqual(
-      noteB.links.sort(
-        (a, b) => a.range.start.character - b.range.start.character
-      )
+    )) as ResourceRangeTreeItem[];
+    expect(linksFromB.map(l => l.range)).toEqual(
+      noteB.links
+        .map(l => l.range)
+        .sort((a, b) => a.start.character - b.start.character)
     );
   });
   it('navigates to the document if clicking on note', async () => {
     provider.target = noteA.uri;
+    await provider.refresh();
     const notes = (await provider.getChildren()) as ResourceTreeItem[];
     expect(notes[0].command).toMatchObject({
-      command: OPEN_COMMAND.command,
-      arguments: [expect.objectContaining({ uri: noteB.uri })],
+      command: 'vscode.open',
+      arguments: [expect.objectContaining({ path: noteB.uri.path })],
+    });
+    const links = (await provider.getChildren(notes[0])) as ResourceTreeItem[];
+    expect(links[0].command).toMatchObject({
+      command: 'vscode.open',
+      arguments: [
+        expect.objectContaining({ path: noteB.uri.path }),
+        expect.objectContaining({ selection: expect.anything() }),
+      ],
     });
   });
   it('navigates to document with link selection if clicking on backlink', async () => {
     provider.target = noteA.uri;
+    await provider.refresh();
     const notes = (await provider.getChildren()) as ResourceTreeItem[];
     const linksFromB = (await provider.getChildren(
       notes[0]
-    )) as BacklinkTreeItem[];
+    )) as ResourceRangeTreeItem[];
     expect(linksFromB[0].command).toMatchObject({
       command: 'vscode.open',
       arguments: [
-        noteB.uri,
+        expect.objectContaining({ path: noteB.uri.path }),
         {
           selection: expect.arrayContaining([]),
         },
@@ -120,7 +132,7 @@ describe('Backlinks panel', () => {
   it('refreshes upon changes in the workspace', async () => {
     let notes: ResourceTreeItem[] = [];
     provider.target = noteA.uri;
-
+    await provider.refresh();
     notes = (await provider.getChildren()) as ResourceTreeItem[];
     expect(notes.length).toEqual(2);
 
@@ -129,6 +141,7 @@ describe('Backlinks panel', () => {
       uri: './note-d.md',
     });
     ws.set(noteD);
+    await provider.refresh();
     notes = (await provider.getChildren()) as ResourceTreeItem[];
     expect(notes.length).toEqual(2);
 
@@ -138,8 +151,8 @@ describe('Backlinks panel', () => {
       links: [{ slug: 'note-a' }],
     });
     ws.set(noteDBis);
+    await provider.refresh();
     notes = (await provider.getChildren()) as ResourceTreeItem[];
-    expect(notes.length).toEqual(3);
     expect(notes.map(n => n.resource.uri.path)).toEqual(
       [noteB.uri, noteC.uri, noteD.uri].map(uri => uri.path)
     );

packages/foam-vscode/src/features/panels/backlinks.ts

@@ -1,146 +1,171 @@
 import * as vscode from 'vscode';
-import { groupBy } from 'lodash';
 import { URI } from '../../core/model/uri';
-
-import { getNoteTooltip, isNone } from '../../utils';
-import { FoamFeature } from '../../types';
-import { ResourceTreeItem } from '../../utils/grouped-resources-tree-data-provider';
+import { isNone } from '../../utils';
 import { Foam } from '../../core/model/foam';
 import { FoamWorkspace } from '../../core/model/workspace';
-import { FoamGraph } from '../../core/model/graph';
-import { Resource, ResourceLink } from '../../core/model/note';
+import { Connection, FoamGraph } from '../../core/model/graph';
 import { Range } from '../../core/model/range';
-import { fromVsCodeUri, toVsCodeUri } from '../../utils/vsc-utils';
+import { ContextMemento, fromVsCodeUri } from '../../utils/vsc-utils';
+import {
+  BaseTreeItem,
+  ResourceRangeTreeItem,
+  ResourceTreeItem,
+  UriTreeItem,
+  createConnectionItemsForResource,
+} from './utils/tree-view-utils';
+import { BaseTreeProvider } from './utils/base-tree-provider';
 
-const feature: FoamFeature = {
-  activate: async (
-    context: vscode.ExtensionContext,
-    foamPromise: Promise<Foam>
-  ) => {
-    const foam = await foamPromise;
+export default async function activate(
+  context: vscode.ExtensionContext,
+  foamPromise: Promise<Foam>
+) {
+  const foam = await foamPromise;
 
-    const provider = new BacklinksTreeDataProvider(foam.workspace, foam.graph);
+  const provider = new ConnectionsTreeDataProvider(
+    foam.workspace,
+    foam.graph,
+    context.globalState
+  );
+  const treeView = vscode.window.createTreeView('foam-vscode.connections', {
+    treeDataProvider: provider,
+    showCollapseAll: true,
+  });
+  const baseTitle = treeView.title;
 
-    vscode.window.onDidChangeActiveTextEditor(async () => {
-      provider.target = vscode.window.activeTextEditor
-        ? fromVsCodeUri(vscode.window.activeTextEditor?.document.uri)
-        : undefined;
-      await provider.refresh();
-    });
+  const updateTreeView = async () => {
+    provider.target = vscode.window.activeTextEditor
+      ? fromVsCodeUri(vscode.window.activeTextEditor?.document.uri)
+      : undefined;
+    await provider.refresh();
+  };
 
-    context.subscriptions.push(
-      vscode.window.registerTreeDataProvider('foam-vscode.backlinks', provider),
-      foam.graph.onDidUpdate(() => provider.refresh())
-    );
-  },
-};
-export default feature;
+  updateTreeView();
 
-export class BacklinksTreeDataProvider
-  implements vscode.TreeDataProvider<BacklinkPanelTreeItem> {
+  context.subscriptions.push(
+    provider,
+    treeView,
+    foam.graph.onDidUpdate(() => updateTreeView()),
+    vscode.window.onDidChangeActiveTextEditor(() => updateTreeView()),
+    provider.onDidChangeTreeData(() => {
+      treeView.title = ` ${provider.show.get()} (${provider.nValues})`;
+    })
+  );
+}
+
+export class ConnectionsTreeDataProvider extends BaseTreeProvider<vscode.TreeItem> {
+  public show = new ContextMemento<'connections' | 'backlinks' | 'links'>(
+    this.state,
+    `foam-vscode.views.connections.show`,
+    'connections',
+    true
+  );
   public target?: URI = undefined;
-  // prettier-ignore
-  private _onDidChangeTreeDataEmitter = new vscode.EventEmitter<BacklinkPanelTreeItem | undefined | void>();
-  readonly onDidChangeTreeData = this._onDidChangeTreeDataEmitter.event;
+  public nValues = 0;
+  private connectionItems: ResourceRangeTreeItem[] = [];
 
-  constructor(private workspace: FoamWorkspace, private graph: FoamGraph) {}
-
-  refresh(): void {
-    this._onDidChangeTreeDataEmitter.fire();
-  }
-
-  getTreeItem(item: BacklinkPanelTreeItem): vscode.TreeItem {
-    return item;
-  }
-
-  getChildren(item?: ResourceTreeItem): Thenable<BacklinkPanelTreeItem[]> {
-    const uri = this.target;
-    if (item) {
-      const resource = item.resource;
-
-      const backlinkRefs = Promise.all(
-        resource.links
-          .filter(link =>
-            this.workspace
-              .resolveLink(resource, link)
-              .asPlain()
-              .isEqual(uri)
-          )
-          .map(async link => {
-            const item = new BacklinkTreeItem(resource, link);
-            const lines = (
-              (await this.workspace.readAsMarkdown(resource.uri)) ?? ''
-            ).split('\n');
-            if (link.range.start.line < lines.length) {
-              const line = lines[link.range.start.line];
-              const start = Math.max(0, link.range.start.character - 15);
-              const ellipsis = start === 0 ? '' : '...';
-
-              item.label = `${link.range.start.line}: ${ellipsis}${line.substr(
-                start,
-                300
-              )}`;
-              item.tooltip = getNoteTooltip(line);
-            }
-            return item;
-          })
-      );
-
-      return backlinkRefs;
-    }
-
-    if (isNone(uri) || isNone(this.workspace.find(uri))) {
-      return Promise.resolve([]);
-    }
-
-    const backlinksByResourcePath = groupBy(
-      this.graph
-        .getConnections(uri)
-        .filter(c => c.target.asPlain().isEqual(uri)),
-      b => b.source.path
-    );
-
-    const resources = Object.keys(backlinksByResourcePath)
-      .map(res => backlinksByResourcePath[res][0].source)
-      .map(uri => this.workspace.get(uri))
-      .sort(Resource.sortByTitle)
-      .map(note => {
-        const connections = backlinksByResourcePath[
-          note.uri.path
-        ].sort((a, b) => Range.isBefore(a.link.range, b.link.range));
-        const item = new ResourceTreeItem(
-          note,
-          this.workspace,
-          vscode.TreeItemCollapsibleState.Expanded
-        );
-        item.description = `(${connections.length}) ${item.description}`;
-        return item;
-      });
-    return Promise.resolve(resources);
-  }
-
-  resolveTreeItem(item: BacklinkPanelTreeItem): Promise<BacklinkPanelTreeItem> {
-    return item.resolveTreeItem();
-  }
-}
-
-export class BacklinkTreeItem extends vscode.TreeItem {
   constructor(
-    public readonly resource: Resource,
-    public readonly link: ResourceLink
+    private workspace: FoamWorkspace,
+    private graph: FoamGraph,
+    public state: vscode.Memento,
+    registerCommands = true // for testing. don't love it, but will do for now
   ) {
-    super(link.rawText, vscode.TreeItemCollapsibleState.None);
-    this.label = `${link.range.start.line}: ${this.label}`;
-    this.command = {
-      command: 'vscode.open',
-      arguments: [toVsCodeUri(resource.uri), { selection: link.range }],
-      title: 'Go to link',
-    };
+    super();
+    if (!registerCommands) {
+      return;
+    }
+    this.disposables.push(
+      vscode.commands.registerCommand(
+        `foam-vscode.views.connections.show:connections`,
+        () => {
+          this.show.update('connections');
+          this.refresh();
+        }
+      ),
+      vscode.commands.registerCommand(
+        `foam-vscode.views.connections.show:backlinks`,
+        () => {
+          this.show.update('backlinks');
+          this.refresh();
+        }
+      ),
+      vscode.commands.registerCommand(
+        `foam-vscode.views.connections.show:links`,
+        () => {
+          this.show.update('links');
+          this.refresh();
+        }
+      )
+    );
   }
 
-  resolveTreeItem(): Promise<BacklinkTreeItem> {
-    return Promise.resolve(this);
+  async refresh(): Promise<void> {
+    const uri = this.target;
+
+    const connectionItems =
+      isNone(uri) || isNone(this.workspace.find(uri))
+        ? []
+        : await createConnectionItemsForResource(
+            this.workspace,
+            this.graph,
+            uri,
+            (connection: Connection) => {
+              const isBacklink = connection.target
+                .asPlain()
+                .isEqual(this.target);
+              return (
+                this.show.get() === 'connections' ||
+                (isBacklink && this.show.get() === 'backlinks') ||
+                (!isBacklink && this.show.get() === 'links')
+              );
+            }
+          );
+
+    this.connectionItems = connectionItems;
+    this.nValues = connectionItems.length;
+    super.refresh();
+  }
+
+  async getChildren(item?: BacklinkPanelTreeItem): Promise<vscode.TreeItem[]> {
+    if (item && item instanceof BaseTreeItem) {
+      return item.getChildren();
+    }
+
+    const byResource = this.connectionItems.reduce((acc, item) => {
+      const connection = item.value as Connection;
+      const isBacklink = connection.target.asPlain().isEqual(this.target);
+      const uri = isBacklink ? connection.source : connection.target;
+      acc.set(uri.toString(), [...(acc.get(uri.toString()) ?? []), item]);
+      return acc;
+    }, new Map() as Map<string, ResourceRangeTreeItem[]>);
+
+    const resourceItems = [];
+    for (const [uriString, items] of byResource.entries()) {
+      const uri = URI.parse(uriString);
+      const item = uri.isPlaceholder()
+        ? new UriTreeItem(uri, {
+            collapsibleState: vscode.TreeItemCollapsibleState.Expanded,
+          })
+        : new ResourceTreeItem(this.workspace.get(uri), this.workspace, {
+            collapsibleState: vscode.TreeItemCollapsibleState.Expanded,
+          });
+      const children = items.sort((a, b) => {
+        return (
+          a.variant.localeCompare(b.variant) || Range.isBefore(a.range, b.range)
+        );
+      });
+      item.getChildren = () => Promise.resolve(children);
+      item.description = `(${items.length}) ${item.description}`;
+      // item.iconPath = children.every(c => c.variant === children[0].variant)
+      //   ? children[0].iconPath
+      //   : new vscode.ThemeIcon(
+      //       'arrow-swap',
+      //       new vscode.ThemeColor('charts.purple')
+      //     );
+      resourceItems.push(item);
+    }
+    resourceItems.sort((a, b) => a.label.localeCompare(b.label));
+    return resourceItems;
   }
 }
 
-type BacklinkPanelTreeItem = ResourceTreeItem | BacklinkTreeItem;
+type BacklinkPanelTreeItem = ResourceTreeItem | ResourceRangeTreeItem;

packages/foam-vscode/src/features/panels/dataviz.ts

@@ -1,5 +1,4 @@
 import * as vscode from 'vscode';
-import { FoamFeature } from '../../types';
 import { TextDecoder } from 'util';
 import { getGraphStyle, getTitleMaxLength } from '../../settings';
 import { isSome } from '../../utils';
@@ -7,53 +6,54 @@ import { Foam } from '../../core/model/foam';
 import { Logger } from '../../core/utils/log';
 import { fromVsCodeUri } from '../../utils/vsc-utils';
 
-const feature: FoamFeature = {
-  activate: (context: vscode.ExtensionContext, foamPromise: Promise<Foam>) => {
-    let panel: vscode.WebviewPanel | undefined = undefined;
-    vscode.workspace.onDidChangeConfiguration(event => {
-      if (event.affectsConfiguration('foam.graph.style')) {
-        const style = getGraphStyle();
-        panel.webview.postMessage({
-          type: 'didUpdateStyle',
-          payload: style,
-        });
-      }
-    });
+export default async function activate(
+  context: vscode.ExtensionContext,
+  foamPromise: Promise<Foam>
+) {
+  let panel: vscode.WebviewPanel | undefined = undefined;
+  vscode.workspace.onDidChangeConfiguration(event => {
+    if (event.affectsConfiguration('foam.graph.style')) {
+      const style = getGraphStyle();
+      panel.webview.postMessage({
+        type: 'didUpdateStyle',
+        payload: style,
+      });
+    }
+  });
 
-    vscode.commands.registerCommand('foam-vscode.show-graph', async () => {
-      if (panel) {
-        const columnToShowIn = vscode.window.activeTextEditor
-          ? vscode.window.activeTextEditor.viewColumn
-          : undefined;
-        panel.reveal(columnToShowIn);
-      } else {
-        const foam = await foamPromise;
-        panel = await createGraphPanel(foam, context);
-        const onFoamChanged = _ => {
-          updateGraph(panel, foam);
-        };
+  vscode.commands.registerCommand('foam-vscode.show-graph', async () => {
+    if (panel) {
+      const columnToShowIn = vscode.window.activeTextEditor
+        ? vscode.window.activeTextEditor.viewColumn
+        : undefined;
+      panel.reveal(columnToShowIn);
+    } else {
+      const foam = await foamPromise;
+      panel = await createGraphPanel(foam, context);
+      const onFoamChanged = _ => {
+        updateGraph(panel, foam);
+      };
 
-        const noteUpdatedListener = foam.graph.onDidUpdate(onFoamChanged);
-        panel.onDidDispose(() => {
-          noteUpdatedListener.dispose();
-          panel = undefined;
-        });
+      const noteUpdatedListener = foam.graph.onDidUpdate(onFoamChanged);
+      panel.onDidDispose(() => {
+        noteUpdatedListener.dispose();
+        panel = undefined;
+      });
 
-        vscode.window.onDidChangeActiveTextEditor(e => {
-          if (e?.document?.uri?.scheme === 'file') {
-            const note = foam.workspace.get(fromVsCodeUri(e.document.uri));
-            if (isSome(note)) {
-              panel.webview.postMessage({
-                type: 'didSelectNote',
-                payload: note.uri.path,
-              });
-            }
+      vscode.window.onDidChangeActiveTextEditor(e => {
+        if (e?.document?.uri?.scheme === 'file') {
+          const note = foam.workspace.get(fromVsCodeUri(e.document.uri));
+          if (isSome(note)) {
+            panel.webview.postMessage({
+              type: 'didSelectNote',
+              payload: note.uri.path,
+            });
           }
-        });
-      }
-    });
-  },
-};
+        }
+      });
+    }
+  });
+}
 
 function updateGraph(panel: vscode.WebviewPanel, foam: Foam) {
   const graph = generateGraphData(foam);
@@ -191,5 +191,3 @@ async function getWebviewContent(
 
   return filled;
 }
-
-export default feature;

packages/foam-vscode/src/features/panels/index.ts

@@ -3,3 +3,4 @@ export { default as dataviz } from './dataviz';
 export { default as orphans } from './orphans';
 export { default as placeholders } from './placeholders';
 export { default as tags } from './tags-explorer';
+export { default as notes } from './notes-explorer';

packages/foam-vscode/src/features/panels/notes-explorer.ts

@@ -0,0 +1,165 @@
+import * as vscode from 'vscode';
+import { Foam } from '../../core/model/foam';
+import { FoamWorkspace } from '../../core/model/workspace';
+import {
+  ResourceRangeTreeItem,
+  ResourceTreeItem,
+  createBacklinkItemsForResource as createBacklinkTreeItemsForResource,
+} from './utils/tree-view-utils';
+import { Resource } from '../../core/model/note';
+import { FoamGraph } from '../../core/model/graph';
+import { ContextMemento } from '../../utils/vsc-utils';
+import {
+  FolderTreeItem,
+  FolderTreeProvider,
+} from './utils/folder-tree-provider';
+
+export default async function activate(
+  context: vscode.ExtensionContext,
+  foamPromise: Promise<Foam>
+) {
+  const foam = await foamPromise;
+  const provider = new NotesProvider(
+    foam.workspace,
+    foam.graph,
+    context.globalState
+  );
+  provider.refresh();
+  const treeView = vscode.window.createTreeView<NotesTreeItems>(
+    'foam-vscode.notes-explorer',
+    {
+      treeDataProvider: provider,
+      showCollapseAll: true,
+      canSelectMany: true,
+    }
+  );
+  const revealTextEditorItem = async () => {
+    const target = vscode.window.activeTextEditor?.document.uri;
+    if (treeView.visible) {
+      if (target) {
+        const item = await findTreeItemByUri(provider, target);
+        // Check if the item is already selected.
+        // This check is needed because always calling reveal() will
+        // cause the tree view to take the focus from the item when
+        // browsing the notes explorer
+        if (
+          !treeView.selection.find(
+            i => i.resourceUri?.path === item.resourceUri.path
+          )
+        ) {
+          treeView.reveal(item);
+        }
+      }
+    }
+  };
+
+  context.subscriptions.push(
+    treeView,
+    provider,
+    foam.graph.onDidUpdate(() => {
+      provider.refresh();
+    }),
+    vscode.window.onDidChangeActiveTextEditor(revealTextEditorItem),
+    treeView.onDidChangeVisibility(revealTextEditorItem)
+  );
+}
+
+export function findTreeItemByUri<I, T>(
+  provider: FolderTreeProvider<I, T>,
+  target: vscode.Uri
+) {
+  const path = vscode.workspace.asRelativePath(
+    target,
+    vscode.workspace.workspaceFolders.length > 1
+  );
+  return provider.findTreeItemByPath(path.split('/'));
+}
+
+export type NotesTreeItems =
+  | ResourceTreeItem
+  | FolderTreeItem<Resource>
+  | ResourceRangeTreeItem;
+
+export class NotesProvider extends FolderTreeProvider<
+  NotesTreeItems,
+  Resource
+> {
+  public show = new ContextMemento<'all' | 'notes-only'>(
+    this.state,
+    `foam-vscode.views.notes-explorer.show`,
+    'all'
+  );
+
+  constructor(
+    private workspace: FoamWorkspace,
+    private graph: FoamGraph,
+    private state: vscode.Memento
+  ) {
+    super();
+    this.disposables.push(
+      vscode.commands.registerCommand(
+        `foam-vscode.views.notes-explorer.show:all`,
+        () => {
+          this.show.update('all');
+          this.refresh();
+        }
+      ),
+      vscode.commands.registerCommand(
+        `foam-vscode.views.notes-explorer.show:notes`,
+        () => {
+          this.show.update('notes-only');
+          this.refresh();
+        }
+      )
+    );
+  }
+
+  getValues() {
+    return this.workspace.list();
+  }
+
+  getFilterFn() {
+    return this.show.get() === 'notes-only'
+      ? res => res.type !== 'image' && res.type !== 'attachment'
+      : () => true;
+  }
+
+  valueToPath(value: Resource) {
+    const path = vscode.workspace.asRelativePath(
+      value.uri.path,
+      vscode.workspace.workspaceFolders.length > 1
+    );
+    const parts = path.split('/');
+    return parts;
+  }
+
+  isValueType(value: Resource): value is Resource {
+    return value.uri != null;
+  }
+
+  createValueTreeItem(
+    value: Resource,
+    parent: FolderTreeItem<Resource>
+  ): NotesTreeItems {
+    const res = new ResourceTreeItem(value, this.workspace, {
+      parent,
+      collapsibleState:
+        this.graph.getBacklinks(value.uri).length > 0
+          ? vscode.TreeItemCollapsibleState.Collapsed
+          : vscode.TreeItemCollapsibleState.None,
+    });
+    res.getChildren = async () => {
+      const backlinks = await createBacklinkTreeItemsForResource(
+        this.workspace,
+        this.graph,
+        res.uri
+      );
+      backlinks.forEach(item => {
+        item.description = item.label;
+        item.label = item.resource.title;
+      });
+      return backlinks;
+    };
+    return res;
+  }
+}

packages/foam-vscode/src/features/panels/orphans.ts

@@ -2,60 +2,70 @@ import * as vscode from 'vscode';
 import { Foam } from '../../core/model/foam';
 import { createMatcherAndDataStore } from '../../services/editor';
 import { getOrphansConfig } from '../../settings';
-import { FoamFeature } from '../../types';
-import {
-  GroupedResourcesTreeDataProvider,
-  ResourceTreeItem,
-  UriTreeItem,
-} from '../../utils/grouped-resources-tree-data-provider';
+import { GroupedResourcesTreeDataProvider } from './utils/grouped-resources-tree-data-provider';
+import { ResourceTreeItem, UriTreeItem } from './utils/tree-view-utils';
+import { IMatcher } from '../../core/services/datastore';
+import { FoamWorkspace } from '../../core/model/workspace';
+import { FoamGraph } from '../../core/model/graph';
 
 const EXCLUDE_TYPES = ['image', 'attachment'];
-const feature: FoamFeature = {
-  activate: async (
-    context: vscode.ExtensionContext,
-    foamPromise: Promise<Foam>
-  ) => {
-    const foam = await foamPromise;
+export default async function activate(
+  context: vscode.ExtensionContext,
+  foamPromise: Promise<Foam>
+) {
+  const foam = await foamPromise;
 
-    const { matcher } = await createMatcherAndDataStore(
-      getOrphansConfig().exclude
-    );
-    const provider = new GroupedResourcesTreeDataProvider(
-      'orphans',
-      'orphan',
-      () =>
-        foam.graph
-          .getAllNodes()
-          .filter(
-            uri =>
-              !EXCLUDE_TYPES.includes(foam.workspace.find(uri)?.type) &&
-              foam.graph.getConnections(uri).length === 0
-          ),
-      uri => {
-        return uri.isPlaceholder()
-          ? new UriTreeItem(uri)
-          : new ResourceTreeItem(foam.workspace.find(uri), foam.workspace);
-      },
-      matcher
-    );
-    provider.setGroupBy(getOrphansConfig().groupBy);
+  const { matcher } = await createMatcherAndDataStore(
+    getOrphansConfig().exclude
+  );
+  const provider = new OrphanTreeView(
+    context.globalState,
+    foam.workspace,
+    foam.graph,
+    matcher
+  );
 
-    const treeView = vscode.window.createTreeView('foam-vscode.orphans', {
-      treeDataProvider: provider,
-      showCollapseAll: true,
-    });
-    const baseTitle = treeView.title;
-    treeView.title = baseTitle + ` (${provider.numElements})`;
+  const treeView = vscode.window.createTreeView('foam-vscode.orphans', {
+    treeDataProvider: provider,
+    showCollapseAll: true,
+  });
+  provider.refresh();
+  const baseTitle = treeView.title;
+  treeView.title = baseTitle + ` (${provider.nValues})`;
 
-    context.subscriptions.push(
-      vscode.window.registerTreeDataProvider('foam-vscode.orphans', provider),
-      ...provider.commands,
-      foam.graph.onDidUpdate(() => {
-        provider.refresh();
-        treeView.title = baseTitle + ` (${provider.numElements})`;
-      })
-    );
-  },
-};
+  context.subscriptions.push(
+    vscode.window.registerTreeDataProvider('foam-vscode.orphans', provider),
+    provider,
+    treeView,
+    foam.graph.onDidUpdate(() => {
+      provider.refresh();
+      treeView.title = baseTitle + ` (${provider.nValues})`;
+    })
+  );
+}
 
-export default feature;
+export class OrphanTreeView extends GroupedResourcesTreeDataProvider {
+  constructor(
+    state: vscode.Memento,
+    private workspace: FoamWorkspace,
+    private graph: FoamGraph,
+    matcher: IMatcher
+  ) {
+    super('orphans', state, matcher);
+  }
+
+  createValueTreeItem = uri => {
+    return uri.isPlaceholder()
+      ? new UriTreeItem(uri)
+      : new ResourceTreeItem(this.workspace.find(uri), this.workspace);
+  };
+
+  getUris = () =>
+    this.graph
+      .getAllNodes()
+      .filter(
+        uri =>
+          !EXCLUDE_TYPES.includes(this.workspace.find(uri)?.type) &&
+          this.graph.getConnections(uri).length === 0
+      );
+}

packages/foam-vscode/src/features/panels/placeholders.ts

@@ -2,48 +2,120 @@ import * as vscode from 'vscode';
 import { Foam } from '../../core/model/foam';
 import { createMatcherAndDataStore } from '../../services/editor';
 import { getPlaceholdersConfig } from '../../settings';
-import { FoamFeature } from '../../types';
+import { GroupedResourcesTreeDataProvider } from './utils/grouped-resources-tree-data-provider';
 import {
-  GroupedResourcesTreeDataProvider,
   UriTreeItem,
-} from '../../utils/grouped-resources-tree-data-provider';
+  createBacklinkItemsForResource,
+  groupRangesByResource,
+} from './utils/tree-view-utils';
+import { IMatcher } from '../../core/services/datastore';
+import { ContextMemento, fromVsCodeUri } from '../../utils/vsc-utils';
+import { FoamGraph } from '../../core/model/graph';
+import { URI } from '../../core/model/uri';
+import { FoamWorkspace } from '../../core/model/workspace';
+import { FolderTreeItem } from './utils/folder-tree-provider';
 
-const feature: FoamFeature = {
-  activate: async (
-    context: vscode.ExtensionContext,
-    foamPromise: Promise<Foam>
-  ) => {
-    const foam = await foamPromise;
-    const { matcher } = await createMatcherAndDataStore(
-      getPlaceholdersConfig().exclude
-    );
-    const provider = new GroupedResourcesTreeDataProvider(
-      'placeholders',
-      'placeholder',
-      () => foam.graph.getAllNodes().filter(uri => uri.isPlaceholder()),
-      uri => {
-        return new UriTreeItem(uri);
-      },
-      matcher
-    );
-    provider.setGroupBy(getPlaceholdersConfig().groupBy);
+export default async function activate(
+  context: vscode.ExtensionContext,
+  foamPromise: Promise<Foam>
+) {
+  const foam = await foamPromise;
+  const { matcher } = await createMatcherAndDataStore(
+    getPlaceholdersConfig().exclude
+  );
+  const provider = new PlaceholderTreeView(
+    context.globalState,
+    foam.workspace,
+    foam.graph,
+    matcher
+  );
 
-    const treeView = vscode.window.createTreeView('foam-vscode.placeholders', {
-      treeDataProvider: provider,
-      showCollapseAll: true,
-    });
-    const baseTitle = treeView.title;
-    treeView.title = baseTitle + ` (${provider.numElements})`;
+  const treeView = vscode.window.createTreeView('foam-vscode.placeholders', {
+    treeDataProvider: provider,
+    showCollapseAll: true,
+  });
+  provider.refresh();
+  const baseTitle = treeView.title;
+  treeView.title = baseTitle + ` (${provider.nValues})`;
 
-    context.subscriptions.push(
-      treeView,
-      ...provider.commands,
-      foam.graph.onDidUpdate(() => {
+  context.subscriptions.push(
+    treeView,
+    provider,
+    foam.graph.onDidUpdate(() => {
+      provider.refresh();
+    }),
+    provider.onDidChangeTreeData(() => {
+      treeView.title = baseTitle + ` (${provider.nValues})`;
+    }),
+    vscode.window.onDidChangeActiveTextEditor(() => {
+      if (provider.show.get() === 'for-current-file') {
         provider.refresh();
-        treeView.title = baseTitle + ` (${provider.numElements})`;
-      })
-    );
-  },
-};
+      }
+    })
+  );
+}
 
-export default feature;
+export class PlaceholderTreeView extends GroupedResourcesTreeDataProvider {
+  public show = new ContextMemento<'all' | 'for-current-file'>(
+    this.state,
+    `foam-vscode.views.${this.providerId}.show`,
+    'all'
+  );
+
+  public constructor(
+    state: vscode.Memento,
+    private workspace: FoamWorkspace,
+    private graph: FoamGraph,
+    matcher: IMatcher
+  ) {
+    super('placeholders', state, matcher);
+    this.disposables.push(
+      vscode.commands.registerCommand(
+        `foam-vscode.views.${this.providerId}.show:all`,
+        () => {
+          this.show.update('all');
+          this.refresh();
+        }
+      ),
+      vscode.commands.registerCommand(
+        `foam-vscode.views.${this.providerId}.show:for-current-file`,
+        () => {
+          this.show.update('for-current-file');
+          this.refresh();
+        }
+      )
+    );
+  }
+
+  createValueTreeItem(uri: URI, parent: FolderTreeItem<URI>): UriTreeItem {
+    const item = new UriTreeItem(uri, {
+      parent,
+      collapsibleState: vscode.TreeItemCollapsibleState.Collapsed,
+    });
+    item.getChildren = async () => {
+      return groupRangesByResource(
+        this.workspace,
+        await createBacklinkItemsForResource(
+          this.workspace,
+          this.graph,
+          uri,
+          'link'
+        )
+      );
+    };
+    return item;
+  }
+
+  getUris(): URI[] {
+    if (this.show.get() === 'for-current-file') {
+      const currentFile = vscode.window.activeTextEditor?.document.uri;
+      return currentFile
+        ? this.graph
+            .getLinks(fromVsCodeUri(currentFile))
+            .map(link => link.target)
+            .filter(uri => uri.isPlaceholder())
+        : [];
+    }
+    return this.graph.getAllNodes().filter(uri => uri.isPlaceholder());
+  }
+}

packages/foam-vscode/src/features/panels/tags-explorer.spec.ts

@@ -1,65 +1,49 @@
-import {
-  createTestNote,
-  readFileFromFs,
-  TEST_DATA_DIR,
-} from '../../test/test-utils';
+import { createTestNote } from '../../test/test-utils';
 import { cleanWorkspace, closeEditors } from '../../test/test-utils-vscode';
-import { TagItem, TagReference, TagsProvider } from './tags-explorer';
-import { bootstrap, Foam } from '../../core/model/foam';
-import { MarkdownResourceProvider } from '../../core/services/markdown-provider';
-import { createMarkdownParser } from '../../core/services/markdown-parser';
-import { URI } from '../../core/model/uri';
-import { FileDataStore, Matcher } from '../../test/test-datastore';
+import { TagItem, TagsProvider } from './tags-explorer';
+import { FoamTags } from '../../core/model/tags';
+import { FoamWorkspace } from '../../core/model/workspace';
+import { ResourceTreeItem } from './utils/tree-view-utils';
 
 describe('Tags tree panel', () => {
-  let _foam: Foam;
-  let provider: TagsProvider;
-
-  const dataStore = new FileDataStore(readFileFromFs, TEST_DATA_DIR.toFsPath());
-  const matcher = new Matcher([URI.file(TEST_DATA_DIR.toFsPath())]);
-  const parser = createMarkdownParser();
-  const mdProvider = new MarkdownResourceProvider(dataStore, parser);
-
   beforeAll(async () => {
     await cleanWorkspace();
   });
 
   afterAll(async () => {
-    _foam.dispose();
     await cleanWorkspace();
   });
 
   beforeEach(async () => {
-    _foam = await bootstrap(matcher, undefined, dataStore, parser, [
-      mdProvider,
-    ]);
-    provider = new TagsProvider(_foam, _foam.workspace);
     await closeEditors();
   });
 
-  afterEach(() => {
-    _foam.dispose();
-  });
-
-  it('correctly provides a tag from a set of notes', async () => {
+  it('provides a tag from a set of notes', async () => {
     const noteA = createTestNote({
       tags: ['test'],
       uri: './note-a.md',
     });
-    _foam.workspace.set(noteA);
+    const workspace = new FoamWorkspace().set(noteA);
+    const foamTags = FoamTags.fromWorkspace(workspace);
+    const provider = new TagsProvider(foamTags, workspace);
     provider.refresh();
 
     const treeItems = (await provider.getChildren()) as TagItem[];
 
-    treeItems.forEach(item => expect(item.tag).toContain('test'));
+    expect(treeItems).toHaveLength(1);
+    expect(treeItems[0].label).toEqual('test');
+    expect(treeItems[0].tag).toEqual('test');
+    expect(treeItems[0].nResourcesInSubtree).toEqual(1);
   });
 
-  it('correctly handles a parent and child tag', async () => {
+  it('handles a simple parent and child tag', async () => {
     const noteA = createTestNote({
       tags: ['parent/child'],
       uri: './note-a.md',
     });
-    _foam.workspace.set(noteA);
+    const workspace = new FoamWorkspace().set(noteA);
+    const foamTags = FoamTags.fromWorkspace(workspace);
+    const provider = new TagsProvider(foamTags, workspace);
     provider.refresh();
 
     const parentTreeItems = (await provider.getChildren()) as TagItem[];
@@ -78,17 +62,18 @@ describe('Tags tree panel', () => {
     });
   });
 
-  it('correctly handles a single parent and multiple child tag', async () => {
+  it('handles a single parent and multiple child tag', async () => {
     const noteA = createTestNote({
       tags: ['parent/child'],
       uri: './note-a.md',
     });
-    _foam.workspace.set(noteA);
     const noteB = createTestNote({
       tags: ['parent/subchild'],
       uri: './note-b.md',
     });
-    _foam.workspace.set(noteB);
+    const workspace = new FoamWorkspace().set(noteA).set(noteB);
+    const foamTags = FoamTags.fromWorkspace(workspace);
+    const provider = new TagsProvider(foamTags, workspace);
     provider.refresh();
 
     const parentTreeItems = (await provider.getChildren()) as TagItem[];
@@ -114,14 +99,15 @@ describe('Tags tree panel', () => {
     expect(childTreeItems).toHaveLength(3);
   });
 
-  it('correctly handles a single parent and child tag in the same note', async () => {
+  it('handles a parent and child tag in the same note', async () => {
     const noteC = createTestNote({
       tags: ['main', 'main/subtopic'],
       title: 'Test note',
       uri: './note-c.md',
     });
-
-    _foam.workspace.set(noteC);
+    const workspace = new FoamWorkspace().set(noteC);
+    const foamTags = FoamTags.fromWorkspace(workspace);
+    const provider = new TagsProvider(foamTags, workspace);
 
     provider.refresh();
 
@@ -137,9 +123,9 @@ describe('Tags tree panel', () => {
     )) as TagItem[];
 
     childTreeItems
-      .filter(item => item instanceof TagReference)
+      .filter(item => item instanceof ResourceTreeItem)
       .forEach(item => {
-        expect(item.title).toEqual('Test note');
+        expect(item.label).toEqual('Test note');
       });
 
     childTreeItems
@@ -151,4 +137,36 @@ describe('Tags tree panel', () => {
 
     expect(childTreeItems).toHaveLength(3);
   });
+
+  it('handles a tag with multiple levels of hierarchy - #1134', async () => {
+    const noteA = createTestNote({
+      tags: ['parent/child/second'],
+      uri: './note-a.md',
+    });
+    const workspace = new FoamWorkspace().set(noteA);
+    const foamTags = FoamTags.fromWorkspace(workspace);
+    const provider = new TagsProvider(foamTags, workspace);
+
+    provider.refresh();
+
+    const parentTreeItems = (await provider.getChildren()) as TagItem[];
+    const parentTagItem = parentTreeItems.pop();
+    expect(parentTagItem.title).toEqual('parent');
+
+    const childTreeItems = (await provider.getChildren(
+      parentTagItem
+    )) as TagItem[];
+
+    expect(childTreeItems).toHaveLength(2);
+    expect(childTreeItems[0].label).toMatch(/^Search.*/);
+    expect(childTreeItems[1].label).toEqual('child');
+
+    const grandchildTreeItems = (await provider.getChildren(
+      childTreeItems[1]
+    )) as TagItem[];
+
+    expect(grandchildTreeItems).toHaveLength(2);
+    expect(grandchildTreeItems[0].label).toMatch(/^Search.*/);
+    expect(grandchildTreeItems[1].label).toEqual('second');
+  });
 });

packages/foam-vscode/src/features/panels/tags-explorer.ts

@@ -1,38 +1,36 @@
 import { URI } from '../../core/model/uri';
 import * as vscode from 'vscode';
-import { FoamFeature } from '../../types';
-import { getNoteTooltip, isSome } from '../../utils';
-import { toVsCodeRange, toVsCodeUri } from '../../utils/vsc-utils';
 import { Foam } from '../../core/model/foam';
 import { FoamWorkspace } from '../../core/model/workspace';
-import { Resource, Tag } from '../../core/model/note';
+import { FoamTags } from '../../core/model/tags';
+import {
+  ResourceRangeTreeItem,
+  ResourceTreeItem,
+  groupRangesByResource,
+} from './utils/tree-view-utils';
 
 const TAG_SEPARATOR = '/';
-const feature: FoamFeature = {
-  activate: async (
-    context: vscode.ExtensionContext,
-    foamPromise: Promise<Foam>
-  ) => {
-    const foam = await foamPromise;
-    const provider = new TagsProvider(foam, foam.workspace);
-    const treeView = vscode.window.createTreeView('foam-vscode.tags-explorer', {
-      treeDataProvider: provider,
-      showCollapseAll: true,
-    });
-    const baseTitle = treeView.title;
-    treeView.title = baseTitle + ` (${foam.tags.tags.size})`;
+export default async function activate(
+  context: vscode.ExtensionContext,
+  foamPromise: Promise<Foam>
+) {
+  const foam = await foamPromise;
+  const provider = new TagsProvider(foam.tags, foam.workspace);
+  const treeView = vscode.window.createTreeView('foam-vscode.tags-explorer', {
+    treeDataProvider: provider,
+    showCollapseAll: true,
+  });
+  const baseTitle = treeView.title;
+  treeView.title = baseTitle + ` (${foam.tags.tags.size})`;
 
-    context.subscriptions.push(
-      treeView,
-      foam.tags.onDidUpdate(() => {
-        provider.refresh();
-        treeView.title = baseTitle + ` (${foam.tags.tags.size})`;
-      })
-    );
-  },
-};
-
-export default feature;
+  context.subscriptions.push(
+    treeView,
+    foam.tags.onDidUpdate(() => {
+      provider.refresh();
+      treeView.title = baseTitle + ` (${foam.tags.tags.size})`;
+    })
+  );
+}
 
 export class TagsProvider implements vscode.TreeDataProvider<TagTreeItem> {
   // prettier-ignore
@@ -48,7 +46,10 @@ export class TagsProvider implements vscode.TreeDataProvider<TagTreeItem> {
     notes: URI[];
   }[];
 
-  constructor(private foam: Foam, private workspace: FoamWorkspace) {
+  private foamTags: FoamTags;
+
+  constructor(tags: FoamTags, private workspace: FoamWorkspace) {
+    this.foamTags = tags;
     this.computeTags();
   }
 
@@ -58,7 +59,7 @@ export class TagsProvider implements vscode.TreeDataProvider<TagTreeItem> {
   }
 
   private computeTags() {
-    this.tags = [...this.foam.tags.tags]
+    this.tags = [...this.foamTags.tags]
       .map(([tag, notes]) => ({ tag, notes }))
       .sort((a, b) => a.tag.localeCompare(b.tag));
   }
@@ -67,78 +68,93 @@ export class TagsProvider implements vscode.TreeDataProvider<TagTreeItem> {
     return element;
   }
 
-  getChildren(element?: TagItem): Thenable<TagTreeItem[]> {
-    if (element) {
-      const nestedTagItems: TagTreeItem[] = this.tags
-        .filter(item => item.tag.indexOf(element.title + TAG_SEPARATOR) > -1)
-        .map(
-          item =>
-            new TagItem(
-              item.tag,
-              item.tag.substring(item.tag.indexOf(TAG_SEPARATOR) + 1),
-              item.notes
-            )
-        )
-        .sort((a, b) => a.title.localeCompare(b.title));
-
-      const references: TagTreeItem[] = element.notes
-        .map(uri => this.foam.workspace.get(uri))
-        .reduce((acc, note) => {
-          const tags = note.tags.filter(t => t.label === element.tag);
-          return [
-            ...acc,
-            ...tags.slice(0, 1).map(t => new TagReference(t, note)),
-          ];
-        }, [])
-        .sort((a, b) => a.title.localeCompare(b.title));
-
-      return Promise.resolve([
-        new TagSearch(element.tag),
-        ...nestedTagItems,
-        ...references,
-      ]);
+  async getChildren(element?: TagItem): Promise<TagTreeItem[]> {
+    if ((element as any)?.getChildren) {
+      const children = await (element as any).getChildren();
+      return children;
     }
-    if (!element) {
-      const tags: TagItem[] = this.tags
-        .map(({ tag, notes }) => {
-          const parentTag =
-            tag.indexOf(TAG_SEPARATOR) > 0
-              ? tag.substring(0, tag.indexOf(TAG_SEPARATOR))
-              : tag;
+    const parentTag = element ? element.tag : '';
+    const parentPrefix = element ? parentTag + TAG_SEPARATOR : '';
 
-          return new TagItem(parentTag, parentTag, notes);
-        })
-        .filter(
-          (value, index, array) =>
-            array.findIndex(tag => tag.title === value.title) === index
+    const tagsAtThisLevel = this.tags
+      .filter(({ tag }) => tag.startsWith(parentPrefix))
+      .map(({ tag }) => {
+        const nextSeparator = tag.indexOf(TAG_SEPARATOR, parentPrefix.length);
+        const label =
+          nextSeparator > -1
+            ? tag.substring(parentPrefix.length, nextSeparator)
+            : tag.substring(parentPrefix.length);
+        const tagId = parentPrefix + label;
+        return { label, tagId, tag };
+      })
+      .reduce((acc, { label, tagId, tag }) => {
+        const existing = acc.has(label);
+        const nResources = this.foamTags.tags.get(tag).length ?? 0;
+        if (!existing) {
+          acc.set(label, { label, tagId, nResources: 0 });
+        }
+        acc.get(label).nResources += nResources;
+        return acc;
+      }, new Map() as Map<string, { label: string; tagId: string; nResources: number }>);
+
+    const subtags = Array.from(tagsAtThisLevel.values())
+      .map(({ label, tagId, nResources }) => {
+        const resources = this.foamTags.tags.get(tagId) ?? [];
+        return new TagItem(tagId, label, nResources, resources);
+      })
+      .sort((a, b) => a.title.localeCompare(b.title));
+
+    const resourceTags: ResourceRangeTreeItem[] = (element?.notes ?? [])
+      .map(uri => this.workspace.get(uri))
+      .reduce((acc, note) => {
+        const tags = note.tags.filter(t => t.label === element.tag);
+        const items = tags.map(t =>
+          ResourceRangeTreeItem.createStandardItem(
+            this.workspace,
+            note,
+            t.range,
+            'tag'
+          )
         );
+        return [...acc, ...items];
+      }, []);
 
-      return Promise.resolve(tags.sort((a, b) => a.tag.localeCompare(b.tag)));
-    }
+    const resources = await groupRangesByResource(this.workspace, resourceTags);
+
+    return Promise.resolve(
+      [element && new TagSearch(element.tag), ...subtags, ...resources].filter(
+        Boolean
+      )
+    );
   }
 
   async resolveTreeItem(item: TagTreeItem): Promise<TagTreeItem> {
-    if (item instanceof TagReference) {
-      const content = await this.workspace.readAsMarkdown(item.note.uri);
-      if (isSome(content)) {
-        item.tooltip = getNoteTooltip(content);
-      }
+    if (
+      item instanceof ResourceTreeItem ||
+      item instanceof ResourceRangeTreeItem
+    ) {
+      return item.resolveTreeItem();
     }
-    return item;
+    return Promise.resolve(item);
   }
 }
 
-type TagTreeItem = TagItem | TagReference | TagSearch;
+type TagTreeItem =
+  | TagItem
+  | TagSearch
+  | ResourceTreeItem
+  | ResourceRangeTreeItem;
 
 export class TagItem extends vscode.TreeItem {
   constructor(
     public readonly tag: string,
     public readonly title: string,
+    public readonly nResourcesInSubtree: number,
     public readonly notes: URI[]
   ) {
     super(title, vscode.TreeItemCollapsibleState.Collapsed);
-    this.description = `${this.notes.length} reference${
-      this.notes.length !== 1 ? 's' : ''
+    this.description = `${nResourcesInSubtree} reference${
+      nResourcesInSubtree !== 1 ? 's' : ''
     }`;
   }
 
@@ -169,28 +185,3 @@ export class TagSearch extends vscode.TreeItem {
   iconPath = new vscode.ThemeIcon('search');
   contextValue = 'tag-search';
 }
-
-export class TagReference extends vscode.TreeItem {
-  public readonly title: string;
-  constructor(public readonly tag: Tag, public readonly note: Resource) {
-    super(note.title, vscode.TreeItemCollapsibleState.None);
-    const uri = toVsCodeUri(note.uri);
-    this.title = note.title;
-    this.description = vscode.workspace.asRelativePath(uri);
-    this.tooltip = undefined;
-    this.command = {
-      command: 'vscode.open',
-      arguments: [
-        uri,
-        {
-          preview: true,
-          selection: toVsCodeRange(tag.range),
-        },
-      ],
-      title: 'Open File',
-    };
-  }
-
-  iconPath = new vscode.ThemeIcon('note');
-  contextValue = 'reference';
-}

packages/foam-vscode/src/features/panels/utils/base-tree-provider.ts

@@ -0,0 +1,44 @@
+import * as vscode from 'vscode';
+import { IDisposable } from '../../../core/common/lifecycle';
+
+/**
+ * This class is a wrapper around vscode.TreeDataProvider that adds a few
+ * features:
+ * - It adds a `refresh()` method that can be called to refresh the tree view
+ * - It adds a `resolveTreeItem()` method that can be used to resolve the
+ *   tree item asynchronously. This is useful when the tree item needs to
+ *   fetch data from the file system or from the network.
+ * - It adds a `dispose()` method that can be used to dispose of any resources
+ *   that the tree provider might be holding on to.
+ */
+export abstract class BaseTreeProvider<T>
+  implements vscode.TreeDataProvider<T>, IDisposable
+{
+  protected disposables: vscode.Disposable[] = [];
+
+  // prettier-ignore
+  private _onDidChangeTreeData: vscode.EventEmitter<T | undefined | void> = new vscode.EventEmitter<T | undefined | void>();
+  // prettier-ignore
+  readonly onDidChangeTreeData: vscode.Event<T | undefined | void> = this._onDidChangeTreeData.event;
+
+  abstract getChildren(element?: T): vscode.ProviderResult<T[]>;
+
+  getTreeItem(element: T) {
+    return element;
+  }
+
+  async resolveTreeItem(item: T): Promise<T> {
+    if ((item as any)?.resolveTreeItem) {
+      return (item as any).resolveTreeItem();
+    }
+    return Promise.resolve(item);
+  }
+
+  refresh(): void {
+    this._onDidChangeTreeData.fire();
+  }
+
+  dispose(): void {
+    this.disposables.forEach(d => d.dispose());
+  }
+}

packages/foam-vscode/src/features/panels/utils/folder-tree-provider.ts

@@ -0,0 +1,204 @@
+import * as vscode from 'vscode';
+import { BaseTreeProvider } from './base-tree-provider';
+import { BaseTreeItem, ResourceTreeItem } from './tree-view-utils';
+
+/**
+ * A folder is a map of basenames to either folders or values (e.g. resources).
+ */
+export interface Folder<T> {
+  [basename: string]: Folder<T> | T;
+}
+
+/**
+ * A TreeItem that represents a folder.
+ */
+export class FolderTreeItem<T> extends vscode.TreeItem {
+  collapsibleState = vscode.TreeItemCollapsibleState.Collapsed;
+  contextValue = 'folder';
+  iconPath = new vscode.ThemeIcon('folder');
+
+  constructor(
+    public parent: Folder<T>,
+    public name: string,
+    public parentElement?: FolderTreeItem<T>
+  ) {
+    super(name, vscode.TreeItemCollapsibleState.Collapsed);
+  }
+}
+
+/**
+ * An abstract class that can be used to create a tree view from a Folder object.
+ * Its abstract methods must be implemented by the subclass to define the type of
+ * the values in the folder, and how to filter them.
+ */
+export abstract class FolderTreeProvider<I, T> extends BaseTreeProvider<I> {
+  private root: Folder<T>;
+  public nValues = 0;
+
+  refresh(): void {
+    const values = this.getValues();
+    this.nValues = values.length;
+    this.createTree(values, this.getFilterFn());
+    super.refresh();
+  }
+
+  getParent(element: I | FolderTreeItem<T>): vscode.ProviderResult<I> {
+    if (element instanceof ResourceTreeItem) {
+      return Promise.resolve(element.parent as I);
+    }
+    if (element instanceof FolderTreeItem) {
+      return Promise.resolve(element.parentElement as any);
+    }
+  }
+
+  createFolderTreeItem(
+    value: Folder<T>,
+    name: string,
+    parent: FolderTreeItem<T>
+  ) {
+    return new FolderTreeItem<T>(value, name, parent);
+  }
+
+  async getChildren(item?: I): Promise<I[]> {
+    if (item instanceof BaseTreeItem) {
+      return item.getChildren() as Promise<I[]>;
+    }
+
+    const parent = (item as any)?.parent ?? this.root;
+
+    const children: vscode.TreeItem[] = Object.keys(parent).map(name => {
+      const value = parent[name];
+      if (this.isValueType(value)) {
+        return this.createValueTreeItem(value, undefined);
+      } else {
+        return this.createFolderTreeItem(
+          value,
+          name,
+          item as unknown as FolderTreeItem<T>
+        );
+      }
+    });
+
+    return children.sort((a, b) => sortFolderTreeItems(a, b)) as any;
+  }
+
+  createTree(values: T[], filterFn: (value: T) => boolean): Folder<T> {
+    const root: Folder<T> = {};
+
+    for (const r of values) {
+      const parts = this.valueToPath(r);
+      let currentNode: Folder<T> = root;
+
+      parts.forEach((part, index) => {
+        if (!currentNode[part]) {
+          if (index < parts.length - 1) {
+            currentNode[part] = {};
+          } else {
+            if (filterFn(r)) {
+              currentNode[part] = r;
+            }
+          }
+        }
+        currentNode = currentNode[part] as Folder<T>;
+      });
+    }
+
+    this.root = root;
+    return root;
+  }
+
+  getTreeItemsHierarchy(path: string[]): vscode.TreeItem[] {
+    const treeItemsHierarchy: vscode.TreeItem[] = [];
+    let currentNode: Folder<T> | T = this.root;
+
+    for (const part of path) {
+      if (currentNode[part] !== undefined) {
+        currentNode = currentNode[part] as Folder<T> | T;
+        if (this.isValueType(currentNode as T)) {
+          treeItemsHierarchy.push(
+            this.createValueTreeItem(
+              currentNode as T,
+              treeItemsHierarchy[
+                treeItemsHierarchy.length - 1
+              ] as FolderTreeItem<T>
+            )
+          );
+        } else {
+          treeItemsHierarchy.push(
+            new FolderTreeItem(
+              currentNode as Folder<T>,
+              part,
+              treeItemsHierarchy[
+                treeItemsHierarchy.length - 1
+              ] as FolderTreeItem<T>
+            )
+          );
+        }
+      } else {
+        // If a part is not found in the tree structure, the given URI is not valid.
+        return [];
+      }
+    }
+
+    return treeItemsHierarchy;
+  }
+
+  findTreeItemByPath(path: string[]): Promise<I> {
+    const hierarchy = this.getTreeItemsHierarchy(path);
+    return hierarchy.length > 0
+      ? Promise.resolve(hierarchy.pop())
+      : Promise.resolve(null);
+  }
+
+  /**
+   * Returns a function that can be used to filter the values.
+   * The difference between using this function vs not including the values
+   * is that in this case, the tree will be created with all the folders
+   * and subfolders, but the values will only be displayed if they pass
+   * the filter.
+   * By default it doesn't filter anything.
+   */
+  getFilterFn(): (value: T) => boolean {
+    return () => true;
+  }
+
+  /**
+   * Converts a value to a path of strings that can be used to create a tree.
+   */
+  abstract valueToPath(value: T);
+
+  /**
+   * Returns all the values that should be displayed in the tree.
+   */
+  abstract getValues(): T[];
+
+  /**
+   * Returns true if the given value is of the type that should be displayed
+   * as a leaf in the tree. That is, not as a folder.
+   */
+  abstract isValueType(value: T): value is T;
+
+  /**
+   * Creates a tree item for the given value.
+   */
+  abstract createValueTreeItem(value: T, parent: FolderTreeItem<T>): I;
+}
+
+function sortFolderTreeItems(a: vscode.TreeItem, b: vscode.TreeItem): number {
+  // Both a and b are FolderTreeItem instances
+  if (a instanceof FolderTreeItem && b instanceof FolderTreeItem) {
+    return a.label.toString().localeCompare(b.label.toString());
+  }
+
+  // Only a is a FolderTreeItem instance
+  if (a instanceof FolderTreeItem) {
+    return -1;
+  }
+
+  // Only b is a FolderTreeItem instance
+  if (b instanceof FolderTreeItem) {
+    return 1;
+  }
+
+  return a.label.toString().localeCompare(b.label.toString());
+}

packages/foam-vscode/src/features/panels/utils/grouped-resources-tree-data-provider.spec.ts

@@ -0,0 +1,157 @@
+import { FoamWorkspace } from '../../../core/model/workspace';
+import {
+  AlwaysIncludeMatcher,
+  IMatcher,
+  SubstringExcludeMatcher,
+} from '../../../core/services/datastore';
+import { createTestNote } from '../../../test/test-utils';
+import { ResourceTreeItem, UriTreeItem } from './tree-view-utils';
+import { randomString } from '../../../test/test-utils';
+import { MapBasedMemento } from '../../../utils/vsc-utils';
+import { URI } from '../../../core/model/uri';
+import { TreeItem } from 'vscode';
+import { GroupedResourcesTreeDataProvider } from './grouped-resources-tree-data-provider';
+
+const testMatcher = new SubstringExcludeMatcher('path-exclude');
+
+class TestProvider extends GroupedResourcesTreeDataProvider {
+  constructor(
+    matcher: IMatcher,
+    private list: () => URI[],
+    private create: (uri: URI) => TreeItem
+  ) {
+    super(randomString(), new MapBasedMemento(), matcher);
+  }
+  getUris(): URI[] {
+    return this.list();
+  }
+  createValueTreeItem(value: URI) {
+    return this.create(value) as any;
+  }
+}
+
+describe('TestProvider', () => {
+  const note1 = createTestNote({ uri: '/path/ABC.md', title: 'ABC' });
+  const note2 = createTestNote({
+    uri: '/path-bis/XYZ.md',
+    title: 'XYZ',
+  });
+  const note3 = createTestNote({
+    uri: '/path-bis/ABCDEFG.md',
+    title: 'ABCDEFG',
+  });
+  const excludedNote = createTestNote({
+    uri: '/path-exclude/HIJ.m',
+    title: 'HIJ',
+  });
+
+  const workspace = new FoamWorkspace()
+    .set(note1)
+    .set(note2)
+    .set(note3)
+    .set(excludedNote);
+
+  it('should return the grouped resources as a folder tree', async () => {
+    const provider = new TestProvider(
+      testMatcher,
+      () => workspace.list().map(r => r.uri),
+      uri => new UriTreeItem(uri)
+    );
+    provider.groupBy.update('folder');
+    provider.refresh();
+    const result = await provider.getChildren();
+    expect(result).toMatchObject([
+      {
+        collapsibleState: 1,
+        label: '/path',
+        description: '(1)',
+      },
+      {
+        collapsibleState: 1,
+        label: '/path-bis',
+        description: '(2)',
+      },
+    ]);
+  });
+  it('should return the grouped resources in a directory', async () => {
+    const provider = new TestProvider(
+      testMatcher,
+      () => workspace.list().map(r => r.uri),
+      uri => new ResourceTreeItem(workspace.get(uri), workspace)
+    );
+    provider.groupBy.update('folder');
+    provider.refresh();
+    const paths = await provider.getChildren();
+    const directory = paths[0];
+    expect(directory).toMatchObject({
+      label: '/path',
+    });
+    const result = await provider.getChildren(directory);
+    expect(result).toMatchObject([
+      {
+        collapsibleState: 0,
+        label: 'ABC',
+        description: '/path/ABC.md',
+        command: { command: 'vscode.open' },
+      },
+    ]);
+  });
+  it('should return the flattened resources', async () => {
+    const provider = new TestProvider(
+      testMatcher,
+      () => workspace.list().map(r => r.uri),
+      uri => new ResourceTreeItem(workspace.get(uri), workspace)
+    );
+    provider.groupBy.update('off');
+    provider.refresh();
+    const result = await provider.getChildren();
+    expect(result).toMatchObject([
+      {
+        collapsibleState: 0,
+        label: note1.title,
+        description: '/path/ABC.md',
+        command: { command: 'vscode.open' },
+      },
+      {
+        collapsibleState: 0,
+        label: note3.title,
+        description: '/path-bis/ABCDEFG.md',
+        command: { command: 'vscode.open' },
+      },
+      {
+        collapsibleState: 0,
+        label: note2.title,
+        description: '/path-bis/XYZ.md',
+        command: { command: 'vscode.open' },
+      },
+    ]);
+  });
+  it('should return the grouped resources without exclusion', async () => {
+    const provider = new TestProvider(
+      new AlwaysIncludeMatcher(),
+      () => workspace.list().map(r => r.uri),
+      uri => new UriTreeItem(uri)
+    );
+    provider.groupBy.update('folder');
+    provider.refresh();
+    const result = await provider.getChildren();
+    expect(result.length).toEqual(3);
+    expect(result).toMatchObject([
+      {
+        collapsibleState: 1,
+        label: '/path',
+        description: '(1)',
+      },
+      {
+        collapsibleState: 1,
+        label: '/path-bis',
+        description: '(2)',
+      },
+      {
+        collapsibleState: 1,
+        label: '/path-exclude',
+        description: '(1)',
+      },
+    ]);
+  });
+});

packages/foam-vscode/src/features/panels/utils/grouped-resources-tree-data-provider.ts

@@ -0,0 +1,114 @@
+import * as path from 'path';
+import * as vscode from 'vscode';
+import { URI } from '../../../core/model/uri';
+import { IMatcher } from '../../../core/services/datastore';
+import { UriTreeItem } from './tree-view-utils';
+import { ContextMemento } from '../../../utils/vsc-utils';
+import {
+  FolderTreeItem,
+  FolderTreeProvider,
+  Folder,
+} from './folder-tree-provider';
+
+type GroupedResourceTreeItem = UriTreeItem | FolderTreeItem<URI>;
+
+/**
+ * Provides the ability to expose a TreeDataExplorerView in VSCode. This class will
+ * iterate over each Resource in the FoamWorkspace, call the provided filter predicate, and
+ * display the Resources.
+ *
+ * **NOTE**: In order for this provider to correctly function, you must define the following command in the package.json file:
+ * ```
+ * foam-vscode.views.${providerId}.group-by-folder
+ * foam-vscode.views.${providerId}.group-off
+ * ```
+ * Where `providerId` is the same string provided to the constructor.
+ * @export
+ * @class GroupedResourcesTreeDataProvider
+ * @implements {vscode.TreeDataProvider<GroupedResourceTreeItem>}
+ */
+export abstract class GroupedResourcesTreeDataProvider extends FolderTreeProvider<
+  GroupedResourceTreeItem,
+  URI
+> {
+  public groupBy = new ContextMemento<'off' | 'folder'>(
+    this.state,
+    `foam-vscode.views.${this.providerId}.group-by`,
+    'folder'
+  );
+
+  /**
+   * Creates an instance of GroupedResourcesTreeDataProvider.
+   * **NOTE**: In order for this provider to correctly function, you must define the following command in the package.json file:
+   * ```
+   * foam-vscode.views.${this.providerId}.group-by:folder
+   * foam-vscode.views.${this.providerId}.group-by:off
+   * ```
+   * Where `providerId` is the same string provided to this constructor.
+   *
+   * @param {string} providerId A **unique** providerId, this will be used to generate necessary commands within the provider.
+   * @param {vscode.Memento} state The state to use for persisting the panel settings.
+   * @param {IMatcher} matcher The matcher to use for filtering the uris.
+   * @memberof GroupedResourcesTreeDataProvider
+   */
+  constructor(
+    protected providerId: string,
+    protected state: vscode.Memento,
+    private matcher: IMatcher
+  ) {
+    super();
+    this.disposables.push(
+      vscode.commands.registerCommand(
+        `foam-vscode.views.${this.providerId}.group-by:folder`,
+        () => {
+          this.groupBy.update('folder');
+          this.refresh();
+        }
+      ),
+      vscode.commands.registerCommand(
+        `foam-vscode.views.${this.providerId}.group-by:off`,
+        () => {
+          this.groupBy.update('off');
+          this.refresh();
+        }
+      )
+    );
+  }
+
+  valueToPath(value: URI) {
+    const p = vscode.workspace.asRelativePath(
+      value.path,
+      vscode.workspace.workspaceFolders.length > 1
+    );
+    if (this.groupBy.get() === 'folder') {
+      const { dir, base } = path.parse(p);
+      return [dir, base];
+    }
+    return [p];
+  }
+
+  getValues(): URI[] {
+    const uris = this.getUris();
+    return uris.filter(uri => this.matcher.isMatch(uri));
+  }
+
+  isValueType(value: URI): value is URI {
+    return value instanceof URI;
+  }
+
+  createFolderTreeItem(
+    value: Folder<URI>,
+    name: string,
+    parent: FolderTreeItem<URI>
+  ) {
+    const item = super.createFolderTreeItem(value, name, parent);
+    item.label = item.label || '(Not Created)';
+    item.description = `(${Object.keys(value).length})`;
+    return item;
+  }
+
+  /**
+   * Return the URIs before the filtering by the matcher is applied
+   */
+  abstract getUris(): URI[];
+}

packages/foam-vscode/src/features/panels/utils/tree-view-utils.ts

@@ -0,0 +1,229 @@
+import * as vscode from 'vscode';
+import { groupBy } from 'lodash';
+import { Resource } from '../../../core/model/note';
+import { toVsCodeUri } from '../../../utils/vsc-utils';
+import { Range } from '../../../core/model/range';
+import { URI } from '../../../core/model/uri';
+import { FoamWorkspace } from '../../../core/model/workspace';
+import { getNoteTooltip } from '../../../utils';
+import { isSome } from '../../../core/utils';
+import { getBlockFor } from '../../../core/services/markdown-parser';
+import { Connection, FoamGraph } from '../../../core/model/graph';
+
+export class BaseTreeItem extends vscode.TreeItem {
+  resolveTreeItem(): Promise<vscode.TreeItem> {
+    return Promise.resolve(this);
+  }
+
+  getChildren(): Promise<vscode.TreeItem[]> {
+    return Promise.resolve([]);
+  }
+}
+
+export class UriTreeItem extends BaseTreeItem {
+  public parent?: vscode.TreeItem;
+
+  constructor(
+    public readonly uri: URI,
+    options: {
+      collapsibleState?: vscode.TreeItemCollapsibleState;
+      title?: string;
+      parent?: vscode.TreeItem;
+    } = {}
+  ) {
+    super(options?.title ?? uri.getName(), options.collapsibleState);
+    this.parent = options.parent;
+    this.description = uri.path.replace(
+      vscode.workspace.getWorkspaceFolder(toVsCodeUri(uri))?.uri.path,
+      ''
+    );
+    this.iconPath = new vscode.ThemeIcon('link');
+  }
+}
+
+export class ResourceTreeItem extends UriTreeItem {
+  constructor(
+    public readonly resource: Resource,
+    private readonly workspace: FoamWorkspace,
+    options: {
+      collapsibleState?: vscode.TreeItemCollapsibleState;
+      parent?: vscode.TreeItem;
+    } = {}
+  ) {
+    super(resource.uri, {
+      title: resource.title,
+      collapsibleState: options.collapsibleState,
+      parent: options.parent,
+    });
+    this.command = {
+      command: 'vscode.open',
+      arguments: [toVsCodeUri(resource.uri)],
+      title: 'Go to location',
+    };
+    this.resourceUri = toVsCodeUri(resource.uri);
+    this.iconPath = vscode.ThemeIcon.File;
+    this.contextValue = 'foam.resource';
+  }
+
+  async resolveTreeItem(): Promise<ResourceTreeItem> {
+    if (this instanceof ResourceTreeItem) {
+      const content = await this.workspace.readAsMarkdown(this.resource.uri);
+      this.tooltip = isSome(content)
+        ? getNoteTooltip(content)
+        : this.resource.title;
+    }
+    return this;
+  }
+}
+
+export class ResourceRangeTreeItem extends BaseTreeItem {
+  public value: any;
+  constructor(
+    public label: string,
+    public variant: string,
+    public readonly resource: Resource,
+    public readonly range: Range,
+    public readonly workspace: FoamWorkspace
+  ) {
+    super(label, vscode.TreeItemCollapsibleState.None);
+    this.command = {
+      command: 'vscode.open',
+      arguments: [toVsCodeUri(resource.uri), { selection: range }],
+      title: 'Go to location',
+    };
+  }
+
+  async resolveTreeItem(): Promise<ResourceRangeTreeItem> {
+    const markdown =
+      (await this.workspace.readAsMarkdown(this.resource.uri)) ?? '';
+    let { block, nLines } = getBlockFor(markdown, this.range.start);
+    // Long blocks need to be interrupted or they won't display in hover preview
+    // We keep the extra lines so that the count in the preview is correct
+    if (nLines > 15) {
+      let tmp = block.split('\n');
+      tmp.splice(15, 1, '\n'); // replace a line with a blank line to interrupt the block
+      block = tmp.join('\n');
+    }
+    const tooltip = getNoteTooltip(block ?? this.label ?? '');
+    this.tooltip = tooltip;
+    return Promise.resolve(this);
+  }
+
+  static icons = {
+    backlink: new vscode.ThemeIcon(
+      'arrow-left',
+      new vscode.ThemeColor('charts.purple')
+    ),
+    link: new vscode.ThemeIcon(
+      'arrow-right',
+      new vscode.ThemeColor('charts.purple')
+    ),
+    tag: new vscode.ThemeIcon(
+      'symbol-number',
+      new vscode.ThemeColor('charts.purple')
+    ),
+  };
+  static async createStandardItem(
+    workspace: FoamWorkspace,
+    resource: Resource,
+    range: Range,
+    variant: 'backlink' | 'tag' | 'link'
+  ): Promise<ResourceRangeTreeItem> {
+    const markdown = (await workspace.readAsMarkdown(resource.uri)) ?? '';
+    const lines = markdown.split('\n');
+
+    const line = lines[range.start.line];
+    const start = Math.max(0, range.start.character - 15);
+    const ellipsis = start === 0 ? '' : '...';
+
+    const label = line
+      ? `${range.start.line + 1}: ${ellipsis}${line.slice(start, start + 300)}`
+      : Range.toString(range);
+
+    const item = new ResourceRangeTreeItem(
+      label,
+      variant,
+      resource,
+      range,
+      workspace
+    );
+    item.iconPath = ResourceRangeTreeItem.icons[variant];
+
+    return item;
+  }
+}
+
+export const groupRangesByResource = async (
+  workspace: FoamWorkspace,
+  items:
+    | ResourceRangeTreeItem[]
+    | Promise<ResourceRangeTreeItem[]>
+    | Promise<ResourceRangeTreeItem>[],
+  collapsibleState = vscode.TreeItemCollapsibleState.Collapsed
+) => {
+  let itemsArray = [] as ResourceRangeTreeItem[];
+  if (items instanceof Promise) {
+    itemsArray = await items;
+  }
+  if (items instanceof Array && items[0] instanceof Promise) {
+    itemsArray = await Promise.all(items);
+  }
+  if (items instanceof Array && items[0] instanceof ResourceRangeTreeItem) {
+    itemsArray = items as any;
+  }
+  const byResource = groupBy(itemsArray, item => item.resource.uri.path);
+  const resourceItems = Object.values(byResource).map(items => {
+    const resourceItem = new ResourceTreeItem(items[0].resource, workspace, {
+      collapsibleState,
+    });
+    const children = items.sort((a, b) => Range.isBefore(a.range, b.range));
+    resourceItem.getChildren = () => Promise.resolve(children);
+    resourceItem.description = `(${items.length}) ${resourceItem.description}`;
+    resourceItem.command = children[0].command;
+    return resourceItem;
+  });
+  resourceItems.sort((a, b) => Resource.sortByTitle(a.resource, b.resource));
+  return resourceItems;
+};
+
+export function createBacklinkItemsForResource(
+  workspace: FoamWorkspace,
+  graph: FoamGraph,
+  uri: URI,
+  variant: 'backlink' | 'link' = 'backlink'
+) {
+  const connections = graph
+    .getConnections(uri)
+    .filter(c => c.target.asPlain().isEqual(uri));
+
+  const backlinkItems = connections.map(async c =>
+    ResourceRangeTreeItem.createStandardItem(
+      workspace,
+      workspace.get(c.source),
+      c.link.range,
+      variant
+    )
+  );
+  return Promise.all(backlinkItems);
+}
+
+export function createConnectionItemsForResource(
+  workspace: FoamWorkspace,
+  graph: FoamGraph,
+  uri: URI,
+  filter: (c: Connection) => boolean = () => true
+) {
+  const connections = graph.getConnections(uri).filter(c => filter(c));
+
+  const backlinkItems = connections.map(async c => {
+    const item = await ResourceRangeTreeItem.createStandardItem(
+      workspace,
+      workspace.get(c.source),
+      c.link.range,
+      c.source.asPlain().isEqual(uri) ? 'link' : 'backlink'
+    );
+    item.value = c;
+    return item;
+  });
+  return Promise.all(backlinkItems);
+}

packages/foam-vscode/src/features/preview/index.ts

@@ -1,28 +1,30 @@
+/*global markdownit:readonly*/
+
 import * as vscode from 'vscode';
-import { FoamFeature } from '../../types';
 import { Foam } from '../../core/model/foam';
 import { default as markdownItFoamTags } from './tag-highlight';
 import { default as markdownItWikilinkNavigation } from './wikilink-navigation';
 import { default as markdownItRemoveLinkReferences } from './remove-wikilink-references';
 import { default as markdownItWikilinkEmbed } from './wikilink-embed';
 
-const feature: FoamFeature = {
-  activate: async (
-    _context: vscode.ExtensionContext,
-    foamPromise: Promise<Foam>
-  ) => {
-    const foam = await foamPromise;
+export default async function activate(
+  context: vscode.ExtensionContext,
+  foamPromise: Promise<Foam>
+) {
+  const foam = await foamPromise;
 
-    return {
-      extendMarkdownIt: (md: markdownit) => {
-        return [
-          markdownItWikilinkEmbed,
-          markdownItFoamTags,
-          markdownItWikilinkNavigation,
-          markdownItRemoveLinkReferences,
-        ].reduce((acc, extension) => extension(acc, foam.workspace), md);
-      },
-    };
-  },
-};
-export default feature;
+  return {
+    extendMarkdownIt: (md: markdownit) => {
+      return [
+        markdownItWikilinkEmbed,
+        markdownItFoamTags,
+        markdownItWikilinkNavigation,
+        markdownItRemoveLinkReferences,
+      ].reduce(
+        (acc, extension) =>
+          extension(acc, foam.workspace, foam.services.parser),
+        md
+      );
+    },
+  };
+}

packages/foam-vscode/src/features/preview/remove-wikilink-references.ts

@@ -1,3 +1,5 @@
+/*global markdownit:readonly*/
+
 import { FoamWorkspace } from '../../core/model/workspace';
 
 export const markdownItRemoveLinkReferences = (