Git - remove proposed api typings from git/github extensions (#237409)

microsoft · Jan 7, 2025 · 1c10a0e · 1c10a0e
1 parent d80ac5c
commit 1c10a0e
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 199 deletions.
diff --git a/extensions/git/src/api/api1.ts b/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 {

diff --git a/extensions/git/src/commands.ts b/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;

diff --git a/extensions/git/src/git-base.ts b/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 {
 

diff --git a/extensions/git/src/remoteSource.ts b/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>;

diff --git a/extensions/git/src/api/git-base.d.ts → extensions/git/src/typings/git-base.d.ts b/extensions/git/src/api/git-base.d.ts → extensions/git/src/typings/git-base.d.ts
diff --git a/extensions/git/src/typings/vscode.proposed.canonicalUriProvider.d.ts b/extensions/git/src/typings/vscode.proposed.canonicalUriProvider.d.ts
diff --git a/extensions/git/src/typings/vscode.proposed.editSessionIdentityProvider.d.ts b/extensions/git/src/typings/vscode.proposed.editSessionIdentityProvider.d.ts
diff --git a/extensions/git/tsconfig.json b/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",

diff --git a/extensions/github/src/typings/vscode.proposed.canonicalUriProvider.d.ts b/extensions/github/src/typings/vscode.proposed.canonicalUriProvider.d.ts
diff --git a/extensions/github/src/typings/vscode.proposed.shareProvider.d.ts b/extensions/github/src/typings/vscode.proposed.shareProvider.d.ts
diff --git a/extensions/github/tsconfig.json b/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"
 	]
 }