Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)

* Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898

* Fixes and cleanup

* Distro

* Fix hygiene yarn

* delete no yarn lock changes file

* Fix hygiene

* Fix layer check

* Fix CI

* Skip lib checks

* Remove tests deleted in vs code

* Fix tests

* Distro

* Fix tests and add removed extension point

* Skip failing notebook tests for now

* Disable broken tests and cleanup build folder

* Update yarn.lock and fix smoke tests

* Bump sqlite

* fix contributed actions and file spacing

* Fix user data path

* Update yarn.locks

Co-authored-by: ADS Merger <karlb@microsoft.com>

extensions/merge-conflict/package.json

@@ -3,7 +3,7 @@
   "publisher": "vscode",
   "displayName": "%displayName%",
   "description": "%description%",
-  "icon": "resources/icons/merge-conflict.png",
+  "icon": "media/icon.png",
   "version": "1.0.0",
   "license": "MIT",
   "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
@@ -13,6 +13,12 @@
   "categories": [
     "Other"
   ],
+  "capabilities": {
+    "virtualWorkspaces": false,
+    "untrustedWorkspaces": {
+      "supported": true
+    }
+  },
   "activationEvents": [
     "onStartupFinished"
   ],
@@ -70,13 +76,15 @@
         "category": "%command.category%",
         "title": "%command.next%",
         "original": "Next Conflict",
-        "command": "merge-conflict.next"
+        "command": "merge-conflict.next",
+        "icon": "$(arrow-down)"
       },
       {
         "category": "%command.category%",
         "title": "%command.previous%",
         "original": "Previous Conflict",
-        "command": "merge-conflict.previous"
+        "command": "merge-conflict.previous",
+        "icon": "$(arrow-up)"
       },
       {
         "category": "%command.category%",
@@ -97,6 +105,18 @@
           "when": "scmProvider == git && scmResourceGroup == merge",
           "group": "1_modification"
         }
+      ],
+      "editor/title": [
+        {
+          "command": "merge-conflict.previous",
+          "group": "navigation@1",
+          "when": "mergeConflictsCount && mergeConflictsCount != 0"
+        },
+        {
+          "command": "merge-conflict.next",
+          "group": "navigation@2",
+          "when": "mergeConflictsCount && mergeConflictsCount != 0"
+        }
       ]
     },
     "configuration": {