Merge pull request #4 from mihaiconstantin/dev

Release: 2.1.0

.eslintrc.json

@@ -0,0 +1,24 @@
+{
+    "root": true,
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+        "ecmaVersion": 6,
+        "sourceType": "module"
+    },
+    "plugins": [
+        "@typescript-eslint"
+    ],
+    "rules": {
+        "@typescript-eslint/naming-convention": "warn",
+        "@typescript-eslint/semi": "warn",
+        "curly": "warn",
+        "eqeqeq": "warn",
+        "no-throw-literal": "warn",
+        "semi": "off"
+    },
+    "ignorePatterns": [
+        "out",
+        "dist",
+        "**/*.d.ts"
+    ]
+}

.gitignore

@@ -1,3 +1,8 @@
 node_modules
 *.vsix
 debug/
+out
+dist
+.vscode-test/
+.DS_Store
+assets/video

.vscode/extensions.json

@@ -0,0 +1,7 @@
+{
+    // See http://go.microsoft.com/fwlink/?LinkId=827846
+    // for the documentation about the extensions.json format
+    "recommendations": [
+        "dbaeumer.vscode-eslint"
+    ]
+}

.vscode/launch.json

@@ -1,17 +1,34 @@
-// A launch configuration that launches the extension inside a new window
+// A launch configuration that compiles the extension and then opens it inside a new window
 // Use IntelliSense to learn about possible attributes.
 // Hover to view descriptions of existing attributes.
 // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
 {
-	"version": "0.2.0",
+    "version": "0.2.0",
     "configurations": [
         {
-            "name": "Extension",
+            "name": "Run Extension",
             "type": "extensionHost",
             "request": "launch",
             "args": [
                 "--extensionDevelopmentPath=${workspaceFolder}"
-            ]
+            ],
+            "outFiles": [
+                "${workspaceFolder}/out/**/*.js"
+            ],
+            "preLaunchTask": "${defaultBuildTask}"
+        },
+        {
+            "name": "Extension Tests",
+            "type": "extensionHost",
+            "request": "launch",
+            "args": [
+                "--extensionDevelopmentPath=${workspaceFolder}",
+                "--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
+            ],
+            "outFiles": [
+                "${workspaceFolder}/out/test/**/*.js"
+            ],
+            "preLaunchTask": "${defaultBuildTask}"
         }
     ]
-}
+}

.vscode/settings.json

@@ -0,0 +1,11 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+    "files.exclude": {
+        "out": false // set this to true to hide the "out" folder with the compiled JS files
+    },
+    "search.exclude": {
+        "out": true // set this to false to include "out" folder in search results
+    },
+    // Turn off tsc task auto detection since we have the necessary tasks as npm scripts
+    "typescript.tsc.autoDetect": "off"
+}

.vscode/tasks.json

@@ -0,0 +1,20 @@
+// See https://go.microsoft.com/fwlink/?LinkId=733558
+// for the documentation about the tasks.json format
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "type": "npm",
+            "script": "watch",
+            "problemMatcher": "$tsc-watch",
+            "isBackground": true,
+            "presentation": {
+                "reveal": "never"
+            },
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        }
+    ]
+}

.vscodeignore

@@ -1,4 +1,10 @@
 .vscode/**
 .vscode-test/**
+src/**
 .gitignore
+.yarnrc
 vsc-extension-quickstart.md
+**/tsconfig.json
+**/.eslintrc.json
+**/*.map
+**/*.ts

CHANGELOG.md

@@ -1,7 +1,185 @@
 # Changelog
 
+## [2.1.0] - 2022.04.24
+### Added
+- Add syntax highlighting support for multiple entries on the same line
+  separated by a `|` character:
+  - e.g., `[ ] Task one | [ ] ! Task two | [x] Task three`
+- Add greater flexibility with respect to where a supported modifier can be
+  placed. All of the following are correctly identified and parsed as valid
+  entries:
+  - `[ ] ! Some task`
+  - `[ ]! Some task`
+  - `[ ] !Some task`
+  - `[ ]!Some task`
+- Add commands to the command palette (i.e., `ctrl/cmd + shift + p`) to change
+  the symbol for the first entry on the line where the cursor is placed. The
+  following commands are available:
+  - `BuJo: Set Migrated Forward` to set `[>]`
+  - `BuJo: Set Migrated Backward` to set `[<]`
+  - `BuJo: Set Completed` to set `[x]`
+  - `BuJo: Set Open` to set `[ ]`
+  - `BuJo: Set In Progress` to set `[/]`
+  - `BuJo: Set Dropped` to set `[-]`
+- Add functionality to update entry symbols via arbitrary keybindings that can
+  also pass the symbol to be set as argument. For instance, the following
+  keybinding when triggered will update the task status to `[x]`, and toggle
+  between `[x]` and `[ ]` on subsequent triggers:
+
+    ```jsonc
+    [
+        // ...
+        {
+            "key": "alt+x",
+            "command": "bujo.setSymbol",
+            "args": {
+                "symbol": "x"
+            },
+            "when": "editorTextFocus && editorLangId == markdown"
+        }
+        // ...
+    ]
+    ```
+
+- Add default keybindings for changing entry symbols:
+  - `alt+x` to toggle between `[x]` and `[ ]`
+  - `alt+o` to set `[ ]`
+  - `alt+-` to toggle between `[-]` and `[ ]`
+  - `alt+/` to toggle between `[/]` and `[ ]`
+  - `alt+,` to toggle between `[<]` and `[ ]`
+  - `alt+.` to toggle between `[>]` and `[ ]`
+  - `alt+p` to toggle between `[o]` and `[ ]`
+- Add various snippets for **BuJo** elements:
+  - `task` to enter a task
+
+    ```markdown
+    - [ ] <Enter text here>
+    ```
+
+  - `taskclip` to enter a task from clipboard
+
+    ```markdown
+    - [ ] <Clipboard pasted here>
+    ```
+
+  - `scratch` to scratch a text selection
+
+    ```markdown
+    ~Some text~
+    ```
+
+  - `time` to enter the current time
+
+    ```markdown
+    10:38
+    ```
+
+  - `date` to enter the current date
+
+    ```markdown
+    2022.04.24
+    ```
+
+  - `datetime` to enter the current date and time
+
+    ```markdown
+    2022.04.24 10:39
+    ```
+
+  - `timetracktable` to enter a time tracking table
+
+    ```markdown
+    |     Tracker | Task             | Backlog  |
+    | ----------: | :--------------- | :------- |
+    | 00:00-00:00 | [ ] Example task | [[link]] |
+    |             |                  |          |
+    ```
+
+  - `timetrackrow` to add an empty row to the time tracking table
+
+    ```markdown
+    |             |                  |          |
+    ```
+
+  - `timetracktask` to enter a task in the time tracking table
+
+    ```markdown
+    |             | [ ] <Enter here> |          |
+    ```
+
+  - `timetracktaskclip` to enter a task from clipboard in the time tracking table
+
+    ```markdown
+    |             | [ ] <Clipboard>  |          |
+    ```
+
+  - `timeblocktable` to enter a time blocking table
+
+    ```markdown
+    |        Time | Block          |
+    | ----------: | :------------- |
+    |     (00:00) | (Revision \#1) |
+    |             |                |
+    | 00:00-00:00 | Chunk (#1)     |
+    |             | - Chunk note   |
+    |             |                |
+    ```
+
+  - `timeblockrow` to add an empty row to the time blocking table
+
+    ```markdown
+    |             |                |
+    ```
+
+  - `timeblockrev` to enter a revision row in the time blocking table
+
+    ```markdown
+    |     (10:53) | (Revision \#1) |
+    ```
+
+  - `timeblockchunk` to enter a chunk row in the time blocking table
+
+    ```markdown
+    | 00:00-00:00 | <Enter here>   |
+    ```
+
+  - `timeblocknote` to enter a note row in the time blocking table
+
+    ```markdown
+    |             | - <Add here>   |
+    ```
+
+- Add way to highlight the time separator (i.e., `-`) in a time tracking table
+  also only the start time of a task is recorded (i.e., `-` will get matched
+  also in `00:00-`, and not only `00:00-00:00`; see
+  https://regex101.com/r/36951B/6).
+
+### Changed
+- Improve `regex` for matching Bullet Journal entries (i.e., moved from
+  https://regex101.com/r/ByIG8W/20 to https://regex101.com/r/LVVrrS/26).
+- Improve matching performance for Bullet Journal entries.
+- Update `README.md` to reflect the new features.
+
+### Fixed
+- Update `regex` for markdown table grids to select `|` only when they are part of
+  a markdown table grid (i.e., https://regex101.com/r/91IC8c/5).
+- Fix headings in `CHANGELOG.md` for previous releases.
+
+### Deprecated
+- Time tracking scopes (i.e. `bujo.todo.*` will be renamed to `bujo.timetrack.*`
+  in the future. For now, no changes need to be made. Below you can see the
+  entire list of scopes that will be affected:
+  - to be renamed from `bujo.todo.start.hour` to `bujo.timetrack.start.hour`
+  - to be renamed from `bujo.todo.start.colon` to `bujo.timetrack.start.colon`
+  - to be renamed from `bujo.todo.start.minute` to `bujo.timetrack.start.minute`
+  - to be renamed from `bujo.todo.separator` to `bujo.timetrack.separator`
+  - to be renamed from `bujo.todo.end.hour` to `bujo.timetrack.end.hour`
+  - to be renamed from `bujo.todo.end.colon` to `bujo.timetrack.end.colon`
+  - to be renamed from `bujo.todo.end.minute` to `bujo.timetrack.end.minute`
+  - to be renamed from `bujo.todo.total` to `bujo.timetrack.total`
+
 ## [2.0.2] - 2022.04.20
-## Changed
+### Changed
 - Improved `README.md` text and images presentation.
 - Update extension name and description.
 
@@ -27,12 +205,12 @@
 - Drop scopes for each modifier. Currently, all supported modifiers fall under
   the same scope.
 
-### [1.1.0] - 2021.11.29
+## [1.1.0] - 2021.11.29
 - Add two new tokens `bujo.horizontal.grid` and `bujo.vertical.grid` for
   selecting grids in markdown tables (i.e., the `:---:`, `:---`, or `---:` for
   horizontal grid, and the `|` for vertical grid).
 
-### [1.0.0] - 2021.05.25
+## [1.0.0] - 2021.05.25
 ### Added
 - Added `TextMate` scopes for standard Bullet Journal symbols
     - `[ ]` task