diff --git a/dev-packages/localization-manager/src/localization-manager.ts b/dev-packages/localization-manager/src/localization-manager.ts index 04e3187fba7c5..67fe17d004300 100644 --- a/dev-packages/localization-manager/src/localization-manager.ts +++ b/dev-packages/localization-manager/src/localization-manager.ts @@ -17,8 +17,7 @@ import * as chalk from 'chalk'; import * as fs from 'fs-extra'; import * as path from 'path'; -import { sortLocalization } from '.'; -import { Localization } from './common'; +import { Localization, sortLocalization } from './common'; import { deepl, DeeplLanguage, DeeplParameters, isSupportedLanguage, supportedLanguages } from './deepl-api'; export interface LocalizationOptions { diff --git a/dev-packages/private-re-exports/src/package-re-exports.ts b/dev-packages/private-re-exports/src/package-re-exports.ts index 6d37d6ce7c748..2c1e0fdb67ed1 100644 --- a/dev-packages/private-re-exports/src/package-re-exports.ts +++ b/dev-packages/private-re-exports/src/package-re-exports.ts @@ -17,8 +17,7 @@ import cp = require('child_process'); import fs = require('fs'); import path = require('path'); -import { parseModule } from '.'; -import { PackageJson, ReExportJson } from './utility'; +import { PackageJson, parseModule, ReExportJson } from './utility'; export async function readJson(jsonPath: string): Promise { return JSON.parse(await fs.promises.readFile(jsonPath, 'utf8')) as T; diff --git a/packages/core/src/browser/preferences/injectable-preference-proxy.ts b/packages/core/src/browser/preferences/injectable-preference-proxy.ts index b7b28967cdc2b..b57ce36feca95 100644 --- a/packages/core/src/browser/preferences/injectable-preference-proxy.ts +++ b/packages/core/src/browser/preferences/injectable-preference-proxy.ts @@ -17,10 +17,11 @@ import { inject, injectable, postConstruct } from 'inversify'; import { PreferenceSchema } from '../../common/preferences/preference-schema'; import { Disposable, DisposableCollection, Emitter, Event, MaybePromise } from '../../common'; -import { PreferenceChangeEvent, PreferenceEventEmitter, PreferenceProxyOptions, PreferenceRetrieval } from './preference-proxy'; -import { PreferenceChange, PreferenceScope, PreferenceService } from './preference-service'; -import { OverridePreferenceName, PreferenceChangeImpl, PreferenceChanges, PreferenceProviderDataChange, PreferenceProxy } from '.'; +import { PreferenceChangeEvent, PreferenceEventEmitter, PreferenceProxy, PreferenceProxyOptions, PreferenceRetrieval } from './preference-proxy'; +import { PreferenceChange, PreferenceChangeImpl, PreferenceChanges, PreferenceScope, PreferenceService } from './preference-service'; import { JSONValue } from '@phosphor/coreutils'; +import { PreferenceProviderDataChange } from './preference-provider'; +import { OverridePreferenceName } from './preference-language-override-service'; export const PreferenceProxySchema = Symbol('PreferenceProxySchema'); export interface PreferenceProxyFactory { diff --git a/packages/core/src/browser/preferences/preference-proxy.spec.ts b/packages/core/src/browser/preferences/preference-proxy.spec.ts index 8d8585a00fe03..1ce4b41429e5d 100644 --- a/packages/core/src/browser/preferences/preference-proxy.spec.ts +++ b/packages/core/src/browser/preferences/preference-proxy.spec.ts @@ -43,7 +43,7 @@ process.on('unhandledRejection', (reason, promise) => { }); import { expect } from 'chai'; -import { PreferenceValidationService } from '.'; +import { PreferenceValidationService } from './preference-validation-service'; import { JSONValue } from '@phosphor/coreutils'; let testContainer: Container; diff --git a/packages/core/src/common/uri-command-handler.spec.ts b/packages/core/src/common/uri-command-handler.spec.ts index be8f5630a2d14..df1be4e9b0917 100644 --- a/packages/core/src/common/uri-command-handler.spec.ts +++ b/packages/core/src/common/uri-command-handler.spec.ts @@ -15,7 +15,7 @@ // ***************************************************************************** import * as chai from 'chai'; -import { SelectionService } from '.'; +import { SelectionService } from './selection-service'; import { MaybeArray } from './types'; import URI from './uri'; import { UriAwareCommandHandler, UriCommandHandler } from './uri-command-handler'; diff --git a/packages/core/src/common/uri-command-handler.ts b/packages/core/src/common/uri-command-handler.ts index a5c523209f7ac..400f8a126d104 100644 --- a/packages/core/src/common/uri-command-handler.ts +++ b/packages/core/src/common/uri-command-handler.ts @@ -19,7 +19,7 @@ import { SelectionService } from '../common/selection-service'; import { UriSelection } from '../common/selection'; import { CommandHandler } from './command'; -import { MaybeArray } from '.'; +import { MaybeArray } from './types'; import URI from './uri'; export interface UriCommandHandler> extends CommandHandler { @@ -145,4 +145,3 @@ export namespace UriAwareCommandHandler { return new UriAwareCommandHandler(selectionService, handler, { multi: true }); } } - diff --git a/packages/editor/src/browser/quick-editor-service.ts b/packages/editor/src/browser/quick-editor-service.ts index 5dea426286e1e..f3293b987fb87 100644 --- a/packages/editor/src/browser/quick-editor-service.ts +++ b/packages/editor/src/browser/quick-editor-service.ts @@ -21,7 +21,8 @@ import { LabelProvider } from '@theia/core/lib/browser/label-provider'; import { OpenerService } from '@theia/core/lib/browser/opener-service'; import { QuickAccessProvider, QuickAccessRegistry, QuickAccessContribution } from '@theia/core/lib/browser/quick-input/quick-access'; import { filterItems, QuickPickItem, QuickPickSeparator } from '@theia/core/lib/browser/quick-input/quick-input-service'; -import { EditorManager, EditorWidget } from '.'; +import { EditorManager } from './editor-manager'; +import { EditorWidget } from './editor-widget'; @injectable() export class QuickEditorService implements QuickAccessContribution, QuickAccessProvider { diff --git a/packages/filesystem/src/common/filesystem-utils.spec.ts b/packages/filesystem/src/common/filesystem-utils.spec.ts index 231b1cdb90bd6..06d50707dedbf 100644 --- a/packages/filesystem/src/common/filesystem-utils.spec.ts +++ b/packages/filesystem/src/common/filesystem-utils.spec.ts @@ -14,7 +14,7 @@ // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 // ***************************************************************************** -import { FileSystemUtils } from '.'; +import { FileSystemUtils } from './filesystem-utils'; import { FileStat } from './files'; import { expect } from 'chai'; diff --git a/packages/scm-extra/src/browser/history/index.ts b/packages/scm-extra/src/browser/history/index.ts index 7c180aeea830f..5021b6899d2cd 100644 --- a/packages/scm-extra/src/browser/history/index.ts +++ b/packages/scm-extra/src/browser/history/index.ts @@ -14,16 +14,5 @@ // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 // ***************************************************************************** -import { ScmProvider } from '@theia/scm/lib/browser/scm-provider'; -import { ScmHistorySupport } from './scm-history-widget'; - -export { ScmHistorySupport }; - -export interface ScmHistoryProvider extends ScmProvider { - historySupport?: ScmHistorySupport; -} -export namespace ScmHistoryProvider { - export function is(scmProvider: ScmProvider | undefined): scmProvider is ScmHistoryProvider { - return !!scmProvider && 'historySupport' in scmProvider; - } -} +export { ScmHistorySupport } from './scm-history-widget'; +export { ScmHistoryProvider } from './scm-history-provider'; diff --git a/packages/scm-extra/src/browser/history/scm-history-provider.ts b/packages/scm-extra/src/browser/history/scm-history-provider.ts new file mode 100644 index 0000000000000..84d8582ae3c21 --- /dev/null +++ b/packages/scm-extra/src/browser/history/scm-history-provider.ts @@ -0,0 +1,28 @@ +// ***************************************************************************** +// Copyright (C) 2022 Ericsson and others. +// +// This program and the accompanying materials are made available under the +// terms of the Eclipse Public License v. 2.0 which is available at +// http://www.eclipse.org/legal/epl-2.0. +// +// This Source Code may also be made available under the following Secondary +// Licenses when the conditions for such availability set forth in the Eclipse +// Public License v. 2.0 are satisfied: GNU General Public License, version 2 +// with the GNU Classpath Exception which is available at +// https://www.gnu.org/software/classpath/license.html. +// +// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 +// ***************************************************************************** + + +import { ScmProvider } from '@theia/scm/lib/browser/scm-provider'; +import { ScmHistorySupport } from './scm-history-widget'; + +export interface ScmHistoryProvider extends ScmProvider { + historySupport?: ScmHistorySupport; +} +export namespace ScmHistoryProvider { + export function is(scmProvider: ScmProvider | undefined): scmProvider is ScmHistoryProvider { + return !!scmProvider && 'historySupport' in scmProvider; + } +} diff --git a/packages/scm-extra/src/browser/history/scm-history-widget.tsx b/packages/scm-extra/src/browser/history/scm-history-widget.tsx index e6147f44db17a..5cc608f0e1128 100644 --- a/packages/scm-extra/src/browser/history/scm-history-widget.tsx +++ b/packages/scm-extra/src/browser/history/scm-history-widget.tsx @@ -21,7 +21,7 @@ import { CancellationTokenSource } from '@theia/core/lib/common/cancellation'; import { Message } from '@theia/core/shared/@phosphor/messaging'; import { AutoSizer, List, ListRowRenderer, ListRowProps, InfiniteLoader, IndexRange, ScrollParams, CellMeasurerCache, CellMeasurer } from '@theia/core/shared/react-virtualized'; import URI from '@theia/core/lib/common/uri'; -import { ScmHistoryProvider } from '.'; +import { ScmHistoryProvider } from './scm-history-provider'; import { SCM_HISTORY_ID, SCM_HISTORY_MAX_COUNT, SCM_HISTORY_LABEL } from './scm-history-contribution'; import { ScmHistoryCommit, ScmFileChange, ScmFileChangeNode } from '../scm-file-change-node'; import { ScmAvatarService } from '@theia/scm/lib/browser/scm-avatar-service'; diff --git a/packages/workspace/src/browser/workspace-trust-service.ts b/packages/workspace/src/browser/workspace-trust-service.ts index 9c513fe6186b3..5ea88f0b9243a 100644 --- a/packages/workspace/src/browser/workspace-trust-service.ts +++ b/packages/workspace/src/browser/workspace-trust-service.ts @@ -21,7 +21,7 @@ import { nls } from '@theia/core/lib/common/nls'; import { Deferred } from '@theia/core/lib/common/promise-util'; import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'; import { WindowService } from '@theia/core/lib/browser/window/window-service'; -import { WorkspaceService } from '.'; +import { WorkspaceService } from './workspace-service'; import { WorkspaceTrustPreferences, WORKSPACE_TRUST_EMPTY_WINDOW, WORKSPACE_TRUST_ENABLED, WORKSPACE_TRUST_STARTUP_PROMPT, WorkspaceTrustPrompt } from './workspace-trust-preferences';