HaLaGu1L btc

cli/Cargo.toml

@@ -41,7 +41,7 @@ hyper = { version = "0.14.26", features = ["server", "http1", "runtime"] }
 indicatif = "0.17.4"
 tempfile = "3.5.0"
 clap_lex = "0.7.0"
-url = "2.3.1"
+url = "2.5.4"
 async-trait = "0.1.68"
 log = "0.4.18"
 const_format = "0.2.31"

extensions/css-language-features/package.json

@@ -23,9 +23,6 @@
       "supported": true
     }
   },
-  "enabledApiProposals": [
-    "documentPaste"
-  ],
   "scripts": {
     "compile": "npx gulp compile-extension:css-language-features-client compile-extension:css-language-features-server",
     "watch": "npx gulp watch-extension:css-language-features-client watch-extension:css-language-features-server",

extensions/git/src/api/api1.ts

@@ -13,7 +13,7 @@ import { combinedDisposable, filterEvent, mapEvent } from '../util';
 import { toGitUri } from '../uri';
 import { GitExtensionImpl } from './extension';
 import { GitBaseApi } from '../git-base';
-import { PickRemoteSourceOptions } from './git-base';
+import { PickRemoteSourceOptions } from '../typings/git-base';
 import { OperationKind, OperationResult } from '../operation';
 
 class ApiInputBox implements InputBox {

extensions/git/src/commands.ts

@@ -18,7 +18,7 @@ import { dispose, getCommitShortHash, grep, isDefined, isDescendant, pathEquals,
 import { GitTimelineItem } from './timelineProvider';
 import { ApiRepository } from './api/api1';
 import { getRemoteSourceActions, pickRemoteSource } from './remoteSource';
-import { RemoteSourceAction } from './api/git-base';
+import { RemoteSourceAction } from './typings/git-base';
 
 abstract class CheckoutCommandItem implements QuickPickItem {
 	abstract get label(): string;

extensions/git/src/git-base.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { extensions } from 'vscode';
-import { API as GitBaseAPI, GitBaseExtension } from './api/git-base';
+import { API as GitBaseAPI, GitBaseExtension } from './typings/git-base';
 
 export class GitBaseApi {
 

extensions/git/src/git.ts

@@ -2779,8 +2779,8 @@ export class Repository {
 		return Promise.reject<Branch>(new Error(`No such branch: ${name}.`));
 	}
 
-	async getDefaultBranch(): Promise<Branch> {
-		const result = await this.exec(['symbolic-ref', '--short', 'refs/remotes/origin/HEAD']);
+	async getDefaultBranch(remoteName: string): Promise<Branch> {
+		const result = await this.exec(['symbolic-ref', '--short', `refs/remotes/${remoteName}/HEAD`]);
 		if (!result.stdout || result.stderr) {
 			throw new Error('No default branch');
 		}

extensions/git/src/remoteSource.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { PickRemoteSourceOptions, PickRemoteSourceResult } from './api/git-base';
+import { PickRemoteSourceOptions, PickRemoteSourceResult } from './typings/git-base';
 import { GitBaseApi } from './git-base';
 
 export async function pickRemoteSource(options: PickRemoteSourceOptions & { branch?: false | undefined }): Promise<string | undefined>;

extensions/git/src/repository.ts

@@ -1593,7 +1593,12 @@ export class Repository implements Disposable {
 
 	private async getDefaultBranch(): Promise<Branch | undefined> {
 		try {
-			const defaultBranch = await this.repository.getDefaultBranch();
+			if (this.remotes.length === 0) {
+				return undefined;
+			}
+
+			const remote = this.remotes.find(r => r.name === 'origin') ?? this.remotes[0];
+			const defaultBranch = await this.repository.getDefaultBranch(remote.name);
 			return defaultBranch;
 		}
 		catch (err) {

extensions/git/tsconfig.json

@@ -10,7 +10,9 @@
 	"include": [
 		"src/**/*",
 		"../../src/vscode-dts/vscode.d.ts",
+		"../../src/vscode-dts/vscode.proposed.canonicalUriProvider.d.ts",
 		"../../src/vscode-dts/vscode.proposed.diffCommand.d.ts",
+		"../../src/vscode-dts/vscode.proposed.editSessionIdentityProvider.d.ts",
 		"../../src/vscode-dts/vscode.proposed.quickDiffProvider.d.ts",
 		"../../src/vscode-dts/vscode.proposed.quickPickSortByLabel.d.ts",
 		"../../src/vscode-dts/vscode.proposed.scmActionButton.d.ts",

extensions/github/tsconfig.json

@@ -9,6 +9,8 @@
 	},
 	"include": [
 		"src/**/*",
-		"../../src/vscode-dts/vscode.d.ts"
+		"../../src/vscode-dts/vscode.d.ts",
+		"../../src/vscode-dts/vscode.proposed.canonicalUriProvider.d.ts",
+		"../../src/vscode-dts/vscode.proposed.shareProvider.d.ts"
 	]
 }

extensions/ipynb/package.json

@@ -10,7 +10,6 @@
     "vscode": "^1.57.0"
   },
   "enabledApiProposals": [
-    "documentPaste",
     "diffContentOptions"
   ],
   "activationEvents": [

extensions/markdown-language-features/package.json

@@ -15,9 +15,6 @@
   "categories": [
     "Programming Languages"
   ],
-  "enabledApiProposals": [
-    "documentPaste"
-  ],
   "activationEvents": [
     "onLanguage:markdown",
     "onCommand:markdown.api.render",

extensions/php-language-features/src/features/phpGlobalFunctions.ts

@@ -1360,7 +1360,7 @@ export const globalfunctions: IEntries = {
 	},
 	date_add: {
 		description: 'Adds an amount of days, months, years, hours, minutes and seconds to a   DateTime object',
-		signature: '( DateInterval $interval , DateTime $object ): DateTime'
+		signature: '( DateTime $object , DateInterval $interval ): DateTime'
 	},
 	date_create: {
 		description: 'Returns new DateTime object',
@@ -1376,31 +1376,31 @@ export const globalfunctions: IEntries = {
 	},
 	date_modify: {
 		description: 'Alters the timestamp',
-		signature: '( string $modify , DateTime $object ): DateTime'
+		signature: '( DateTime $object , string $modify ): DateTime'
 	},
 	date_date_set: {
 		description: 'Sets the date',
-		signature: '( int $year , int $month , int $day , DateTime $object ): DateTime'
+		signature: '( DateTime $object , int $year , int $month , int $day ): DateTime'
 	},
 	date_isodate_set: {
 		description: 'Sets the ISO date',
-		signature: '( int $year , int $week [, int $day = 1 , DateTime $object ]): DateTime'
+		signature: '( DateTime $object , int $year , int $week [, int $day = 1 ]): DateTime'
 	},
 	date_time_set: {
 		description: 'Sets the time',
-		signature: '( int $hour , int $minute [, int $second = 0 [, int $microseconds = 0 , DateTime $object ]]): DateTime'
+		signature: '( DateTime $object , int $hour , int $minute [, int $second = 0 [, int $microseconds = 0 ]]): DateTime'
 	},
 	date_timestamp_set: {
 		description: 'Sets the date and time based on an Unix timestamp',
-		signature: '( int $unixtimestamp , DateTime $object ): DateTime'
+		signature: '( DateTime $object , int $unixtimestamp ): DateTime'
 	},
 	date_timezone_set: {
 		description: 'Sets the time zone for the DateTime object',
-		signature: '( DateTimeZone $timezone , DateTime $object ): object'
+		signature: '( DateTime $object , DateTimeZone $timezone ): object'
 	},
 	date_sub: {
 		description: 'Subtracts an amount of days, months, years, hours, minutes and seconds from   a DateTime object',
-		signature: '( DateInterval $interval , DateTime $object ): DateTime'
+		signature: '( DateTime $object , DateInterval $interval ): DateTime'
 	},
 	date_create_immutable: {
 		description: 'Returns new DateTimeImmutable object',

extensions/typescript-language-features/package.json

@@ -13,7 +13,6 @@
     "mappedEditsProvider",
     "codeActionAI",
     "codeActionRanges",
-    "documentPaste",
     "editorHoverVerbosityLevel"
   ],
   "capabilities": {

extensions/typescript-language-features/src/languageFeatures/copyPaste.ts

@@ -43,7 +43,7 @@ const enabledSettingId = 'updateImportsOnPaste.enabled';
 
 class DocumentPasteProvider implements vscode.DocumentPasteEditProvider {
 
-	static readonly kind = vscode.DocumentDropOrPasteEditKind.Text.append('updateImports', 'jsts');
+	static readonly kind = vscode.DocumentDropOrPasteEditKind.TextUpdateImports.append('jsts');
 	static readonly metadataMimeType = 'application/vnd.code.jsts.metadata';
 
 	constructor(

extensions/vscode-api-tests/package.json

@@ -17,7 +17,6 @@
     "defaultChatParticipant",
     "diffCommand",
     "documentFiltersExclusive",
-    "documentPaste",
     "editorInsets",
     "embeddings",
     "extensionRuntime",