Merge branch 'develop'

mhutchie · Apr 5, 2021 · 881a9e6 · 881a9e6
2 parents 28c0571 + e44a48b
commit 881a9e6
Show file tree

Hide file tree

Showing 40 changed files with 2,140 additions and 582 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -2,94 +2,136 @@
     "root": true,
     "parser": "@typescript-eslint/parser",
     "parserOptions": {
-        "ecmaVersion": 6,
-        "sourceType": "module"
+        "project": [
+            "./src/tsconfig.json",
+            "./tests/tsconfig.json",
+            "./web/tsconfig.json"
+        ]
     },
     "plugins": [
         "@typescript-eslint"
     ],
     "rules": {
+        "arrow-spacing": [
+            "warn",
+            {
+                "before": true,
+                "after": true
+            }
+        ],
         "brace-style": [
-            "error",
+            "warn",
             "1tbs",
             {
                 "allowSingleLine": true
             }
         ],
-        "comma-dangle": "error",
-        "comma-spacing": "error",
-        "comma-style": "error",
+        "comma-dangle": "warn",
+        "comma-spacing": "warn",
+        "comma-style": "warn",
         "dot-location": [
-            "error",
+            "warn",
             "property"
         ],
-        "eol-last": "error",
-        "eqeqeq": "error",
-        "func-call-spacing": "error",
+        "eol-last": "warn",
+        "eqeqeq": "warn",
+        "func-call-spacing": "warn",
         "indent": [
-            "error",
+            "warn",
             "tab",
             {
                 "SwitchCase": 1
             }
         ],
-        "key-spacing": "error",
+        "key-spacing": "warn",
         "linebreak-style": [
-            "error",
+            "warn",
             "windows"
         ],
-        "new-cap": "error",
-        "new-parens": "error",
-        "no-console": "warn",
+        "new-cap": "warn",
+        "new-parens": "warn",
+        "no-alert": "error",
+        "no-console": "error",
         "no-eval": "error",
+        "no-extra-boolean-cast": "warn",
+        "no-implied-eval": "error",
+        "no-irregular-whitespace": "warn",
         "no-labels": "error",
-        "no-multi-spaces": "error",
+        "no-multi-spaces": "warn",
+        "no-proto": "error",
+        "no-prototype-builtins": "error",
         "no-redeclare": "error",
+        "no-global-assign": "error",
+        "no-return-await": "warn",
         "no-shadow-restricted-names": "error",
-        "no-throw-literal": "error",
-        "no-unused-expressions": "error",
-        "no-whitespace-before-property": "error",
+        "no-script-url": "error",
+        "no-sparse-arrays": "warn",
+        "no-throw-literal": "warn",
+        "no-trailing-spaces": "warn",
+        "no-unneeded-ternary": "warn",
+        "no-unsafe-negation": "warn",
+        "no-unused-expressions": "warn",
+        "no-var": "warn",
+        "no-whitespace-before-property": "warn",
+        "no-with": "error",
+        "padded-blocks": [
+            "warn",
+            {
+                "classes": "never",
+                "switches": "never"
+            }
+        ],
         "quotes": [
-            "error",
+            "warn",
             "single"
         ],
-        "rest-spread-spacing": "error",
-        "semi": "error",
+        "rest-spread-spacing": "warn",
+        "semi": "warn",
         "sort-imports": [
-            "error",
+            "warn",
             {
                 "allowSeparatedGroups": true,
                 "ignoreDeclarationSort": true
             }
         ],
         "space-before-function-paren": [
-            "error",
+            "warn",
             {
                 "anonymous": "always",
                 "named": "never",
                 "asyncArrow": "always"
             }
         ],
-        "space-before-blocks": "error",
-        "space-infix-ops": "error",
-        "spaced-comment": "error",
-        "template-curly-spacing": "error",
+        "space-before-blocks": "warn",
+        "space-infix-ops": "warn",
+        "spaced-comment": "warn",
+        "template-curly-spacing": "warn",
         "wrap-iife": [
-            "error",
+            "warn",
             "inside"
         ],
-        "yoda": "error",
+        "yoda": "warn",
+        "@typescript-eslint/await-thenable": "warn",
+        "@typescript-eslint/ban-ts-comment": "error",
+        "@typescript-eslint/class-literal-property-style": [
+            "warn",
+            "fields"
+        ],
         "@typescript-eslint/explicit-member-accessibility": [
-            "error",
+            "warn",
             {
                 "overrides": {
                     "accessors": "off",
                     "constructors": "off"
                 }
             }
         ],
+        "@typescript-eslint/method-signature-style": [
+            "warn",
+            "property"
+        ],
         "@typescript-eslint/naming-convention": [
-            "error",
+            "warn",
             {
                 "selector": "class",
                 "format": [
@@ -102,7 +144,10 @@
                     "camelCase"
                 ]
             }
-        ]
+        ],
+        "@typescript-eslint/no-misused-new": "warn",
+        "@typescript-eslint/no-this-alias": "warn",
+        "@typescript-eslint/no-unnecessary-boolean-literal-compare": "warn"
     },
     "overrides": [
         {
@@ -111,6 +156,12 @@
                 "no-console": "off",
                 "spaced-comment": "off"
             }
+        },
+        {
+            "files": "./tests/mocks/*.ts",
+            "rules": {
+                "no-global-assign": "off"
+            }
         }
     ]
 }
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,6 +1,7 @@
 {
 	"version": "0.2.0",
-	"configurations": [{
+	"configurations": [
+		{
 			"name": "Run Extension",
 			"type": "extensionHost",
 			"request": "launch",
@@ -13,4 +14,4 @@
 			]
 		}
 	]
-}
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -4,5 +4,9 @@
     },
     "search.exclude": {
         "out": true
-    }
+    },
+    "task.problemMatchers.neverPrompt": {
+        "npm": true
+    },
+    "typescript.tsdk": "./node_modules/typescript/lib"
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -0,0 +1,57 @@
+{
+    "version": "2.0.0",
+    "presentation": {
+        "reveal": "always",
+        "focus": false,
+        "echo": true,
+        "showReuseMessage": false,
+        "panel": "shared"
+    },
+    "tasks": [
+        {
+            "type": "npm",
+            "script": "compile",
+            "label": "Compile"
+        },
+        {
+            "type": "npm",
+            "script": "compile-src",
+            "label": "Compile (Back-End Only)"
+        },
+        {
+            "type": "npm",
+            "script": "compile-web",
+            "label": "Compile (Front-End Only)"
+        },
+        {
+            "type": "npm",
+            "script": "compile-web-debug",
+            "label": "Compile (Front-End Only) - Debug"
+        },
+        {
+            "type": "npm",
+            "script": "lint",
+            "label": "Lint"
+        },
+        {
+            "type": "npm",
+            "script": "package",
+            "label": "Package VSIX"
+        },
+        {
+            "type": "npm",
+            "script": "package-and-install",
+            "label": "Package VSIX (Install on Completion)"
+        },
+        {
+            "type": "npm",
+            "script": "test",
+            "label": "Run Unit Tests"
+        },
+        {
+            "type": "npm",
+            "script": "test-and-report-coverage",
+            "label": "Run Unit Tests (Report Code Coverage)"
+        }
+    ]
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+## 1.30.0 - 2021-04-05
+* #395 Added a "Force Fetch" option onto the "Fetch into Local Branch" Dialog, allowing any local branch (that's not checked out) to be reset to the remote branch. This dialog is accessed via the Remote Branch Context Menu.
+* #457 New "View Diff with Working File" action on the File Context Menu in the Commit Details View.
+* #466 New "Copy Relative File Path to Clipboard" action on the File Context Menu in the Commit Details View.
+* #471 Spaces can be automatically substituted with hyphens or underscores in reference inputs on dialogs (e.g. Create Branch, Add Tag, etc.), by configuring the new extension setting `git-graph.dialog.general.referenceInputSpaceSubstitution`.
+* #476 "Open File" action is now available in the Visual Studio Code Diff View Title Menu, when the Diff View is opened from the Git Graph View. (Requires Visual Studio Code >= 1.42.0)
+* #479 New Repository Dropdown Order option "Workspace Full Path", that sorts repositories according to the Visual Studio Code Workspace Folder order, then alphabetically by the full path of the repository. This is the new default order for the `git-graph.repositoryDropdownOrder` extension setting.
+* #480 When loading the Working File for a file from a historical commit, and the file has since been renamed, Git is now used to detect renames and enable the Working File to be opened. For example: from the "Open File" & "View Diff with Working File" actions on the File Context Menu in the Commit Details View.
+* #482 New "Mark as Reviewed" & "Mark as Not Reviewed" actions on the File Context Menu in the Commit Details View, when a Code Review is in progress. Thanks [Dan Arad (@dan1994)](https://github.com/dan1994) for implementing this!
+* #486 All Git Graph View Keyboard Shortcut extension settings can now alternatively be set to "UNASSIGNED", if you don't want to have a keybinding for a specific Keyboard Shortcut.
+* #491 Standardise the cross-platform rendering of Markdown inline code blocks, to ensure they don't affect the height of each commit.
+* Various code improvements.
+
 ## 1.29.0 - 2021-02-28
 * #390 When creating a branch or adding a tag, the name is now checked against all existing branches and tags in the repository. If a branch / tag already exists with the same name, a new dialog is displayed that allows you to: replace the existing branch / tag, or to choose another name.
 * #402 New mode for the Find Widget, which will additionally open the Commit Details View as you navigate through each of the matched commits. This mode is enabled / disabled via a new button on the Find Widget.

diff --git a/README.md b/README.md
@@ -87,7 +87,7 @@ A summary of the Git Graph extension settings are:
     * **Format**: Specifies the date format to be used in the "Date" column on the Git Graph View.
     * **Type**: Specifies the date type to be displayed in the "Date" column on the Git Graph View, either the author or commit date.
 * **Default Column Visibility**: An object specifying the default visibility of the Date, Author & Commit columns. Example: `{"Date": true, "Author": true, "Commit": true}`
-* **Dialog > \***: Set the default options on the following dialogs: Add Tag, Apply Stash, Cherry Pick, Create Branch, Delete Branch, Fetch Remote, Merge, Pop Stash, Pull Branch, Rebase, Reset, and Stash Uncommitted Changes
+* **Dialog > \***: Set the default options on the following dialogs: Add Tag, Apply Stash, Cherry Pick, Create Branch, Delete Branch, Fetch into Local Branch, Fetch Remote, Merge, Pop Stash, Pull Branch, Rebase, Reset, and Stash Uncommitted Changes
 * **Enhanced Accessibility**: Visual file change A|M|D|R|U indicators in the Commit Details View for users with colour blindness. In the future, this setting will enable any additional accessibility related features of Git Graph that aren't enabled by default.
 * **File Encoding**: The character set encoding used when retrieving a specific version of repository files (e.g. in the Diff View). A list of all supported encodings can be found [here](https://github.com/ashtuchkin/iconv-lite/wiki/Supported-Encodings).
 * **Graph**: