Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 03:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Microsoft/master' into feature/50241-Add_branch_name_validation

Browse Source 
* Microsoft/master: (4802 commits)
  Fixes #57415: autoSurround - rename "always" to "languageDefined"
  debug: skip over %0
  explorer view: cut down delay time till progress from 3.2s to 1.2s
  file workspace suffix is empty string
  Revert "debug: do not send terminate to EH debugging"
  Fixes #57411: Rename `autoWrapping` to `autoSurround` to avoid confusions related to text wrapping
  Fixes #57453: Avoid thinking the user typed in the find input when setting the search string value
  Synchronisation notification: - Show extension being synchronised - Delete the downloaded extensions
  [html] fix tests
  debug: do not send terminate to EH debugging
  webpack - let build fail when webpack generates an error or a warning
  [html] update service. Fixes #57445
  node-debug@1.27.6
  more complete fix for #57483
  fix #57351
  fix #57483
  fixes #56015
  dispose of RunOnceScheduler properly
  Fixes Microsoft/monaco-editor#1021: Use ProviderResult in modes.ts
  fix #55607
  ...
This commit is contained in:
Morten Henriksen
2018-08-29 17:58:36 +02:00
parent 83da71325c 4478939278
commit d6b82a56e0
2802 changed files with 134582 additions and 69292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
extensions/git/package.json
View File

@@ -38,6 +38,11 @@
"dark": "resources/icons/dark/git.svg"
}
},
{
"command": "git.openRepository",
"title": "%command.openRepository%",
"category": "Git"
},
{
"command": "git.close",
"title": "%command.close%",
@@ -336,6 +341,10 @@
"command": "git.init",
"when": "config.git.enabled"
},
{
"command": "git.openRepository",
"when": "config.git.enabled"
},
{
"command": "git.close",
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
@@ -876,12 +885,27 @@
"string",
"null"
],
"description": "%config.path%",
"markdownDescription": "%config.path%",
"default": null,
"scope": "application"
},
"git.autoRepositoryDetection": {
"type": "boolean",
"type": [
"boolean",
"string"
],
"enum": [
true,
false,
"subFolders",
"openEditors"
],
"enumDescriptions": [
"%config.autoRepositoryDetection.true%",
"%config.autoRepositoryDetection.false%",
"%config.autoRepositoryDetection.subFolders%",
"%config.autoRepositoryDetection.openEditors%"
],
"description": "%config.autoRepositoryDetection%",
"default": true
},
@@ -893,7 +917,10 @@
"git.autofetch": {
"type": "boolean",
"description": "%config.autofetch%",
"default": false
"default": false,
"tags": [
"usesOnlineServices"
]
},
"git.createBranchNameConvention.regexp": {
"type": "string",
@@ -917,6 +944,11 @@
"tracked",
"off"
],
"enumDescriptions": [
"%config.countBadge.all%",
"%config.countBadge.tracked%",
"%config.countBadge.off%"
],
"description": "%config.countBadge%",
"default": "all"
},
@@ -928,7 +960,13 @@
"tags",
"remote"
],
"description": "%config.checkoutType%",
"enumDescriptions": [
"%config.checkoutType.all%",
"%config.checkoutType.local%",
"%config.checkoutType.tags%",
"%config.checkoutType.remote%"
],
"markdownDescription": "%config.checkoutType%",
"default": "all"
},
"git.ignoreLegacyWarning": {
@@ -953,11 +991,13 @@
},
"git.enableSmartCommit": {
"type": "boolean",
"scope": "resource",
"description": "%config.enableSmartCommit%",
"default": false
},
"git.enableCommitSigning": {
"type": "boolean",
"scope": "resource",
"description": "%config.enableCommitSigning%",
"default": false
},
@@ -968,6 +1008,7 @@
},
"git.promptToSaveFilesBeforeCommit": {
"type": "boolean",
"scope": "resource",
"default": false,
"description": "%config.promptToSaveFilesBeforeCommit%"
},
@@ -976,6 +1017,11 @@
"default": true,
"description": "%config.showInlineOpenFileAction%"
},
"git.showPushSuccessNotification": {
"type": "boolean",
"description": "%config.showPushSuccessNotification%",
"default": false
},
"git.inputValidation": {
"type": "string",
"enum": [
@@ -997,15 +1043,36 @@
"scope": "resource",
"default": 10,
"description": "%config.detectSubmodulesLimit%"
},
"git.alwaysSignOff": {
"type": "boolean",
"scope": "resource",
"default": false,
"description": "%config.alwaysSignOff%"
},
"git.ignoredRepositories": {
"type": "array",
"default": [],
"scope": "window",
"description": "%config.ignoredRepositories%"
}
}
},
"colors": [
{
"id": "gitDecoration.addedResourceForeground",
"description": "%colors.added%",
"defaults": {
"light": "#587c0c",
"dark": "#81b88b",
"highContrast": "#1b5225"
}
},
{
"id": "gitDecoration.modifiedResourceForeground",
"description": "%colors.modified%",
"defaults": {
"light": "#a76e12",
"light": "#895503",
"dark": "#E2C08D",
"highContrast": "#E2C08D"
}
@@ -1023,7 +1090,7 @@
"id": "gitDecoration.untrackedResourceForeground",
"description": "%colors.untracked%",
"defaults": {
"light": "#019001",
"light": "#018101",
"dark": "#73C991",
"highContrast": "#73C991"
}
@@ -1092,6 +1159,17 @@
".rej"
],
"configuration": "./languages/diff.language-configuration.json"
},
{
"id": "ignore",
"aliases": [
"Ignore",
"ignore"
],
"filenames": [
".gitignore"
],
"configuration": "./languages/ignore.language-configuration.json"
}
],
"grammars": [
@@ -1109,6 +1187,11 @@
"language": "diff",
"scopeName": "source.diff",
"path": "./syntaxes/diff.tmLanguage.json"
},
{
"language": "ignore",
"scopeName": "source.ignore",
"path": "./syntaxes/ignore.tmLanguage.json"
}
],
"configurationDefaults": {
@@ -1124,15 +1207,15 @@
"file-type": "^7.2.0",
"iconv-lite": "0.4.19",
"jschardet": "^1.6.0",
"vscode-extension-telemetry": "0.0.17",
"vscode-nls": "^3.2.1",
"vscode-extension-telemetry": "0.0.18",
"vscode-nls": "^3.2.4",
"which": "^1.3.0"
},
"devDependencies": {
"@types/byline": "4.2.31",
"@types/file-type": "^5.2.1",
"@types/mocha": "2.2.43",
"@types/node": "7.0.43",
"@types/node": "^8.10.25",
"@types/which": "^1.0.28",
"mocha": "^3.2.0"
}