Reorganizes code structure

 - Splits models & utils into separate files to reduce coupling
 - Relocates VS Code-specific utilities into system/-webview/

Author: eamodio

eslint.config.mjs

@@ -317,7 +317,7 @@ export default ts.config(
 	{
 		name: 'extension:node',
 		files: ['src/**/*'],
-		ignores: ['src/webviews/apps/**/*', 'src/env/browser/**/*'],
+		ignores: ['**/webview/**/*', 'src/test/**/*', 'src/webviews/apps/**/*', 'src/env/browser/**/*'],
 		languageOptions: {
 			globals: {
 				...globals.node,
@@ -358,7 +358,7 @@ export default ts.config(
 	{
 		name: 'extension:browser',
 		files: ['src/**/*'],
-		ignores: ['src/webviews/apps/**/*', 'src/env/node/**/*'],
+		ignores: ['**/webview/**/*', 'src/test/**/*', 'src/webviews/apps/**/*', 'src/env/node/**/*'],
 		languageOptions: {
 			globals: {
 				...globals.worker,
@@ -381,19 +381,19 @@ export default ts.config(
 		// Keep in sync with `src/webviews/apps/tsconfig.json`
 		files: [
 			'src/webviews/apps/**/*',
-			'src/@types/**/*',
-			'src/env/browser/**/*',
-			'src/plus/gk/account/promos.ts',
-			'src/plus/gk/account/subscription.ts',
 			'src/webviews/**/protocol.ts',
+			'src/**/models/**/*.ts',
+			'src/**/utils/**/*.ts',
+			'src/@types/**/*',
 			'src/config.ts',
 			'src/constants.ts',
 			'src/constants.*.ts',
+			'src/env/browser/**/*',
 			'src/features.ts',
-			'src/subscription.ts',
-			'src/system/*.ts',
-			'src/system/decorators/log.ts',
+			'src/system/**/*.ts',
+			'**/webview/**/*',
 		],
+		ignores: ['**/-webview/**/*'],
 		languageOptions: {
 			globals: {
 				...globals.browser,
@@ -414,13 +414,13 @@ export default ts.config(
 				{
 					patterns: [
 						{
-							group: ['react-dom'],
-							importNames: ['Container'],
-							message: 'Use our Container instead',
+							group: ['Container'],
+							message: "Can't use `Container` in webviews",
+							allowTypeImports: true,
 						},
 						{
 							group: ['vscode'],
-							message: "Can't use vscode in webviews",
+							message: "Can't use `vscode` in webviews",
 							allowTypeImports: true,
 						},
 					],

src/ai/aiProviderService.ts

@@ -5,17 +5,18 @@ import type { AIGenerateDraftEventData, Sources, TelemetryEvents } from '../cons
 import type { Container } from '../container';
 import { CancellationError } from '../errors';
 import type { GitCommit } from '../git/models/commit';
-import { assertsCommitHasFullDetails, isCommit } from '../git/models/commit';
+import { isCommit } from '../git/models/commit';
 import type { GitRevisionReference } from '../git/models/reference';
 import type { Repository } from '../git/models/repository';
 import { isRepository } from '../git/models/repository';
 import { uncommitted, uncommittedStaged } from '../git/models/revision';
+import { assertsCommitHasFullDetails } from '../git/utils/commit.utils';
 import { showAIModelPicker } from '../quickpicks/aiModelPicker';
+import { configuration } from '../system/-webview/configuration';
+import type { Storage } from '../system/-webview/storage';
+import { supportedInVSCodeVersion } from '../system/-webview/utils';
 import { getSettledValue } from '../system/promise';
 import { getPossessiveForm } from '../system/string';
-import { configuration } from '../system/vscode/configuration';
-import type { Storage } from '../system/vscode/storage';
-import { supportedInVSCodeVersion } from '../system/vscode/utils';
 import type { TelemetryService } from '../telemetry/telemetry';
 import { AnthropicProvider } from './anthropicProvider';
 import { GeminiProvider } from './geminiProvider';

src/ai/openAICompatibleProvider.ts

@@ -4,9 +4,9 @@ import type { AIProviders } from '../constants.ai';
 import type { TelemetryEvents } from '../constants.telemetry';
 import type { Container } from '../container';
 import { CancellationError } from '../errors';
+import { configuration } from '../system/-webview/configuration';
 import { sum } from '../system/iterable';
 import { interpolate } from '../system/string';
-import { configuration } from '../system/vscode/configuration';
 import type { AIModel, AIProvider } from './aiProviderService';
 import { getMaxCharacters, getOrPromptApiKey, showDiffTruncationWarning } from './aiProviderService';
 import {

src/ai/openaiProvider.ts

@@ -1,4 +1,4 @@
-import { configuration } from '../system/vscode/configuration';
+import { configuration } from '../system/-webview/configuration';
 import type { AIModel } from './aiProviderService';
 import { OpenAICompatibleProvider } from './openAICompatibleProvider';
 

src/ai/vscodeProvider.ts

@@ -2,9 +2,9 @@ import type { CancellationToken, LanguageModelChat, LanguageModelChatSelector }
 import { CancellationTokenSource, LanguageModelChatMessage, lm } from 'vscode';
 import type { TelemetryEvents } from '../constants.telemetry';
 import type { Container } from '../container';
+import { configuration } from '../system/-webview/configuration';
 import { sum } from '../system/iterable';
 import { capitalize, getPossessiveForm, interpolate } from '../system/string';
-import { configuration } from '../system/vscode/configuration';
 import type { AIModel, AIProvider } from './aiProviderService';
 import { getMaxCharacters, showDiffTruncationWarning } from './aiProviderService';
 import {

src/annotations/annotationProvider.ts

@@ -3,10 +3,10 @@ import { Disposable, window } from 'vscode';
 import type { FileAnnotationType } from '../config';
 import type { AnnotationStatus } from '../constants';
 import type { Container } from '../container';
+import { getTabUri } from '../system/-webview/utils';
 import { Logger } from '../system/logger';
 import type { Deferred } from '../system/promise';
 import { defer } from '../system/promise';
-import { getTabUri } from '../system/vscode/utils';
 import type { TrackedGitDocument } from '../trackers/trackedDocument';
 import type { Decoration } from './annotations';
 

src/annotations/annotations.ts

@@ -13,9 +13,9 @@ import type { Colors } from '../constants.colors';
 import type { CommitFormatOptions } from '../git/formatters/commitFormatter';
 import { CommitFormatter } from '../git/formatters/commitFormatter';
 import type { GitCommit } from '../git/models/commit';
+import { configuration } from '../system/-webview/configuration';
 import { scale, toRgba } from '../system/color';
 import { getWidth, interpolate, pad } from '../system/string';
-import { configuration } from '../system/vscode/configuration';
 import type { BlameFontOptions } from './gutterBlameAnnotationProvider';
 
 export interface ComputedHeatmap {

src/annotations/blameAnnotationProvider.ts

@@ -6,8 +6,8 @@ import { GitUri } from '../git/gitUri';
 import type { GitBlame } from '../git/models/blame';
 import type { GitCommit } from '../git/models/commit';
 import { changesMessage, detailsMessage } from '../hovers/hovers';
+import { configuration } from '../system/-webview/configuration';
 import { log } from '../system/decorators/log';
-import { configuration } from '../system/vscode/configuration';
 import type { TrackedGitDocument } from '../trackers/trackedDocument';
 import type { DidChangeStatusCallback } from './annotationProvider';
 import { AnnotationProviderBase } from './annotationProvider';

src/annotations/fileAnnotationController.ts

@@ -25,18 +25,18 @@ import type { AnnotationsToggleMode, FileAnnotationType } from '../config';
 import type { AnnotationStatus } from '../constants';
 import type { Colors, CoreColors } from '../constants.colors';
 import type { Container } from '../container';
+import { registerCommand } from '../system/-webview/command';
+import { configuration } from '../system/-webview/configuration';
+import { setContext } from '../system/-webview/context';
+import type { KeyboardScope } from '../system/-webview/keyboard';
+import { UriSet } from '../system/-webview/uriMap';
+import { isTrackableTextEditor } from '../system/-webview/utils';
 import { debug, log } from '../system/decorators/log';
 import { once } from '../system/event';
 import type { Deferrable } from '../system/function';
 import { debounce } from '../system/function';
 import { find } from '../system/iterable';
 import { basename } from '../system/path';
-import { registerCommand } from '../system/vscode/command';
-import { configuration } from '../system/vscode/configuration';
-import { setContext } from '../system/vscode/context';
-import type { KeyboardScope } from '../system/vscode/keyboard';
-import { UriSet } from '../system/vscode/uriMap';
-import { isTrackableTextEditor } from '../system/vscode/utils';
 import type {
 	DocumentBlameStateChangeEvent,
 	DocumentDirtyIdleTriggerEvent,

src/annotations/gutterBlameAnnotationProvider.ts

@@ -6,14 +6,14 @@ import type { Container } from '../container';
 import type { CommitFormatOptions } from '../git/formatters/commitFormatter';
 import { CommitFormatter } from '../git/formatters/commitFormatter';
 import type { GitCommit } from '../git/models/commit';
+import { configuration } from '../system/-webview/configuration';
 import { filterMap } from '../system/array';
 import { log } from '../system/decorators/log';
 import { first } from '../system/iterable';
 import { getLogScope } from '../system/logger.scope';
 import { maybeStopWatch } from '../system/stopwatch';
 import type { TokenOptions } from '../system/string';
 import { getTokensFromTemplate, getWidth } from '../system/string';
-import { configuration } from '../system/vscode/configuration';
 import type { TrackedGitDocument } from '../trackers/trackedDocument';
 import type { AnnotationContext, AnnotationState, DidChangeStatusCallback } from './annotationProvider';
 import { applyHeatmap, getGutterDecoration, getGutterRenderOptions } from './annotations';