Reorganizes path & vscode utils

Updates lint rules to catch invalid imports

Author: eamodio

eslint.config.mjs

@@ -252,23 +252,27 @@ export default ts.config(
 						'util',
 						'vm',
 						'zlib',
-					],
-					patterns: [
-						{
-							group: ['**/env/**/*'],
-							message: 'Use @env/ instead',
-						},
 						{
-							group: ['react-dom'],
+							name: 'react-dom',
 							importNames: ['Container'],
 							message: 'Use our Container instead',
 						},
 						{
-							group: ['vscode'],
+							name: 'vscode',
 							importNames: ['CancellationError'],
 							message: 'Use our CancellationError instead',
 						},
 					],
+					patterns: [
+						{
+							group: ['**/env/**/*'],
+							message: 'Use @env/ instead',
+						},
+						{
+							group: ['**/webview/**/*'],
+							message: "Can't use any `webview`-only modules in extension",
+						},
+					],
 				},
 			],
 			'@typescript-eslint/no-unnecessary-condition': 'off',
@@ -339,14 +343,14 @@ export default ts.config(
 			'@typescript-eslint/no-restricted-imports': [
 				'error',
 				{
-					patterns: [
+					paths: [
 						{
-							group: ['react-dom'],
+							name: 'react-dom',
 							importNames: ['Container'],
 							message: 'Use our Container instead',
 						},
 						{
-							group: ['vscode'],
+							name: 'vscode',
 							importNames: ['CancellationError'],
 							message: 'Use our CancellationError instead',
 						},
@@ -412,15 +416,23 @@ export default ts.config(
 			'@typescript-eslint/no-restricted-imports': [
 				'error',
 				{
+					paths: [
+						{
+							name: 'vscode',
+							message: "Can't use `vscode` in webviews",
+							allowTypeImports: true,
+						},
+					],
 					patterns: [
 						{
-							group: ['Container'],
+							group: ['container'],
+							importNames: ['Container'],
 							message: "Can't use `Container` in webviews",
 							allowTypeImports: true,
 						},
 						{
-							group: ['vscode'],
-							message: "Can't use `vscode` in webviews",
+							group: ['**/-webview/**/*'],
+							message: "Can't use any `-webview` modules in webviews",
 							allowTypeImports: true,
 						},
 					],

src/ai/aiProviderService.ts

@@ -14,7 +14,7 @@ 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 { supportedInVSCodeVersion } from '../system/-webview/vscode';
 import { getSettledValue } from '../system/promise';
 import { getPossessiveForm } from '../system/string';
 import type { TelemetryService } from '../telemetry/telemetry';

src/annotations/annotationProvider.ts

@@ -3,7 +3,7 @@ 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 { getTabUri } from '../system/-webview/vscode';
 import { Logger } from '../system/logger';
 import type { Deferred } from '../system/promise';
 import { defer } from '../system/promise';

src/annotations/fileAnnotationController.ts

@@ -30,7 +30,7 @@ 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 { isTrackableTextEditor } from '../system/-webview/vscode';
 import { debug, log } from '../system/decorators/log';
 import { once } from '../system/event';
 import type { Deferrable } from '../system/function';

src/annotations/lineAnnotationController.ts

@@ -6,7 +6,7 @@ import { CommitFormatter } from '../git/formatters/commitFormatter';
 import type { PullRequest } from '../git/models/pullRequest';
 import { detailsMessage } from '../hovers/hovers';
 import { configuration } from '../system/-webview/configuration';
-import { isTrackableTextEditor } from '../system/-webview/utils';
+import { isTrackableTextEditor } from '../system/-webview/vscode';
 import { debug, log } from '../system/decorators/log';
 import { once } from '../system/event';
 import { debounce } from '../system/function';

src/api/actionRunners.ts

@@ -6,7 +6,7 @@ import type { Container } from '../container';
 import { registerCommand } from '../system/-webview/command';
 import { configuration } from '../system/-webview/configuration';
 import { setContext } from '../system/-webview/context';
-import { getQuickPickIgnoreFocusOut } from '../system/-webview/utils';
+import { getQuickPickIgnoreFocusOut } from '../system/-webview/vscode';
 import { getScopedCounter } from '../system/counter';
 import { sortCompare } from '../system/string';
 import type { Action, ActionContext, ActionRunner } from './gitlens';

src/codelens/codeLensProvider.ts

@@ -28,7 +28,7 @@ import type { GitCommit } from '../git/models/commit';
 import { RemoteResourceType } from '../git/models/remoteResource';
 import { createCommand, executeCoreCommand } from '../system/-webview/command';
 import { configuration } from '../system/-webview/configuration';
-import { isVirtualUri } from '../system/-webview/utils';
+import { isVirtualUri } from '../system/-webview/vscode';
 import { is, once } from '../system/function';
 import { filterMap, find, first, join, map } from '../system/iterable';
 import { getLoggableName, Logger } from '../system/logger';

src/commands/browseRepoAtRevision.ts

@@ -4,7 +4,7 @@ import type { Container } from '../container';
 import { GitUri } from '../git/gitUri';
 import { showGenericErrorMessage } from '../messages';
 import { command, executeCoreCommand } from '../system/-webview/command';
-import { openWorkspace } from '../system/-webview/utils';
+import { openWorkspace } from '../system/-webview/vscode';
 import { Logger } from '../system/logger';
 import { basename } from '../system/path';
 import { ActiveEditorCommand } from './commandBase';

src/commands/diffWith.ts

@@ -9,7 +9,7 @@ import { deletedOrMissing } from '../git/models/revision';
 import { isShaLike, isUncommitted, shortenRevision } from '../git/utils/revision.utils';
 import { showGenericErrorMessage } from '../messages';
 import { command } from '../system/-webview/command';
-import { openDiffEditor } from '../system/-webview/utils';
+import { openDiffEditor } from '../system/-webview/vscode';
 import { createMarkdownCommandLink } from '../system/commands';
 import { Logger } from '../system/logger';
 import { basename } from '../system/path';

src/commands/diffWithPrevious.ts

@@ -6,7 +6,7 @@ import type { GitCommit } from '../git/models/commit';
 import { deletedOrMissing } from '../git/models/revision';
 import { showCommitHasNoPreviousCommitWarningMessage, showGenericErrorMessage } from '../messages';
 import { command, executeCommand } from '../system/-webview/command';
-import { findOrOpenEditor } from '../system/-webview/utils';
+import { findOrOpenEditor } from '../system/-webview/vscode';
 import { Logger } from '../system/logger';
 import { ActiveEditorCommand } from './commandBase';
 import { getCommandUri } from './commandBase.utils';