diff --git a/src/vs/editor/contrib/bracketMatching/browser/bracketMatching.css b/src/vs/editor/contrib/bracketMatching/bracketMatching.css similarity index 100% rename from src/vs/editor/contrib/bracketMatching/browser/bracketMatching.css rename to src/vs/editor/contrib/bracketMatching/bracketMatching.css diff --git a/src/vs/editor/contrib/bracketMatching/common/bracketMatching.ts b/src/vs/editor/contrib/bracketMatching/bracketMatching.ts similarity index 99% rename from src/vs/editor/contrib/bracketMatching/common/bracketMatching.ts rename to src/vs/editor/contrib/bracketMatching/bracketMatching.ts index 4ed77f006ef..3e77e473193 100644 --- a/src/vs/editor/contrib/bracketMatching/common/bracketMatching.ts +++ b/src/vs/editor/contrib/bracketMatching/bracketMatching.ts @@ -5,6 +5,7 @@ 'use strict'; +import 'vs/css!./bracketMatching'; import * as nls from 'vs/nls'; import { KeyCode, KeyMod } from 'vs/base/common/keyCodes'; import { Disposable } from 'vs/base/common/lifecycle'; diff --git a/src/vs/editor/contrib/bracketMatching/test/bracketMatching.test.ts b/src/vs/editor/contrib/bracketMatching/test/bracketMatching.test.ts index 58cb2281fff..fc86a0c998b 100644 --- a/src/vs/editor/contrib/bracketMatching/test/bracketMatching.test.ts +++ b/src/vs/editor/contrib/bracketMatching/test/bracketMatching.test.ts @@ -11,7 +11,7 @@ import { Model } from 'vs/editor/common/model/model'; import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry'; import { MockMode } from 'vs/editor/test/common/mocks/mockMode'; import { LanguageIdentifier } from 'vs/editor/common/modes'; -import { BracketMatchingController } from 'vs/editor/contrib/bracketMatching/common/bracketMatching'; +import { BracketMatchingController } from 'vs/editor/contrib/bracketMatching/bracketMatching'; suite('bracket matching', () => { class BracketMode extends MockMode { diff --git a/src/vs/editor/contrib/caretOperations/common/caretOperations.ts b/src/vs/editor/contrib/caretOperations/caretOperations.ts similarity index 100% rename from src/vs/editor/contrib/caretOperations/common/caretOperations.ts rename to src/vs/editor/contrib/caretOperations/caretOperations.ts diff --git a/src/vs/editor/contrib/caretOperations/common/moveCaretCommand.ts b/src/vs/editor/contrib/caretOperations/moveCaretCommand.ts similarity index 100% rename from src/vs/editor/contrib/caretOperations/common/moveCaretCommand.ts rename to src/vs/editor/contrib/caretOperations/moveCaretCommand.ts diff --git a/src/vs/editor/contrib/caretOperations/test/moveCarretCommand.test.ts b/src/vs/editor/contrib/caretOperations/test/moveCarretCommand.test.ts index 07dd0e1aea0..38fc569bb45 100644 --- a/src/vs/editor/contrib/caretOperations/test/moveCarretCommand.test.ts +++ b/src/vs/editor/contrib/caretOperations/test/moveCarretCommand.test.ts @@ -5,7 +5,7 @@ 'use strict'; import { Selection } from 'vs/editor/common/core/selection'; -import { MoveCaretCommand } from 'vs/editor/contrib/caretOperations/common/moveCaretCommand'; +import { MoveCaretCommand } from 'vs/editor/contrib/caretOperations/moveCaretCommand'; import { testCommand } from 'vs/editor/test/browser/testCommand'; diff --git a/src/vs/editor/contrib/caretOperations/common/transpose.ts b/src/vs/editor/contrib/caretOperations/transpose.ts similarity index 100% rename from src/vs/editor/contrib/caretOperations/common/transpose.ts rename to src/vs/editor/contrib/caretOperations/transpose.ts diff --git a/src/vs/editor/contrib/clipboard/browser/clipboard.css b/src/vs/editor/contrib/clipboard/clipboard.css similarity index 100% rename from src/vs/editor/contrib/clipboard/browser/clipboard.css rename to src/vs/editor/contrib/clipboard/clipboard.css diff --git a/src/vs/editor/contrib/clipboard/browser/clipboard.ts b/src/vs/editor/contrib/clipboard/clipboard.ts similarity index 100% rename from src/vs/editor/contrib/clipboard/browser/clipboard.ts rename to src/vs/editor/contrib/clipboard/clipboard.ts diff --git a/src/vs/editor/contrib/codelens/browser/codelens.ts b/src/vs/editor/contrib/codelens/codelens.ts similarity index 100% rename from src/vs/editor/contrib/codelens/browser/codelens.ts rename to src/vs/editor/contrib/codelens/codelens.ts diff --git a/src/vs/editor/contrib/codelens/browser/codelensController.ts b/src/vs/editor/contrib/codelens/codelensController.ts similarity index 99% rename from src/vs/editor/contrib/codelens/browser/codelensController.ts rename to src/vs/editor/contrib/codelens/codelensController.ts index aa083f7f511..b34da43c6aa 100644 --- a/src/vs/editor/contrib/codelens/browser/codelensController.ts +++ b/src/vs/editor/contrib/codelens/codelensController.ts @@ -17,7 +17,7 @@ import * as editorBrowser from 'vs/editor/browser/editorBrowser'; import { registerEditorContribution } from 'vs/editor/browser/editorBrowserExtensions'; import { ICodeLensData, getCodeLensData } from './codelens'; import { IConfigurationChangedEvent } from 'vs/editor/common/config/editorOptions'; -import { CodeLens, CodeLensHelper } from 'vs/editor/contrib/codelens/browser/codelensWidget'; +import { CodeLens, CodeLensHelper } from 'vs/editor/contrib/codelens/codelensWidget'; export class CodeLensContribution implements editorCommon.IEditorContribution { diff --git a/src/vs/editor/contrib/codelens/browser/codelensWidget.css b/src/vs/editor/contrib/codelens/codelensWidget.css similarity index 100% rename from src/vs/editor/contrib/codelens/browser/codelensWidget.css rename to src/vs/editor/contrib/codelens/codelensWidget.css diff --git a/src/vs/editor/contrib/codelens/browser/codelensWidget.ts b/src/vs/editor/contrib/codelens/codelensWidget.ts similarity index 100% rename from src/vs/editor/contrib/codelens/browser/codelensWidget.ts rename to src/vs/editor/contrib/codelens/codelensWidget.ts diff --git a/src/vs/editor/contrib/colorPicker/common/color.ts b/src/vs/editor/contrib/colorPicker/color.ts similarity index 100% rename from src/vs/editor/contrib/colorPicker/common/color.ts rename to src/vs/editor/contrib/colorPicker/color.ts diff --git a/src/vs/editor/contrib/colorPicker/browser/colorDetector.ts b/src/vs/editor/contrib/colorPicker/colorDetector.ts similarity index 99% rename from src/vs/editor/contrib/colorPicker/browser/colorDetector.ts rename to src/vs/editor/contrib/colorPicker/colorDetector.ts index 0ef4dc01fef..d2c20585f12 100644 --- a/src/vs/editor/contrib/colorPicker/browser/colorDetector.ts +++ b/src/vs/editor/contrib/colorPicker/colorDetector.ts @@ -14,7 +14,7 @@ import { Range } from 'vs/editor/common/core/range'; import { Position } from 'vs/editor/common/core/position'; import { ColorProviderRegistry } from 'vs/editor/common/modes'; import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; -import { getColors, IColorData } from 'vs/editor/contrib/colorPicker/common/color'; +import { getColors, IColorData } from 'vs/editor/contrib/colorPicker/color'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; const MAX_DECORATORS = 500; diff --git a/src/vs/editor/contrib/colorPicker/browser/colorPicker.css b/src/vs/editor/contrib/colorPicker/colorPicker.css similarity index 100% rename from src/vs/editor/contrib/colorPicker/browser/colorPicker.css rename to src/vs/editor/contrib/colorPicker/colorPicker.css diff --git a/src/vs/editor/contrib/colorPicker/browser/colorPickerModel.ts b/src/vs/editor/contrib/colorPicker/colorPickerModel.ts similarity index 100% rename from src/vs/editor/contrib/colorPicker/browser/colorPickerModel.ts rename to src/vs/editor/contrib/colorPicker/colorPickerModel.ts diff --git a/src/vs/editor/contrib/colorPicker/browser/colorPickerWidget.ts b/src/vs/editor/contrib/colorPicker/colorPickerWidget.ts similarity index 99% rename from src/vs/editor/contrib/colorPicker/browser/colorPickerWidget.ts rename to src/vs/editor/contrib/colorPicker/colorPickerWidget.ts index 12e81fd7206..53fe9074f0e 100644 --- a/src/vs/editor/contrib/colorPicker/browser/colorPickerWidget.ts +++ b/src/vs/editor/contrib/colorPicker/colorPickerWidget.ts @@ -8,7 +8,7 @@ import Event, { Emitter } from 'vs/base/common/event'; import { Widget } from 'vs/base/browser/ui/widget'; import * as dom from 'vs/base/browser/dom'; import { onDidChangeZoomLevel } from 'vs/base/browser/browser'; -import { ColorPickerModel } from 'vs/editor/contrib/colorPicker/browser/colorPickerModel'; +import { ColorPickerModel } from 'vs/editor/contrib/colorPicker/colorPickerModel'; import { Disposable } from 'vs/base/common/lifecycle'; import { GlobalMouseMoveMonitor, IStandardMouseMoveEventData, standardMouseMoveMerger } from 'vs/base/browser/globalMouseMoveMonitor'; import { Color, RGBA, HSVA } from 'vs/base/common/color'; diff --git a/src/vs/editor/contrib/colorPicker/browser/images/opacity-background.png b/src/vs/editor/contrib/colorPicker/images/opacity-background.png similarity index 100% rename from src/vs/editor/contrib/colorPicker/browser/images/opacity-background.png rename to src/vs/editor/contrib/colorPicker/images/opacity-background.png diff --git a/src/vs/editor/contrib/comment/common/blockCommentCommand.ts b/src/vs/editor/contrib/comment/blockCommentCommand.ts similarity index 100% rename from src/vs/editor/contrib/comment/common/blockCommentCommand.ts rename to src/vs/editor/contrib/comment/blockCommentCommand.ts diff --git a/src/vs/editor/contrib/comment/common/comment.ts b/src/vs/editor/contrib/comment/comment.ts similarity index 100% rename from src/vs/editor/contrib/comment/common/comment.ts rename to src/vs/editor/contrib/comment/comment.ts diff --git a/src/vs/editor/contrib/comment/common/lineCommentCommand.ts b/src/vs/editor/contrib/comment/lineCommentCommand.ts similarity index 100% rename from src/vs/editor/contrib/comment/common/lineCommentCommand.ts rename to src/vs/editor/contrib/comment/lineCommentCommand.ts diff --git a/src/vs/editor/contrib/comment/test/blockCommentCommand.test.ts b/src/vs/editor/contrib/comment/test/blockCommentCommand.test.ts index 69ca982676d..75fb3824a5b 100644 --- a/src/vs/editor/contrib/comment/test/blockCommentCommand.test.ts +++ b/src/vs/editor/contrib/comment/test/blockCommentCommand.test.ts @@ -5,7 +5,7 @@ 'use strict'; import { Selection } from 'vs/editor/common/core/selection'; -import { BlockCommentCommand } from 'vs/editor/contrib/comment/common/blockCommentCommand'; +import { BlockCommentCommand } from 'vs/editor/contrib/comment/blockCommentCommand'; import { testCommand } from 'vs/editor/test/browser/testCommand'; import { CommentMode } from 'vs/editor/test/common/commentMode'; diff --git a/src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts b/src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts index 932d2918160..e1e61fa2262 100644 --- a/src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts +++ b/src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts @@ -6,7 +6,7 @@ import * as assert from 'assert'; import { Selection } from 'vs/editor/common/core/selection'; -import { ILinePreflightData, IPreflightData, ISimpleModel, LineCommentCommand, Type } from 'vs/editor/contrib/comment/common/lineCommentCommand'; +import { ILinePreflightData, IPreflightData, ISimpleModel, LineCommentCommand, Type } from 'vs/editor/contrib/comment/lineCommentCommand'; import { testCommand } from 'vs/editor/test/browser/testCommand'; import { CommentMode } from 'vs/editor/test/common/commentMode'; import * as modes from 'vs/editor/common/modes'; diff --git a/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts b/src/vs/editor/contrib/contextmenu/contextmenu.ts similarity index 100% rename from src/vs/editor/contrib/contextmenu/browser/contextmenu.ts rename to src/vs/editor/contrib/contextmenu/contextmenu.ts diff --git a/src/vs/editor/contrib/cursorUndo/browser/cursorUndo.ts b/src/vs/editor/contrib/cursorUndo/cursorUndo.ts similarity index 100% rename from src/vs/editor/contrib/cursorUndo/browser/cursorUndo.ts rename to src/vs/editor/contrib/cursorUndo/cursorUndo.ts diff --git a/src/vs/editor/contrib/dnd/browser/dnd.css b/src/vs/editor/contrib/dnd/dnd.css similarity index 100% rename from src/vs/editor/contrib/dnd/browser/dnd.css rename to src/vs/editor/contrib/dnd/dnd.css diff --git a/src/vs/editor/contrib/dnd/browser/dnd.ts b/src/vs/editor/contrib/dnd/dnd.ts similarity index 98% rename from src/vs/editor/contrib/dnd/browser/dnd.ts rename to src/vs/editor/contrib/dnd/dnd.ts index 2de65b6876e..662df29c1e0 100644 --- a/src/vs/editor/contrib/dnd/browser/dnd.ts +++ b/src/vs/editor/contrib/dnd/dnd.ts @@ -16,7 +16,7 @@ import * as editorCommon from 'vs/editor/common/editorCommon'; import { Position } from 'vs/editor/common/core/position'; import { Range } from 'vs/editor/common/core/range'; import { Selection } from 'vs/editor/common/core/selection'; -import { DragAndDropCommand } from '../common/dragAndDropCommand'; +import { DragAndDropCommand } from 'vs/editor/contrib/dnd/dragAndDropCommand'; import { ModelDecorationOptions } from 'vs/editor/common/model/textModelWithDecorations'; export class DragAndDropController implements editorCommon.IEditorContribution { diff --git a/src/vs/editor/contrib/dnd/common/dragAndDropCommand.ts b/src/vs/editor/contrib/dnd/dragAndDropCommand.ts similarity index 100% rename from src/vs/editor/contrib/dnd/common/dragAndDropCommand.ts rename to src/vs/editor/contrib/dnd/dragAndDropCommand.ts diff --git a/src/vs/editor/contrib/find/common/find.ts b/src/vs/editor/contrib/find/common/find.ts deleted file mode 100644 index 6d30b429a28..00000000000 --- a/src/vs/editor/contrib/find/common/find.ts +++ /dev/null @@ -1,25 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -'use strict'; - -import * as editorCommon from 'vs/editor/common/editorCommon'; - -export function getSelectionSearchString(editor: editorCommon.ICommonCodeEditor): string { - let selection = editor.getSelection(); - - // if selection spans multiple lines, default search string to empty - if (selection.startLineNumber === selection.endLineNumber) { - if (selection.isEmpty()) { - let wordAtPosition = editor.getModel().getWordAtPosition(selection.getStartPosition()); - if (wordAtPosition) { - return wordAtPosition.word; - } - } else { - return editor.getModel().getValueInRange(selection); - } - } - - return null; -} diff --git a/src/vs/editor/contrib/find/browser/find.ts b/src/vs/editor/contrib/find/find.ts similarity index 93% rename from src/vs/editor/contrib/find/browser/find.ts rename to src/vs/editor/contrib/find/find.ts index c3efbbfdff1..0927c819146 100644 --- a/src/vs/editor/contrib/find/browser/find.ts +++ b/src/vs/editor/contrib/find/find.ts @@ -9,9 +9,9 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { registerEditorContribution } from 'vs/editor/browser/editorBrowserExtensions'; -import { FindWidget, IFindController } from 'vs/editor/contrib/find/browser/findWidget'; -import { FindOptionsWidget } from 'vs/editor/contrib/find/browser/findOptionsWidget'; -import { CommonFindController, FindStartFocusAction, IFindStartOptions } from 'vs/editor/contrib/find/common/findController'; +import { FindWidget, IFindController } from 'vs/editor/contrib/find/findWidget'; +import { FindOptionsWidget } from 'vs/editor/contrib/find/findOptionsWidget'; +import { CommonFindController, FindStartFocusAction, IFindStartOptions } from 'vs/editor/contrib/find/findController'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { IStorageService } from 'vs/platform/storage/common/storage'; diff --git a/src/vs/editor/contrib/find/common/findController.ts b/src/vs/editor/contrib/find/findController.ts similarity index 96% rename from src/vs/editor/contrib/find/common/findController.ts rename to src/vs/editor/contrib/find/findController.ts index 8d8ba71c998..8be6a2feb25 100644 --- a/src/vs/editor/contrib/find/common/findController.ts +++ b/src/vs/editor/contrib/find/findController.ts @@ -12,13 +12,30 @@ import { ContextKeyExpr, RawContextKey, IContextKey, IContextKeyService } from ' import * as strings from 'vs/base/common/strings'; import * as editorCommon from 'vs/editor/common/editorCommon'; import { registerEditorAction, ServicesAccessor, EditorAction, EditorCommand, CommonEditorRegistry } from 'vs/editor/common/editorCommonExtensions'; -import { FIND_IDS, FindModelBoundToEditorModel, ToggleCaseSensitiveKeybinding, ToggleRegexKeybinding, ToggleWholeWordKeybinding, ToggleSearchScopeKeybinding, ShowPreviousFindTermKeybinding, ShowNextFindTermKeybinding } from 'vs/editor/contrib/find/common/findModel'; -import { FindReplaceState, FindReplaceStateChangedEvent, INewFindReplaceState } from 'vs/editor/contrib/find/common/findState'; -import { getSelectionSearchString } from 'vs/editor/contrib/find/common/find'; +import { FIND_IDS, FindModelBoundToEditorModel, ToggleCaseSensitiveKeybinding, ToggleRegexKeybinding, ToggleWholeWordKeybinding, ToggleSearchScopeKeybinding, ShowPreviousFindTermKeybinding, ShowNextFindTermKeybinding } from 'vs/editor/contrib/find/findModel'; +import { FindReplaceState, FindReplaceStateChangedEvent, INewFindReplaceState } from 'vs/editor/contrib/find/findState'; import { Delayer } from 'vs/base/common/async'; import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage'; +export function getSelectionSearchString(editor: editorCommon.ICommonCodeEditor): string { + let selection = editor.getSelection(); + + // if selection spans multiple lines, default search string to empty + if (selection.startLineNumber === selection.endLineNumber) { + if (selection.isEmpty()) { + let wordAtPosition = editor.getModel().getWordAtPosition(selection.getStartPosition()); + if (wordAtPosition) { + return wordAtPosition.word; + } + } else { + return editor.getModel().getValueInRange(selection); + } + } + + return null; +} + export const enum FindStartFocusAction { NoFocusChange, FocusFindInput, diff --git a/src/vs/editor/contrib/find/common/findDecorations.ts b/src/vs/editor/contrib/find/findDecorations.ts similarity index 100% rename from src/vs/editor/contrib/find/common/findDecorations.ts rename to src/vs/editor/contrib/find/findDecorations.ts diff --git a/src/vs/editor/contrib/find/common/findModel.ts b/src/vs/editor/contrib/find/findModel.ts similarity index 99% rename from src/vs/editor/contrib/find/common/findModel.ts rename to src/vs/editor/contrib/find/findModel.ts index 1536e8c9541..6cb17a2ce7c 100644 --- a/src/vs/editor/contrib/find/common/findModel.ts +++ b/src/vs/editor/contrib/find/findModel.ts @@ -6,7 +6,7 @@ import { RunOnceScheduler } from 'vs/base/common/async'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; -import { ReplacePattern, parseReplaceString } from 'vs/editor/contrib/find/common/replacePattern'; +import { ReplacePattern, parseReplaceString } from 'vs/editor/contrib/find/replacePattern'; import { ReplaceCommand, ReplaceCommandThatPreservesSelection } from 'vs/editor/common/commands/replaceCommand'; import { Position } from 'vs/editor/common/core/position'; import { Range } from 'vs/editor/common/core/range'; diff --git a/src/vs/editor/contrib/find/browser/findOptionsWidget.ts b/src/vs/editor/contrib/find/findOptionsWidget.ts similarity index 97% rename from src/vs/editor/contrib/find/browser/findOptionsWidget.ts rename to src/vs/editor/contrib/find/findOptionsWidget.ts index 8cc1a442e0e..50f9253c4bc 100644 --- a/src/vs/editor/contrib/find/browser/findOptionsWidget.ts +++ b/src/vs/editor/contrib/find/findOptionsWidget.ts @@ -9,8 +9,8 @@ import * as dom from 'vs/base/browser/dom'; import { Widget } from 'vs/base/browser/ui/widget'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference } from 'vs/editor/browser/editorBrowser'; -import { FIND_IDS } from 'vs/editor/contrib/find/common/findModel'; -import { FindReplaceState } from 'vs/editor/contrib/find/common/findState'; +import { FIND_IDS } from 'vs/editor/contrib/find/findModel'; +import { FindReplaceState } from 'vs/editor/contrib/find/findState'; import { CaseSensitiveCheckbox, WholeWordsCheckbox, RegexCheckbox } from 'vs/base/browser/ui/findinput/findInputCheckboxes'; import { RunOnceScheduler } from 'vs/base/common/async'; import { IThemeService, ITheme, registerThemingParticipant } from 'vs/platform/theme/common/themeService'; diff --git a/src/vs/editor/contrib/find/common/findState.ts b/src/vs/editor/contrib/find/findState.ts similarity index 100% rename from src/vs/editor/contrib/find/common/findState.ts rename to src/vs/editor/contrib/find/findState.ts diff --git a/src/vs/editor/contrib/find/browser/findWidget.css b/src/vs/editor/contrib/find/findWidget.css similarity index 100% rename from src/vs/editor/contrib/find/browser/findWidget.css rename to src/vs/editor/contrib/find/findWidget.css diff --git a/src/vs/editor/contrib/find/browser/findWidget.ts b/src/vs/editor/contrib/find/findWidget.ts similarity index 99% rename from src/vs/editor/contrib/find/browser/findWidget.ts rename to src/vs/editor/contrib/find/findWidget.ts index 77c25acb251..b1fd6b2c921 100644 --- a/src/vs/editor/contrib/find/browser/findWidget.ts +++ b/src/vs/editor/contrib/find/findWidget.ts @@ -21,11 +21,11 @@ import { Widget } from 'vs/base/browser/ui/widget'; import { Sash, IHorizontalSashLayoutProvider, ISashEvent, Orientation } from 'vs/base/browser/ui/sash/sash'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, IViewZone, OverlayWidgetPositionPreference } from 'vs/editor/browser/editorBrowser'; -import { FIND_IDS, MATCHES_LIMIT } from 'vs/editor/contrib/find/common/findModel'; -import { FindReplaceState, FindReplaceStateChangedEvent } from 'vs/editor/contrib/find/common/findState'; +import { FIND_IDS, MATCHES_LIMIT } from 'vs/editor/contrib/find/findModel'; +import { FindReplaceState, FindReplaceStateChangedEvent } from 'vs/editor/contrib/find/findState'; import { Range } from 'vs/editor/common/core/range'; import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; -import { CONTEXT_FIND_INPUT_FOCUSED } from 'vs/editor/contrib/find/common/findController'; +import { CONTEXT_FIND_INPUT_FOCUSED } from 'vs/editor/contrib/find/findController'; import { ITheme, registerThemingParticipant, IThemeService } from 'vs/platform/theme/common/themeService'; import { Color } from 'vs/base/common/color'; import { IConfigurationChangedEvent } from 'vs/editor/common/config/editorOptions'; diff --git a/src/vs/editor/contrib/find/browser/images/cancelSelectionFind-inverse.svg b/src/vs/editor/contrib/find/images/cancelSelectionFind-inverse.svg similarity index 100% rename from src/vs/editor/contrib/find/browser/images/cancelSelectionFind-inverse.svg rename to src/vs/editor/contrib/find/images/cancelSelectionFind-inverse.svg diff --git a/src/vs/editor/contrib/find/browser/images/cancelSelectionFind.svg b/src/vs/editor/contrib/find/images/cancelSelectionFind.svg similarity index 100% rename from src/vs/editor/contrib/find/browser/images/cancelSelectionFind.svg rename to src/vs/editor/contrib/find/images/cancelSelectionFind.svg diff --git a/src/vs/editor/contrib/find/browser/images/close-dark.svg b/src/vs/editor/contrib/find/images/close-dark.svg similarity index 100% rename from src/vs/editor/contrib/find/browser/images/close-dark.svg rename to src/vs/editor/contrib/find/images/close-dark.svg diff --git a/src/vs/editor/contrib/find/browser/images/close.svg b/src/vs/editor/contrib/find/images/close.svg similarity index 100% rename from src/vs/editor/contrib/find/browser/images/close.svg rename to src/vs/editor/contrib/find/images/close.svg diff --git a/src/vs/editor/contrib/find/browser/images/expando-collapsed-dark.svg b/src/vs/editor/contrib/find/images/expando-collapsed-dark.svg similarity index 100% rename from src/vs/editor/contrib/find/browser/images/expando-collapsed-dark.svg rename to src/vs/editor/contrib/find/images/expando-collapsed-dark.svg diff --git a/src/vs/editor/contrib/find/browser/images/expando-collapsed.svg b/src/vs/editor/contrib/find/images/expando-collapsed.svg similarity index 100% rename from src/vs/editor/contrib/find/browser/images/expando-collapsed.svg rename to src/vs/editor/contrib/find/images/expando-collapsed.svg diff --git a/src/vs/editor/contrib/find/browser/images/expando-expanded-dark.svg b/src/vs/editor/contrib/find/images/expando-expanded-dark.svg similarity index 100% rename from src/vs/editor/contrib/find/browser/images/expando-expanded-dark.svg rename to src/vs/editor/contrib/find/images/expando-expanded-dark.svg diff --git a/src/vs/editor/contrib/find/browser/images/expando-expanded.svg b/src/vs/editor/contrib/find/images/expando-expanded.svg similarity index 100% rename from src/vs/editor/contrib/find/browser/images/expando-expanded.svg rename to src/vs/editor/contrib/find/images/expando-expanded.svg diff --git a/src/vs/editor/contrib/find/browser/images/next-inverse.svg b/src/vs/editor/contrib/find/images/next-inverse.svg similarity index 100% rename from src/vs/editor/contrib/find/browser/images/next-inverse.svg rename to src/vs/editor/contrib/find/images/next-inverse.svg diff --git a/src/vs/editor/contrib/find/browser/images/next.svg b/src/vs/editor/contrib/find/images/next.svg similarity index 100% rename from src/vs/editor/contrib/find/browser/images/next.svg rename to src/vs/editor/contrib/find/images/next.svg diff --git a/src/vs/editor/contrib/find/browser/images/previous-inverse.svg b/src/vs/editor/contrib/find/images/previous-inverse.svg similarity index 100% rename from src/vs/editor/contrib/find/browser/images/previous-inverse.svg rename to src/vs/editor/contrib/find/images/previous-inverse.svg diff --git a/src/vs/editor/contrib/find/browser/images/previous.svg b/src/vs/editor/contrib/find/images/previous.svg similarity index 100% rename from src/vs/editor/contrib/find/browser/images/previous.svg rename to src/vs/editor/contrib/find/images/previous.svg diff --git a/src/vs/editor/contrib/find/browser/images/replace-all-inverse.svg b/src/vs/editor/contrib/find/images/replace-all-inverse.svg similarity index 100% rename from src/vs/editor/contrib/find/browser/images/replace-all-inverse.svg rename to src/vs/editor/contrib/find/images/replace-all-inverse.svg diff --git a/src/vs/editor/contrib/find/browser/images/replace-all.svg b/src/vs/editor/contrib/find/images/replace-all.svg similarity index 100% rename from src/vs/editor/contrib/find/browser/images/replace-all.svg rename to src/vs/editor/contrib/find/images/replace-all.svg diff --git a/src/vs/editor/contrib/find/browser/images/replace-inverse.svg b/src/vs/editor/contrib/find/images/replace-inverse.svg similarity index 100% rename from src/vs/editor/contrib/find/browser/images/replace-inverse.svg rename to src/vs/editor/contrib/find/images/replace-inverse.svg diff --git a/src/vs/editor/contrib/find/browser/images/replace.svg b/src/vs/editor/contrib/find/images/replace.svg similarity index 100% rename from src/vs/editor/contrib/find/browser/images/replace.svg rename to src/vs/editor/contrib/find/images/replace.svg diff --git a/src/vs/editor/contrib/find/common/replaceAllCommand.ts b/src/vs/editor/contrib/find/replaceAllCommand.ts similarity index 100% rename from src/vs/editor/contrib/find/common/replaceAllCommand.ts rename to src/vs/editor/contrib/find/replaceAllCommand.ts diff --git a/src/vs/editor/contrib/find/common/replacePattern.ts b/src/vs/editor/contrib/find/replacePattern.ts similarity index 100% rename from src/vs/editor/contrib/find/common/replacePattern.ts rename to src/vs/editor/contrib/find/replacePattern.ts diff --git a/src/vs/editor/contrib/find/browser/simpleFindWidget.css b/src/vs/editor/contrib/find/simpleFindWidget.css similarity index 100% rename from src/vs/editor/contrib/find/browser/simpleFindWidget.css rename to src/vs/editor/contrib/find/simpleFindWidget.css diff --git a/src/vs/editor/contrib/find/browser/simpleFindWidget.ts b/src/vs/editor/contrib/find/simpleFindWidget.ts similarity index 100% rename from src/vs/editor/contrib/find/browser/simpleFindWidget.ts rename to src/vs/editor/contrib/find/simpleFindWidget.ts diff --git a/src/vs/editor/contrib/find/test/find.test.ts b/src/vs/editor/contrib/find/test/find.test.ts index 0e55f535bdd..750bc7ece80 100644 --- a/src/vs/editor/contrib/find/test/find.test.ts +++ b/src/vs/editor/contrib/find/test/find.test.ts @@ -7,7 +7,7 @@ import * as assert from 'assert'; import { Position } from 'vs/editor/common/core/position'; import { Range } from 'vs/editor/common/core/range'; -import { getSelectionSearchString } from 'vs/editor/contrib/find/common/find'; +import { getSelectionSearchString } from 'vs/editor/contrib/find/findController'; import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor'; diff --git a/src/vs/editor/contrib/find/test/findController.test.ts b/src/vs/editor/contrib/find/test/findController.test.ts index 0c2c9f7da9b..054b83fe1c1 100644 --- a/src/vs/editor/contrib/find/test/findController.test.ts +++ b/src/vs/editor/contrib/find/test/findController.test.ts @@ -12,7 +12,7 @@ import { Position } from 'vs/editor/common/core/position'; import { Selection } from 'vs/editor/common/core/selection'; import { Range } from 'vs/editor/common/core/range'; import { ICommonCodeEditor } from 'vs/editor/common/editorCommon'; -import { CommonFindController, FindStartFocusAction, IFindStartOptions, NextMatchFindAction, StartFindAction } from 'vs/editor/contrib/find/common/findController'; +import { CommonFindController, FindStartFocusAction, IFindStartOptions, NextMatchFindAction, StartFindAction } from 'vs/editor/contrib/find/findController'; import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor'; import { HistoryNavigator } from 'vs/base/common/history'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; diff --git a/src/vs/editor/contrib/find/test/findModel.test.ts b/src/vs/editor/contrib/find/test/findModel.test.ts index b6ceed48437..f6b0aec8309 100644 --- a/src/vs/editor/contrib/find/test/findModel.test.ts +++ b/src/vs/editor/contrib/find/test/findModel.test.ts @@ -10,8 +10,8 @@ import { Position } from 'vs/editor/common/core/position'; import { Selection } from 'vs/editor/common/core/selection'; import { Range } from 'vs/editor/common/core/range'; import { ICommonCodeEditor } from 'vs/editor/common/editorCommon'; -import { FindModelBoundToEditorModel } from 'vs/editor/contrib/find/common/findModel'; -import { FindReplaceState } from 'vs/editor/contrib/find/common/findState'; +import { FindModelBoundToEditorModel } from 'vs/editor/contrib/find/findModel'; +import { FindReplaceState } from 'vs/editor/contrib/find/findState'; import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor'; import { CoreNavigationCommands } from 'vs/editor/common/controller/coreCommands'; diff --git a/src/vs/editor/contrib/find/test/replacePattern.test.ts b/src/vs/editor/contrib/find/test/replacePattern.test.ts index 63105b82438..187ed7e24ed 100644 --- a/src/vs/editor/contrib/find/test/replacePattern.test.ts +++ b/src/vs/editor/contrib/find/test/replacePattern.test.ts @@ -5,7 +5,7 @@ 'use strict'; import * as assert from 'assert'; -import { parseReplaceString, ReplacePattern, ReplacePiece } from 'vs/editor/contrib/find/common/replacePattern'; +import { parseReplaceString, ReplacePattern, ReplacePiece } from 'vs/editor/contrib/find/replacePattern'; suite('Replace Pattern test', () => { diff --git a/src/vs/editor/contrib/folding/browser/arrow-collapse-dark.svg b/src/vs/editor/contrib/folding/arrow-collapse-dark.svg similarity index 100% rename from src/vs/editor/contrib/folding/browser/arrow-collapse-dark.svg rename to src/vs/editor/contrib/folding/arrow-collapse-dark.svg diff --git a/src/vs/editor/contrib/folding/browser/arrow-collapse.svg b/src/vs/editor/contrib/folding/arrow-collapse.svg similarity index 100% rename from src/vs/editor/contrib/folding/browser/arrow-collapse.svg rename to src/vs/editor/contrib/folding/arrow-collapse.svg diff --git a/src/vs/editor/contrib/folding/browser/arrow-expand-dark.svg b/src/vs/editor/contrib/folding/arrow-expand-dark.svg similarity index 100% rename from src/vs/editor/contrib/folding/browser/arrow-expand-dark.svg rename to src/vs/editor/contrib/folding/arrow-expand-dark.svg diff --git a/src/vs/editor/contrib/folding/browser/arrow-expand.svg b/src/vs/editor/contrib/folding/arrow-expand.svg similarity index 100% rename from src/vs/editor/contrib/folding/browser/arrow-expand.svg rename to src/vs/editor/contrib/folding/arrow-expand.svg diff --git a/src/vs/editor/contrib/folding/browser/folding.css b/src/vs/editor/contrib/folding/folding.css similarity index 100% rename from src/vs/editor/contrib/folding/browser/folding.css rename to src/vs/editor/contrib/folding/folding.css diff --git a/src/vs/editor/contrib/folding/browser/folding.ts b/src/vs/editor/contrib/folding/folding.ts similarity index 99% rename from src/vs/editor/contrib/folding/browser/folding.ts rename to src/vs/editor/contrib/folding/folding.ts index 947637fbf19..a4b7abb2948 100644 --- a/src/vs/editor/contrib/folding/browser/folding.ts +++ b/src/vs/editor/contrib/folding/folding.ts @@ -17,12 +17,12 @@ import { ICommonCodeEditor, ScrollType, IModel } from 'vs/editor/common/editorCo import { registerEditorAction, ServicesAccessor, EditorAction, CommonEditorRegistry } from 'vs/editor/common/editorCommonExtensions'; import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser'; import { registerEditorContribution } from 'vs/editor/browser/editorBrowserExtensions'; -import { FoldingModel, setCollapseStateAtLevel, CollapseMemento, setCollapseStateLevelsDown, setCollapseStateLevelsUp } from 'vs/editor/contrib/folding/common/foldingModel'; +import { FoldingModel, setCollapseStateAtLevel, CollapseMemento, setCollapseStateLevelsDown, setCollapseStateLevelsUp } from 'vs/editor/contrib/folding/foldingModel'; import { FoldingDecorationProvider } from './foldingDecorations'; import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; import { IConfigurationChangedEvent } from 'vs/editor/common/config/editorOptions'; import { IMarginData } from 'vs/editor/browser/controller/mouseTarget'; -import { HiddenRangeModel } from 'vs/editor/contrib/folding/common/hiddenRangeModel'; +import { HiddenRangeModel } from 'vs/editor/contrib/folding/hiddenRangeModel'; import { IRange } from 'vs/editor/common/core/range'; export const ID = 'editor.contrib.folding'; diff --git a/src/vs/editor/contrib/folding/browser/foldingDecorations.ts b/src/vs/editor/contrib/folding/foldingDecorations.ts similarity index 97% rename from src/vs/editor/contrib/folding/browser/foldingDecorations.ts rename to src/vs/editor/contrib/folding/foldingDecorations.ts index df965777690..ac7fc7269db 100644 --- a/src/vs/editor/contrib/folding/browser/foldingDecorations.ts +++ b/src/vs/editor/contrib/folding/foldingDecorations.ts @@ -5,7 +5,7 @@ import { TrackedRangeStickiness } from 'vs/editor/common/editorCommon'; import { ModelDecorationOptions } from 'vs/editor/common/model/textModelWithDecorations'; -import { FoldingRegion, IDecorationProvider } from 'vs/editor/contrib/folding/common/foldingModel'; +import { FoldingRegion, IDecorationProvider } from 'vs/editor/contrib/folding/foldingModel'; export class FoldingDecorationProvider implements IDecorationProvider { diff --git a/src/vs/editor/contrib/folding/common/foldingModel.ts b/src/vs/editor/contrib/folding/foldingModel.ts similarity index 100% rename from src/vs/editor/contrib/folding/common/foldingModel.ts rename to src/vs/editor/contrib/folding/foldingModel.ts diff --git a/src/vs/editor/contrib/folding/common/hiddenRangeModel.ts b/src/vs/editor/contrib/folding/hiddenRangeModel.ts similarity index 99% rename from src/vs/editor/contrib/folding/common/hiddenRangeModel.ts rename to src/vs/editor/contrib/folding/hiddenRangeModel.ts index 0f8b93af245..a3bc8c50dde 100644 --- a/src/vs/editor/contrib/folding/common/hiddenRangeModel.ts +++ b/src/vs/editor/contrib/folding/hiddenRangeModel.ts @@ -5,7 +5,7 @@ import Event, { Emitter } from 'vs/base/common/event'; import { Range, IRange } from 'vs/editor/common/core/range'; -import { FoldingRegion, FoldingModel, CollapseMemento } from 'vs/editor/contrib/folding/common/foldingModel'; +import { FoldingRegion, FoldingModel, CollapseMemento } from 'vs/editor/contrib/folding/foldingModel'; import { IDisposable } from 'vs/base/common/lifecycle'; import { Selection } from 'vs/editor/common/core/selection'; import { findFirst } from 'vs/base/common/arrays'; diff --git a/src/vs/editor/contrib/folding/test/foldingModel.test.ts b/src/vs/editor/contrib/folding/test/foldingModel.test.ts index 6e49943a64d..bf9b5a1ed77 100644 --- a/src/vs/editor/contrib/folding/test/foldingModel.test.ts +++ b/src/vs/editor/contrib/folding/test/foldingModel.test.ts @@ -5,7 +5,7 @@ 'use strict'; import * as assert from 'assert'; -import { FoldingModel, FoldingRegion, setCollapseStateAtLevel, setCollapseStateLevelsDown, setCollapseStateLevelsUp } from 'vs/editor/contrib/folding/common/foldingModel'; +import { FoldingModel, FoldingRegion, setCollapseStateAtLevel, setCollapseStateLevelsDown, setCollapseStateLevelsUp } from 'vs/editor/contrib/folding/foldingModel'; import { Model } from 'vs/editor/common/model/model'; import { computeRanges } from 'vs/editor/common/model/indentRanges'; import { ModelDecorationOptions } from 'vs/editor/common/model/textModelWithDecorations'; diff --git a/src/vs/editor/contrib/folding/test/hiddenRangeModel.test.ts b/src/vs/editor/contrib/folding/test/hiddenRangeModel.test.ts index e8c0c409e75..570f30f66cc 100644 --- a/src/vs/editor/contrib/folding/test/hiddenRangeModel.test.ts +++ b/src/vs/editor/contrib/folding/test/hiddenRangeModel.test.ts @@ -5,11 +5,11 @@ 'use strict'; import * as assert from 'assert'; -import { FoldingModel } from 'vs/editor/contrib/folding/common/foldingModel'; +import { FoldingModel } from 'vs/editor/contrib/folding/foldingModel'; import { Model } from 'vs/editor/common/model/model'; import { computeRanges } from 'vs/editor/common/model/indentRanges'; import { TestDecorationProvider } from './foldingModel.test'; -import { HiddenRangeModel } from 'vs/editor/contrib/folding/common/hiddenRangeModel'; +import { HiddenRangeModel } from 'vs/editor/contrib/folding/hiddenRangeModel'; import { IRange } from 'vs/editor/common/core/range'; diff --git a/src/vs/editor/contrib/format/common/format.ts b/src/vs/editor/contrib/format/format.ts similarity index 100% rename from src/vs/editor/contrib/format/common/format.ts rename to src/vs/editor/contrib/format/format.ts diff --git a/src/vs/editor/contrib/format/browser/formatActions.ts b/src/vs/editor/contrib/format/formatActions.ts similarity index 98% rename from src/vs/editor/contrib/format/browser/formatActions.ts rename to src/vs/editor/contrib/format/formatActions.ts index 89b81dd736c..e9998db02e2 100644 --- a/src/vs/editor/contrib/format/browser/formatActions.ts +++ b/src/vs/editor/contrib/format/formatActions.ts @@ -13,8 +13,8 @@ import * as editorCommon from 'vs/editor/common/editorCommon'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; import { registerEditorAction, ServicesAccessor, EditorAction, registerCommonEditorContribution, IActionOptions } from 'vs/editor/common/editorCommonExtensions'; import { OnTypeFormattingEditProviderRegistry, DocumentRangeFormattingEditProviderRegistry } from 'vs/editor/common/modes'; -import { getOnTypeFormattingEdits, getDocumentFormattingEdits, getDocumentRangeFormattingEdits, NoProviderError } from '../common/format'; -import { EditOperationsCommand } from '../common/formatCommand'; +import { getOnTypeFormattingEdits, getDocumentFormattingEdits, getDocumentRangeFormattingEdits, NoProviderError } from 'vs/editor/contrib/format/format'; +import { EditOperationsCommand } from 'vs/editor/contrib/format/formatCommand'; import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService'; diff --git a/src/vs/editor/contrib/format/common/formatCommand.ts b/src/vs/editor/contrib/format/formatCommand.ts similarity index 100% rename from src/vs/editor/contrib/format/common/formatCommand.ts rename to src/vs/editor/contrib/format/formatCommand.ts diff --git a/src/vs/editor/contrib/format/test/formatCommand.test.ts b/src/vs/editor/contrib/format/test/formatCommand.test.ts index fdc91d2a567..b0a0a969c4b 100644 --- a/src/vs/editor/contrib/format/test/formatCommand.test.ts +++ b/src/vs/editor/contrib/format/test/formatCommand.test.ts @@ -9,7 +9,7 @@ import { Range } from 'vs/editor/common/core/range'; import { Selection } from 'vs/editor/common/core/selection'; import { ISingleEditOperation } from 'vs/editor/common/editorCommon'; import { Model } from 'vs/editor/common/model/model'; -import { EditOperationsCommand } from 'vs/editor/contrib/format/common/formatCommand'; +import { EditOperationsCommand } from 'vs/editor/contrib/format/formatCommand'; import { testCommand } from 'vs/editor/test/browser/testCommand'; function editOp(startLineNumber: number, startColumn: number, endLineNumber: number, endColumn: number, text: string[]): ISingleEditOperation { diff --git a/src/vs/editor/contrib/goToDeclaration/browser/clickLinkGesture.ts b/src/vs/editor/contrib/goToDeclaration/clickLinkGesture.ts similarity index 100% rename from src/vs/editor/contrib/goToDeclaration/browser/clickLinkGesture.ts rename to src/vs/editor/contrib/goToDeclaration/clickLinkGesture.ts diff --git a/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts b/src/vs/editor/contrib/goToDeclaration/goToDeclaration.ts similarity index 100% rename from src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts rename to src/vs/editor/contrib/goToDeclaration/goToDeclaration.ts diff --git a/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.ts b/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.ts similarity index 98% rename from src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.ts rename to src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.ts index 1057f4e065a..6adbca42175 100644 --- a/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands.ts +++ b/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.ts @@ -18,9 +18,9 @@ import * as editorCommon from 'vs/editor/common/editorCommon'; import { registerEditorAction, IActionOptions, ServicesAccessor, EditorAction } from 'vs/editor/common/editorCommonExtensions'; import { Location } from 'vs/editor/common/modes'; import { getDefinitionsAtPosition, getImplementationsAtPosition, getTypeDefinitionsAtPosition } from './goToDeclaration'; -import { ReferencesController } from 'vs/editor/contrib/referenceSearch/browser/referencesController'; -import { ReferencesModel } from 'vs/editor/contrib/referenceSearch/browser/referencesModel'; -import { PeekContext } from 'vs/editor/contrib/referenceSearch/browser/peekViewWidget'; +import { ReferencesController } from 'vs/editor/contrib/referenceSearch/referencesController'; +import { ReferencesModel } from 'vs/editor/contrib/referenceSearch/referencesModel'; +import { PeekContext } from 'vs/editor/contrib/referenceSearch/peekViewWidget'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; import { MessageController } from 'vs/editor/contrib/message/messageController'; import * as corePosition from 'vs/editor/common/core/position'; diff --git a/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.css b/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.css similarity index 100% rename from src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.css rename to src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.css diff --git a/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.ts b/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.ts similarity index 99% rename from src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.ts rename to src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.ts index 08512ece567..671cb56cf97 100644 --- a/src/vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse.ts +++ b/src/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.ts @@ -24,7 +24,7 @@ import { registerThemingParticipant } from 'vs/platform/theme/common/themeServic import { editorActiveLinkForeground } from 'vs/platform/theme/common/colorRegistry'; import { EditorState, CodeEditorStateFlag } from 'vs/editor/common/core/editorState'; import { DefinitionAction, DefinitionActionConfig } from './goToDeclarationCommands'; -import { ClickLinkGesture, ClickLinkMouseEvent, ClickLinkKeyboardEvent } from 'vs/editor/contrib/goToDeclaration/browser/clickLinkGesture'; +import { ClickLinkGesture, ClickLinkMouseEvent, ClickLinkKeyboardEvent } from 'vs/editor/contrib/goToDeclaration/clickLinkGesture'; class GotoDefinitionWithMouseEditorContribution implements editorCommon.IEditorContribution { diff --git a/src/vs/editor/contrib/gotoError/browser/gotoError.css b/src/vs/editor/contrib/gotoError/gotoError.css similarity index 100% rename from src/vs/editor/contrib/gotoError/browser/gotoError.css rename to src/vs/editor/contrib/gotoError/gotoError.css diff --git a/src/vs/editor/contrib/gotoError/browser/gotoError.ts b/src/vs/editor/contrib/gotoError/gotoError.ts similarity index 99% rename from src/vs/editor/contrib/gotoError/browser/gotoError.ts rename to src/vs/editor/contrib/gotoError/gotoError.ts index 75b861a9bc4..b3975ec2331 100644 --- a/src/vs/editor/contrib/gotoError/browser/gotoError.ts +++ b/src/vs/editor/contrib/gotoError/gotoError.ts @@ -22,7 +22,7 @@ import * as editorCommon from 'vs/editor/common/editorCommon'; import { registerEditorAction, ServicesAccessor, IActionOptions, EditorAction, EditorCommand, CommonEditorRegistry } from 'vs/editor/common/editorCommonExtensions'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { registerEditorContribution } from 'vs/editor/browser/editorBrowserExtensions'; -import { ZoneWidget } from 'vs/editor/contrib/zoneWidget/browser/zoneWidget'; +import { ZoneWidget } from 'vs/editor/contrib/zoneWidget/zoneWidget'; import { registerColor, oneOf } from 'vs/platform/theme/common/colorRegistry'; import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService'; import { Color } from 'vs/base/common/color'; diff --git a/src/vs/editor/contrib/hover/common/hover.ts b/src/vs/editor/contrib/hover/getHover.ts similarity index 100% rename from src/vs/editor/contrib/hover/common/hover.ts rename to src/vs/editor/contrib/hover/getHover.ts diff --git a/src/vs/editor/contrib/hover/browser/hover.css b/src/vs/editor/contrib/hover/hover.css similarity index 100% rename from src/vs/editor/contrib/hover/browser/hover.css rename to src/vs/editor/contrib/hover/hover.css diff --git a/src/vs/editor/contrib/hover/browser/hover.ts b/src/vs/editor/contrib/hover/hover.ts similarity index 98% rename from src/vs/editor/contrib/hover/browser/hover.ts rename to src/vs/editor/contrib/hover/hover.ts index 3afc9c579f0..9e994ddd66a 100644 --- a/src/vs/editor/contrib/hover/browser/hover.ts +++ b/src/vs/editor/contrib/hover/hover.ts @@ -23,7 +23,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { registerThemingParticipant } from 'vs/platform/theme/common/themeService'; import { editorHoverHighlight, editorHoverBackground, editorHoverBorder, textLinkForeground, textCodeBlockBackground } from 'vs/platform/theme/common/colorRegistry'; import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; -import { MarkdownRenderer } from 'vs/editor/contrib/markdown/browser/markdownRenderer'; +import { MarkdownRenderer } from 'vs/editor/contrib/markdown/markdownRenderer'; export class ModesHoverController implements editorCommon.IEditorContribution { diff --git a/src/vs/editor/contrib/hover/browser/hoverOperation.ts b/src/vs/editor/contrib/hover/hoverOperation.ts similarity index 100% rename from src/vs/editor/contrib/hover/browser/hoverOperation.ts rename to src/vs/editor/contrib/hover/hoverOperation.ts diff --git a/src/vs/editor/contrib/hover/browser/hoverWidgets.ts b/src/vs/editor/contrib/hover/hoverWidgets.ts similarity index 100% rename from src/vs/editor/contrib/hover/browser/hoverWidgets.ts rename to src/vs/editor/contrib/hover/hoverWidgets.ts diff --git a/src/vs/editor/contrib/hover/browser/modesContentHover.ts b/src/vs/editor/contrib/hover/modesContentHover.ts similarity index 97% rename from src/vs/editor/contrib/hover/browser/modesContentHover.ts rename to src/vs/editor/contrib/hover/modesContentHover.ts index d6dc2864e1e..9fe860b1722 100644 --- a/src/vs/editor/contrib/hover/browser/modesContentHover.ts +++ b/src/vs/editor/contrib/hover/modesContentHover.ts @@ -11,18 +11,18 @@ import { IRange, Range } from 'vs/editor/common/core/range'; import { Position } from 'vs/editor/common/core/position'; import { HoverProviderRegistry, Hover, IColor, DocumentColorProvider } from 'vs/editor/common/modes'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; -import { getHover } from '../common/hover'; +import { getHover } from 'vs/editor/contrib/hover/getHover'; import { HoverOperation, IHoverComputer } from './hoverOperation'; import { ContentHoverWidget } from './hoverWidgets'; import { IMarkdownString, MarkdownString, isEmptyMarkdownString, markedStringsEquals } from 'vs/base/common/htmlContent'; -import { MarkdownRenderer } from 'vs/editor/contrib/markdown/browser/markdownRenderer'; +import { MarkdownRenderer } from 'vs/editor/contrib/markdown/markdownRenderer'; import { ModelDecorationOptions } from 'vs/editor/common/model/textModelWithDecorations'; -import { ColorPickerModel } from 'vs/editor/contrib/colorPicker/browser/colorPickerModel'; -import { ColorPickerWidget } from 'vs/editor/contrib/colorPicker/browser/colorPickerWidget'; -import { ColorDetector } from 'vs/editor/contrib/colorPicker/browser/colorDetector'; +import { ColorPickerModel } from 'vs/editor/contrib/colorPicker/colorPickerModel'; +import { ColorPickerWidget } from 'vs/editor/contrib/colorPicker/colorPickerWidget'; +import { ColorDetector } from 'vs/editor/contrib/colorPicker/colorDetector'; import { Color, RGBA } from 'vs/base/common/color'; import { IDisposable, empty as EmptyDisposable, dispose, combinedDisposable } from 'vs/base/common/lifecycle'; -import { getColorPresentations } from 'vs/editor/contrib/colorPicker/common/color'; +import { getColorPresentations } from 'vs/editor/contrib/colorPicker/color'; const $ = dom.$; class ColorHover { diff --git a/src/vs/editor/contrib/hover/browser/modesGlyphHover.ts b/src/vs/editor/contrib/hover/modesGlyphHover.ts similarity index 98% rename from src/vs/editor/contrib/hover/browser/modesGlyphHover.ts rename to src/vs/editor/contrib/hover/modesGlyphHover.ts index 522abe7a08e..844310491da 100644 --- a/src/vs/editor/contrib/hover/browser/modesGlyphHover.ts +++ b/src/vs/editor/contrib/hover/modesGlyphHover.ts @@ -8,7 +8,7 @@ import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { HoverOperation, IHoverComputer } from './hoverOperation'; import { GlyphHoverWidget } from './hoverWidgets'; import { $ } from 'vs/base/browser/dom'; -import { MarkdownRenderer } from 'vs/editor/contrib/markdown/browser/markdownRenderer'; +import { MarkdownRenderer } from 'vs/editor/contrib/markdown/markdownRenderer'; import { IMarkdownString, isEmptyMarkdownString } from 'vs/base/common/htmlContent'; export interface IHoverMessage { diff --git a/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.ts b/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts similarity index 100% rename from src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.ts rename to src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts diff --git a/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplaceCommand.ts b/src/vs/editor/contrib/inPlaceReplace/inPlaceReplaceCommand.ts similarity index 100% rename from src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplaceCommand.ts rename to src/vs/editor/contrib/inPlaceReplace/inPlaceReplaceCommand.ts diff --git a/src/vs/editor/contrib/indentation/common/indentUtils.ts b/src/vs/editor/contrib/indentation/indentUtils.ts similarity index 100% rename from src/vs/editor/contrib/indentation/common/indentUtils.ts rename to src/vs/editor/contrib/indentation/indentUtils.ts diff --git a/src/vs/editor/contrib/indentation/common/indentation.ts b/src/vs/editor/contrib/indentation/indentation.ts similarity index 100% rename from src/vs/editor/contrib/indentation/common/indentation.ts rename to src/vs/editor/contrib/indentation/indentation.ts diff --git a/src/vs/editor/contrib/indentation/test/indentation.test.ts b/src/vs/editor/contrib/indentation/test/indentation.test.ts index ff1744739d3..1f2e9ff1577 100644 --- a/src/vs/editor/contrib/indentation/test/indentation.test.ts +++ b/src/vs/editor/contrib/indentation/test/indentation.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { Selection } from 'vs/editor/common/core/selection'; -import { IndentationToSpacesCommand, IndentationToTabsCommand } from 'vs/editor/contrib/indentation/common/indentation'; +import { IndentationToSpacesCommand, IndentationToTabsCommand } from 'vs/editor/contrib/indentation/indentation'; import { testCommand } from 'vs/editor/test/browser/testCommand'; function testIndentationToSpacesCommand(lines: string[], selection: Selection, tabSize: number, expectedLines: string[], expectedSelection: Selection): void { diff --git a/src/vs/editor/contrib/linesOperations/common/copyLinesCommand.ts b/src/vs/editor/contrib/linesOperations/copyLinesCommand.ts similarity index 100% rename from src/vs/editor/contrib/linesOperations/common/copyLinesCommand.ts rename to src/vs/editor/contrib/linesOperations/copyLinesCommand.ts diff --git a/src/vs/editor/contrib/linesOperations/common/deleteLinesCommand.ts b/src/vs/editor/contrib/linesOperations/deleteLinesCommand.ts similarity index 100% rename from src/vs/editor/contrib/linesOperations/common/deleteLinesCommand.ts rename to src/vs/editor/contrib/linesOperations/deleteLinesCommand.ts diff --git a/src/vs/editor/contrib/linesOperations/common/linesOperations.ts b/src/vs/editor/contrib/linesOperations/linesOperations.ts similarity index 99% rename from src/vs/editor/contrib/linesOperations/common/linesOperations.ts rename to src/vs/editor/contrib/linesOperations/linesOperations.ts index 85a6e38b1bf..9db391706aa 100644 --- a/src/vs/editor/contrib/linesOperations/common/linesOperations.ts +++ b/src/vs/editor/contrib/linesOperations/linesOperations.ts @@ -6,7 +6,7 @@ import * as nls from 'vs/nls'; import { KeyCode, KeyMod, KeyChord } from 'vs/base/common/keyCodes'; -import { SortLinesCommand } from 'vs/editor/contrib/linesOperations/common/sortLinesCommand'; +import { SortLinesCommand } from 'vs/editor/contrib/linesOperations/sortLinesCommand'; import { EditOperation } from 'vs/editor/common/core/editOperation'; import { TrimTrailingWhitespaceCommand } from 'vs/editor/common/commands/trimTrailingWhitespaceCommand'; import { ICommand, ICommonCodeEditor, IIdentifiedSingleEditOperation } from 'vs/editor/common/editorCommon'; diff --git a/src/vs/editor/contrib/linesOperations/common/moveLinesCommand.ts b/src/vs/editor/contrib/linesOperations/moveLinesCommand.ts similarity index 99% rename from src/vs/editor/contrib/linesOperations/common/moveLinesCommand.ts rename to src/vs/editor/contrib/linesOperations/moveLinesCommand.ts index fb56ba6da5f..8597c715724 100644 --- a/src/vs/editor/contrib/linesOperations/common/moveLinesCommand.ts +++ b/src/vs/editor/contrib/linesOperations/moveLinesCommand.ts @@ -10,7 +10,7 @@ import { Selection } from 'vs/editor/common/core/selection'; import { ICommand, ICursorStateComputerData, IEditOperationBuilder, ITokenizedModel } from 'vs/editor/common/editorCommon'; import { LanguageConfigurationRegistry, IIndentConverter } from 'vs/editor/common/modes/languageConfigurationRegistry'; import { ShiftCommand } from 'vs/editor/common/commands/shiftCommand'; -import * as IndentUtil from 'vs/editor/contrib/indentation/common/indentUtils'; +import * as IndentUtil from 'vs/editor/contrib/indentation/indentUtils'; import { IndentAction } from 'vs/editor/common/modes/languageConfiguration'; import { IndentConsts } from 'vs/editor/common/modes/supports/indentRules'; diff --git a/src/vs/editor/contrib/linesOperations/common/sortLinesCommand.ts b/src/vs/editor/contrib/linesOperations/sortLinesCommand.ts similarity index 100% rename from src/vs/editor/contrib/linesOperations/common/sortLinesCommand.ts rename to src/vs/editor/contrib/linesOperations/sortLinesCommand.ts diff --git a/src/vs/editor/contrib/linesOperations/test/copyLinesCommand.test.ts b/src/vs/editor/contrib/linesOperations/test/copyLinesCommand.test.ts index a2248d7ebe3..5d19d922f6a 100644 --- a/src/vs/editor/contrib/linesOperations/test/copyLinesCommand.test.ts +++ b/src/vs/editor/contrib/linesOperations/test/copyLinesCommand.test.ts @@ -5,7 +5,7 @@ 'use strict'; import { Selection } from 'vs/editor/common/core/selection'; -import { CopyLinesCommand } from 'vs/editor/contrib/linesOperations/common/copyLinesCommand'; +import { CopyLinesCommand } from 'vs/editor/contrib/linesOperations/copyLinesCommand'; import { testCommand } from 'vs/editor/test/browser/testCommand'; function testCopyLinesDownCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void { diff --git a/src/vs/editor/contrib/linesOperations/test/deleteLinesCommand.test.ts b/src/vs/editor/contrib/linesOperations/test/deleteLinesCommand.test.ts index 5aab33d1f37..a53b44b394c 100644 --- a/src/vs/editor/contrib/linesOperations/test/deleteLinesCommand.test.ts +++ b/src/vs/editor/contrib/linesOperations/test/deleteLinesCommand.test.ts @@ -5,7 +5,7 @@ 'use strict'; import { Selection } from 'vs/editor/common/core/selection'; -import { DeleteLinesCommand } from 'vs/editor/contrib/linesOperations/common/deleteLinesCommand'; +import { DeleteLinesCommand } from 'vs/editor/contrib/linesOperations/deleteLinesCommand'; import { testCommand } from 'vs/editor/test/browser/testCommand'; function testDeleteLinesCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void { diff --git a/src/vs/editor/contrib/linesOperations/test/linesOperations.test.ts b/src/vs/editor/contrib/linesOperations/test/linesOperations.test.ts index 7ef9e72ab3b..c20ab53465a 100644 --- a/src/vs/editor/contrib/linesOperations/test/linesOperations.test.ts +++ b/src/vs/editor/contrib/linesOperations/test/linesOperations.test.ts @@ -9,7 +9,7 @@ import { Selection } from 'vs/editor/common/core/selection'; import { Position } from 'vs/editor/common/core/position'; import { Handler, IModel, DefaultEndOfLine } from 'vs/editor/common/editorCommon'; import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor'; -import { DeleteAllLeftAction, JoinLinesAction, TransposeAction, UpperCaseAction, LowerCaseAction, DeleteAllRightAction, InsertLineBeforeAction, InsertLineAfterAction, IndentLinesAction } from 'vs/editor/contrib/linesOperations/common/linesOperations'; +import { DeleteAllLeftAction, JoinLinesAction, TransposeAction, UpperCaseAction, LowerCaseAction, DeleteAllRightAction, InsertLineBeforeAction, InsertLineAfterAction, IndentLinesAction } from 'vs/editor/contrib/linesOperations/linesOperations'; import { Cursor } from 'vs/editor/common/controller/cursor'; import { Model } from 'vs/editor/common/model/model'; import { CoreEditingCommands } from 'vs/editor/common/controller/coreCommands'; diff --git a/src/vs/editor/contrib/linesOperations/test/moveLinesCommand.test.ts b/src/vs/editor/contrib/linesOperations/test/moveLinesCommand.test.ts index 717213d1c4c..e117b39dc6a 100644 --- a/src/vs/editor/contrib/linesOperations/test/moveLinesCommand.test.ts +++ b/src/vs/editor/contrib/linesOperations/test/moveLinesCommand.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; import { Selection } from 'vs/editor/common/core/selection'; -import { MoveLinesCommand } from 'vs/editor/contrib/linesOperations/common/moveLinesCommand'; +import { MoveLinesCommand } from 'vs/editor/contrib/linesOperations/moveLinesCommand'; import { testCommand } from 'vs/editor/test/browser/testCommand'; import { MockMode } from 'vs/editor/test/common/mocks/mockMode'; import { LanguageIdentifier } from 'vs/editor/common/modes'; diff --git a/src/vs/editor/contrib/linesOperations/test/sortLinesCommand.test.ts b/src/vs/editor/contrib/linesOperations/test/sortLinesCommand.test.ts index b199c5b307f..118cc37ec03 100644 --- a/src/vs/editor/contrib/linesOperations/test/sortLinesCommand.test.ts +++ b/src/vs/editor/contrib/linesOperations/test/sortLinesCommand.test.ts @@ -5,7 +5,7 @@ 'use strict'; import { Selection } from 'vs/editor/common/core/selection'; -import { SortLinesCommand } from 'vs/editor/contrib/linesOperations/common/sortLinesCommand'; +import { SortLinesCommand } from 'vs/editor/contrib/linesOperations/sortLinesCommand'; import { testCommand } from 'vs/editor/test/browser/testCommand'; function testSortLinesAscendingCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void { diff --git a/src/vs/editor/contrib/links/common/links.ts b/src/vs/editor/contrib/links/getLinks.ts similarity index 100% rename from src/vs/editor/contrib/links/common/links.ts rename to src/vs/editor/contrib/links/getLinks.ts diff --git a/src/vs/editor/contrib/links/browser/links.css b/src/vs/editor/contrib/links/links.css similarity index 100% rename from src/vs/editor/contrib/links/browser/links.css rename to src/vs/editor/contrib/links/links.css diff --git a/src/vs/editor/contrib/links/browser/links.ts b/src/vs/editor/contrib/links/links.ts similarity index 98% rename from src/vs/editor/contrib/links/browser/links.ts rename to src/vs/editor/contrib/links/links.ts index 12cae82fadd..496b22c0f40 100644 --- a/src/vs/editor/contrib/links/browser/links.ts +++ b/src/vs/editor/contrib/links/links.ts @@ -17,14 +17,14 @@ import * as editorCommon from 'vs/editor/common/editorCommon'; import { registerEditorAction, ServicesAccessor, EditorAction } from 'vs/editor/common/editorCommonExtensions'; import { LinkProviderRegistry } from 'vs/editor/common/modes'; import { ICodeEditor, MouseTargetType } from 'vs/editor/browser/editorBrowser'; -import { getLinks, Link } from 'vs/editor/contrib/links/common/links'; +import { getLinks, Link } from 'vs/editor/contrib/links/getLinks'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { registerEditorContribution } from 'vs/editor/browser/editorBrowserExtensions'; import { registerThemingParticipant } from 'vs/platform/theme/common/themeService'; import { editorActiveLinkForeground } from 'vs/platform/theme/common/colorRegistry'; import { Position } from 'vs/editor/common/core/position'; import { ModelDecorationOptions } from 'vs/editor/common/model/textModelWithDecorations'; -import { ClickLinkGesture, ClickLinkMouseEvent, ClickLinkKeyboardEvent } from 'vs/editor/contrib/goToDeclaration/browser/clickLinkGesture'; +import { ClickLinkGesture, ClickLinkMouseEvent, ClickLinkKeyboardEvent } from 'vs/editor/contrib/goToDeclaration/clickLinkGesture'; import { MarkdownString } from 'vs/base/common/htmlContent'; const HOVER_MESSAGE_GENERAL_META = new MarkdownString().appendText( diff --git a/src/vs/editor/contrib/markdown/browser/markdownRenderer.ts b/src/vs/editor/contrib/markdown/markdownRenderer.ts similarity index 100% rename from src/vs/editor/contrib/markdown/browser/markdownRenderer.ts rename to src/vs/editor/contrib/markdown/markdownRenderer.ts diff --git a/src/vs/editor/contrib/multicursor/multicursor.ts b/src/vs/editor/contrib/multicursor/multicursor.ts index e04e227486c..a0913b61d2e 100644 --- a/src/vs/editor/contrib/multicursor/multicursor.ts +++ b/src/vs/editor/contrib/multicursor/multicursor.ts @@ -18,11 +18,11 @@ import { CursorMoveCommands } from 'vs/editor/common/controller/cursorMoveComman import { CursorState, RevealTarget } from 'vs/editor/common/controller/cursorCommon'; import { Constants } from 'vs/editor/common/core/uint'; import { DocumentHighlightProviderRegistry } from 'vs/editor/common/modes'; -import { CommonFindController } from 'vs/editor/contrib/find/common/findController'; +import { CommonFindController } from 'vs/editor/contrib/find/findController'; import { ModelDecorationOptions } from 'vs/editor/common/model/textModelWithDecorations'; import { overviewRulerSelectionHighlightForeground } from 'vs/platform/theme/common/colorRegistry'; import { themeColorFromId } from 'vs/platform/theme/common/themeService'; -import { INewFindReplaceState, FindOptionOverride } from 'vs/editor/contrib/find/common/findState'; +import { INewFindReplaceState, FindOptionOverride } from 'vs/editor/contrib/find/findState'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; export class InsertCursorAbove extends EditorAction { diff --git a/src/vs/editor/contrib/multicursor/test/multicursor.test.ts b/src/vs/editor/contrib/multicursor/test/multicursor.test.ts index 06fc574037e..3aac48899b2 100644 --- a/src/vs/editor/contrib/multicursor/test/multicursor.test.ts +++ b/src/vs/editor/contrib/multicursor/test/multicursor.test.ts @@ -12,7 +12,7 @@ import { InsertCursorAbove, InsertCursorBelow, MultiCursorSelectionController, S import { Handler, EndOfLineSequence } from 'vs/editor/common/editorCommon'; import { IStorageService } from 'vs/platform/storage/common/storage'; import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; -import { CommonFindController } from 'vs/editor/contrib/find/common/findController'; +import { CommonFindController } from 'vs/editor/contrib/find/findController'; suite('Multicursor', () => { diff --git a/src/vs/editor/contrib/parameterHints/browser/arrow-down-dark.svg b/src/vs/editor/contrib/parameterHints/arrow-down-dark.svg similarity index 100% rename from src/vs/editor/contrib/parameterHints/browser/arrow-down-dark.svg rename to src/vs/editor/contrib/parameterHints/arrow-down-dark.svg diff --git a/src/vs/editor/contrib/parameterHints/browser/arrow-down.svg b/src/vs/editor/contrib/parameterHints/arrow-down.svg similarity index 100% rename from src/vs/editor/contrib/parameterHints/browser/arrow-down.svg rename to src/vs/editor/contrib/parameterHints/arrow-down.svg diff --git a/src/vs/editor/contrib/parameterHints/browser/arrow-up-dark.svg b/src/vs/editor/contrib/parameterHints/arrow-up-dark.svg similarity index 100% rename from src/vs/editor/contrib/parameterHints/browser/arrow-up-dark.svg rename to src/vs/editor/contrib/parameterHints/arrow-up-dark.svg diff --git a/src/vs/editor/contrib/parameterHints/browser/arrow-up.svg b/src/vs/editor/contrib/parameterHints/arrow-up.svg similarity index 100% rename from src/vs/editor/contrib/parameterHints/browser/arrow-up.svg rename to src/vs/editor/contrib/parameterHints/arrow-up.svg diff --git a/src/vs/editor/contrib/parameterHints/browser/parameterHints.css b/src/vs/editor/contrib/parameterHints/parameterHints.css similarity index 100% rename from src/vs/editor/contrib/parameterHints/browser/parameterHints.css rename to src/vs/editor/contrib/parameterHints/parameterHints.css diff --git a/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts b/src/vs/editor/contrib/parameterHints/parameterHints.ts similarity index 98% rename from src/vs/editor/contrib/parameterHints/browser/parameterHints.ts rename to src/vs/editor/contrib/parameterHints/parameterHints.ts index 0fb49ad119a..5b980666013 100644 --- a/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts +++ b/src/vs/editor/contrib/parameterHints/parameterHints.ts @@ -15,7 +15,7 @@ import { registerEditorAction, ServicesAccessor, EditorAction, EditorCommand, Co import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { registerEditorContribution } from 'vs/editor/browser/editorBrowserExtensions'; import { ParameterHintsWidget } from './parameterHintsWidget'; -import { Context } from '../common/parameterHints'; +import { Context } from 'vs/editor/contrib/parameterHints/provideSignatureHelp'; class ParameterHintsController implements IEditorContribution { diff --git a/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts b/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts similarity index 98% rename from src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts rename to src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts index 2d022f949a3..8d53893ce1f 100644 --- a/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts +++ b/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts @@ -19,7 +19,7 @@ import Event, { Emitter, chain } from 'vs/base/common/event'; import { domEvent, stop } from 'vs/base/browser/event'; import { ICommonCodeEditor } from 'vs/editor/common/editorCommon'; import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; -import { Context, provideSignatureHelp } from '../common/parameterHints'; +import { Context, provideSignatureHelp } from 'vs/editor/contrib/parameterHints/provideSignatureHelp'; import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement'; import { CharacterSet } from 'vs/editor/common/core/characterClassifier'; import { IConfigurationChangedEvent } from 'vs/editor/common/config/editorOptions'; @@ -28,7 +28,7 @@ import { registerThemingParticipant, HIGH_CONTRAST } from 'vs/platform/theme/com import { editorHoverBackground, editorHoverBorder, textLinkForeground, textCodeBlockBackground } from 'vs/platform/theme/common/colorRegistry'; import { IOpenerService } from 'vs/platform/opener/common/opener'; import { IModeService } from 'vs/editor/common/services/modeService'; -import { MarkdownRenderer } from 'vs/editor/contrib/markdown/browser/markdownRenderer'; +import { MarkdownRenderer } from 'vs/editor/contrib/markdown/markdownRenderer'; const $ = dom.$; diff --git a/src/vs/editor/contrib/parameterHints/common/parameterHints.ts b/src/vs/editor/contrib/parameterHints/provideSignatureHelp.ts similarity index 100% rename from src/vs/editor/contrib/parameterHints/common/parameterHints.ts rename to src/vs/editor/contrib/parameterHints/provideSignatureHelp.ts diff --git a/src/vs/editor/contrib/quickFix/browser/lightBulbWidget.css b/src/vs/editor/contrib/quickFix/lightBulbWidget.css similarity index 100% rename from src/vs/editor/contrib/quickFix/browser/lightBulbWidget.css rename to src/vs/editor/contrib/quickFix/lightBulbWidget.css diff --git a/src/vs/editor/contrib/quickFix/browser/lightBulbWidget.ts b/src/vs/editor/contrib/quickFix/lightBulbWidget.ts similarity index 100% rename from src/vs/editor/contrib/quickFix/browser/lightBulbWidget.ts rename to src/vs/editor/contrib/quickFix/lightBulbWidget.ts diff --git a/src/vs/editor/contrib/quickFix/browser/lightbulb-dark.svg b/src/vs/editor/contrib/quickFix/lightbulb-dark.svg similarity index 100% rename from src/vs/editor/contrib/quickFix/browser/lightbulb-dark.svg rename to src/vs/editor/contrib/quickFix/lightbulb-dark.svg diff --git a/src/vs/editor/contrib/quickFix/browser/lightbulb.svg b/src/vs/editor/contrib/quickFix/lightbulb.svg similarity index 100% rename from src/vs/editor/contrib/quickFix/browser/lightbulb.svg rename to src/vs/editor/contrib/quickFix/lightbulb.svg diff --git a/src/vs/editor/contrib/quickFix/browser/quickFix.ts b/src/vs/editor/contrib/quickFix/quickFix.ts similarity index 100% rename from src/vs/editor/contrib/quickFix/browser/quickFix.ts rename to src/vs/editor/contrib/quickFix/quickFix.ts diff --git a/src/vs/editor/contrib/quickFix/browser/quickFixCommands.ts b/src/vs/editor/contrib/quickFix/quickFixCommands.ts similarity index 100% rename from src/vs/editor/contrib/quickFix/browser/quickFixCommands.ts rename to src/vs/editor/contrib/quickFix/quickFixCommands.ts diff --git a/src/vs/editor/contrib/quickFix/browser/quickFixModel.ts b/src/vs/editor/contrib/quickFix/quickFixModel.ts similarity index 100% rename from src/vs/editor/contrib/quickFix/browser/quickFixModel.ts rename to src/vs/editor/contrib/quickFix/quickFixModel.ts diff --git a/src/vs/editor/contrib/quickFix/browser/quickFixWidget.ts b/src/vs/editor/contrib/quickFix/quickFixWidget.ts similarity index 100% rename from src/vs/editor/contrib/quickFix/browser/quickFixWidget.ts rename to src/vs/editor/contrib/quickFix/quickFixWidget.ts diff --git a/src/vs/editor/contrib/quickFix/test/quickFixModel.test.ts b/src/vs/editor/contrib/quickFix/test/quickFixModel.test.ts index 69536a0dda9..308e6b3ed63 100644 --- a/src/vs/editor/contrib/quickFix/test/quickFixModel.test.ts +++ b/src/vs/editor/contrib/quickFix/test/quickFixModel.test.ts @@ -11,7 +11,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { Model } from 'vs/editor/common/model/model'; import { createTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor'; import { MarkerService } from 'vs/platform/markers/common/markerService'; -import { QuickFixOracle } from 'vs/editor/contrib/quickFix/browser/quickFixModel'; +import { QuickFixOracle } from 'vs/editor/contrib/quickFix/quickFixModel'; import { CodeActionProviderRegistry, LanguageIdentifier } from 'vs/editor/common/modes'; import { IDisposable } from 'vs/base/common/lifecycle'; import { Range } from 'vs/editor/common/core/range'; diff --git a/src/vs/editor/contrib/quickOpen/common/quickOpen.ts b/src/vs/editor/contrib/quickOpen/quickOpen.ts similarity index 100% rename from src/vs/editor/contrib/quickOpen/common/quickOpen.ts rename to src/vs/editor/contrib/quickOpen/quickOpen.ts diff --git a/src/vs/editor/contrib/referenceSearch/browser/media/close-inverse.svg b/src/vs/editor/contrib/referenceSearch/media/close-inverse.svg similarity index 100% rename from src/vs/editor/contrib/referenceSearch/browser/media/close-inverse.svg rename to src/vs/editor/contrib/referenceSearch/media/close-inverse.svg diff --git a/src/vs/editor/contrib/referenceSearch/browser/media/close.svg b/src/vs/editor/contrib/referenceSearch/media/close.svg similarity index 100% rename from src/vs/editor/contrib/referenceSearch/browser/media/close.svg rename to src/vs/editor/contrib/referenceSearch/media/close.svg diff --git a/src/vs/editor/contrib/referenceSearch/browser/media/peekViewWidget.css b/src/vs/editor/contrib/referenceSearch/media/peekViewWidget.css similarity index 100% rename from src/vs/editor/contrib/referenceSearch/browser/media/peekViewWidget.css rename to src/vs/editor/contrib/referenceSearch/media/peekViewWidget.css diff --git a/src/vs/editor/contrib/referenceSearch/browser/media/referencesWidget.css b/src/vs/editor/contrib/referenceSearch/media/referencesWidget.css similarity index 100% rename from src/vs/editor/contrib/referenceSearch/browser/media/referencesWidget.css rename to src/vs/editor/contrib/referenceSearch/media/referencesWidget.css diff --git a/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.ts b/src/vs/editor/contrib/referenceSearch/peekViewWidget.ts similarity index 99% rename from src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.ts rename to src/vs/editor/contrib/referenceSearch/peekViewWidget.ts index 09aab8dcdcd..09fa772ec81 100644 --- a/src/vs/editor/contrib/referenceSearch/browser/peekViewWidget.ts +++ b/src/vs/editor/contrib/referenceSearch/peekViewWidget.ts @@ -18,7 +18,7 @@ import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation import { ICommonCodeEditor } from 'vs/editor/common/editorCommon'; import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; -import { IOptions, ZoneWidget, IStyles } from 'vs/editor/contrib/zoneWidget/browser/zoneWidget'; +import { IOptions, ZoneWidget, IStyles } from 'vs/editor/contrib/zoneWidget/zoneWidget'; import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget'; import { ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey'; import { Color } from 'vs/base/common/color'; diff --git a/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.ts b/src/vs/editor/contrib/referenceSearch/referenceSearch.ts similarity index 100% rename from src/vs/editor/contrib/referenceSearch/browser/referenceSearch.ts rename to src/vs/editor/contrib/referenceSearch/referenceSearch.ts diff --git a/src/vs/editor/contrib/referenceSearch/browser/referencesController.ts b/src/vs/editor/contrib/referenceSearch/referencesController.ts similarity index 100% rename from src/vs/editor/contrib/referenceSearch/browser/referencesController.ts rename to src/vs/editor/contrib/referenceSearch/referencesController.ts diff --git a/src/vs/editor/contrib/referenceSearch/browser/referencesModel.ts b/src/vs/editor/contrib/referenceSearch/referencesModel.ts similarity index 100% rename from src/vs/editor/contrib/referenceSearch/browser/referencesModel.ts rename to src/vs/editor/contrib/referenceSearch/referencesModel.ts diff --git a/src/vs/editor/contrib/referenceSearch/browser/referencesWidget.ts b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts similarity index 100% rename from src/vs/editor/contrib/referenceSearch/browser/referencesWidget.ts rename to src/vs/editor/contrib/referenceSearch/referencesWidget.ts diff --git a/src/vs/editor/contrib/referenceSearch/test/referencesModel.test.ts b/src/vs/editor/contrib/referenceSearch/test/referencesModel.test.ts index 4474c25d4f2..ec10a2dd1c4 100644 --- a/src/vs/editor/contrib/referenceSearch/test/referencesModel.test.ts +++ b/src/vs/editor/contrib/referenceSearch/test/referencesModel.test.ts @@ -8,7 +8,7 @@ import * as assert from 'assert'; import URI from 'vs/base/common/uri'; import { Range } from 'vs/editor/common/core/range'; import { Position } from 'vs/editor/common/core/position'; -import { ReferencesModel } from 'vs/editor/contrib/referenceSearch/browser/referencesModel'; +import { ReferencesModel } from 'vs/editor/contrib/referenceSearch/referencesModel'; suite('references', function () { diff --git a/src/vs/editor/contrib/rename/browser/rename.ts b/src/vs/editor/contrib/rename/rename.ts similarity index 100% rename from src/vs/editor/contrib/rename/browser/rename.ts rename to src/vs/editor/contrib/rename/rename.ts diff --git a/src/vs/editor/contrib/rename/browser/renameInputField.css b/src/vs/editor/contrib/rename/renameInputField.css similarity index 100% rename from src/vs/editor/contrib/rename/browser/renameInputField.css rename to src/vs/editor/contrib/rename/renameInputField.css diff --git a/src/vs/editor/contrib/rename/browser/renameInputField.ts b/src/vs/editor/contrib/rename/renameInputField.ts similarity index 100% rename from src/vs/editor/contrib/rename/browser/renameInputField.ts rename to src/vs/editor/contrib/rename/renameInputField.ts diff --git a/src/vs/editor/contrib/smartSelect/common/smartSelect.ts b/src/vs/editor/contrib/smartSelect/smartSelect.ts similarity index 100% rename from src/vs/editor/contrib/smartSelect/common/smartSelect.ts rename to src/vs/editor/contrib/smartSelect/smartSelect.ts diff --git a/src/vs/editor/contrib/smartSelect/test/tokenSelectionSupport.test.ts b/src/vs/editor/contrib/smartSelect/test/tokenSelectionSupport.test.ts index 1daf34354e3..f646c429cb7 100644 --- a/src/vs/editor/contrib/smartSelect/test/tokenSelectionSupport.test.ts +++ b/src/vs/editor/contrib/smartSelect/test/tokenSelectionSupport.test.ts @@ -10,7 +10,7 @@ import { Range } from 'vs/editor/common/core/range'; import { Position } from 'vs/editor/common/core/position'; import { LanguageIdentifier } from 'vs/editor/common/modes'; import { IndentAction } from 'vs/editor/common/modes/languageConfiguration'; -import { TokenSelectionSupport } from 'vs/editor/contrib/smartSelect/common/tokenSelectionSupport'; +import { TokenSelectionSupport } from 'vs/editor/contrib/smartSelect/tokenSelectionSupport'; import { MockMode } from 'vs/editor/test/common/mocks/mockMode'; import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry'; import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl'; diff --git a/src/vs/editor/contrib/smartSelect/common/tokenSelectionSupport.ts b/src/vs/editor/contrib/smartSelect/tokenSelectionSupport.ts similarity index 100% rename from src/vs/editor/contrib/smartSelect/common/tokenSelectionSupport.ts rename to src/vs/editor/contrib/smartSelect/tokenSelectionSupport.ts diff --git a/src/vs/editor/contrib/smartSelect/common/tokenTree.ts b/src/vs/editor/contrib/smartSelect/tokenTree.ts similarity index 100% rename from src/vs/editor/contrib/smartSelect/common/tokenTree.ts rename to src/vs/editor/contrib/smartSelect/tokenTree.ts diff --git a/src/vs/editor/contrib/snippet/browser/snippet.md b/src/vs/editor/contrib/snippet/snippet.md similarity index 100% rename from src/vs/editor/contrib/snippet/browser/snippet.md rename to src/vs/editor/contrib/snippet/snippet.md diff --git a/src/vs/editor/contrib/snippet/browser/snippetController2.ts b/src/vs/editor/contrib/snippet/snippetController2.ts similarity index 98% rename from src/vs/editor/contrib/snippet/browser/snippetController2.ts rename to src/vs/editor/contrib/snippet/snippetController2.ts index 5c36d20df8d..72412ed46b5 100644 --- a/src/vs/editor/contrib/snippet/browser/snippetController2.ts +++ b/src/vs/editor/contrib/snippet/snippetController2.ts @@ -12,10 +12,10 @@ import { dispose, IDisposable } from 'vs/base/common/lifecycle'; import { SnippetSession } from './snippetSession'; import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; import { KeyCode, KeyMod } from 'vs/base/common/keyCodes'; -import { showSimpleSuggestions } from 'vs/editor/contrib/suggest/browser/suggest'; +import { showSimpleSuggestions } from 'vs/editor/contrib/suggest/suggest'; import { ISuggestion } from 'vs/editor/common/modes'; import { Selection } from 'vs/editor/common/core/selection'; -import { Choice } from 'vs/editor/contrib/snippet/browser/snippetParser'; +import { Choice } from 'vs/editor/contrib/snippet/snippetParser'; import { repeat } from 'vs/base/common/strings'; export class SnippetController2 { diff --git a/src/vs/editor/contrib/snippet/browser/snippetParser.ts b/src/vs/editor/contrib/snippet/snippetParser.ts similarity index 100% rename from src/vs/editor/contrib/snippet/browser/snippetParser.ts rename to src/vs/editor/contrib/snippet/snippetParser.ts diff --git a/src/vs/editor/contrib/snippet/browser/snippetSession.css b/src/vs/editor/contrib/snippet/snippetSession.css similarity index 100% rename from src/vs/editor/contrib/snippet/browser/snippetSession.css rename to src/vs/editor/contrib/snippet/snippetSession.css diff --git a/src/vs/editor/contrib/snippet/browser/snippetSession.ts b/src/vs/editor/contrib/snippet/snippetSession.ts similarity index 100% rename from src/vs/editor/contrib/snippet/browser/snippetSession.ts rename to src/vs/editor/contrib/snippet/snippetSession.ts diff --git a/src/vs/editor/contrib/snippet/browser/snippetVariables.ts b/src/vs/editor/contrib/snippet/snippetVariables.ts similarity index 99% rename from src/vs/editor/contrib/snippet/browser/snippetVariables.ts rename to src/vs/editor/contrib/snippet/snippetVariables.ts index 65e4f1d3324..d9b0703d07b 100644 --- a/src/vs/editor/contrib/snippet/browser/snippetVariables.ts +++ b/src/vs/editor/contrib/snippet/snippetVariables.ts @@ -8,7 +8,7 @@ import { basename, dirname } from 'vs/base/common/paths'; import { IModel } from 'vs/editor/common/editorCommon'; import { Selection } from 'vs/editor/common/core/selection'; -import { VariableResolver, Variable, Text } from 'vs/editor/contrib/snippet/browser/snippetParser'; +import { VariableResolver, Variable, Text } from 'vs/editor/contrib/snippet/snippetParser'; import { getLeadingWhitespace, commonPrefixLength } from 'vs/base/common/strings'; export class EditorSnippetVariableResolver implements VariableResolver { diff --git a/src/vs/editor/contrib/snippet/test/snippetController2.old.test.ts b/src/vs/editor/contrib/snippet/test/snippetController2.old.test.ts index 659d79504c7..06c5862972a 100644 --- a/src/vs/editor/contrib/snippet/test/snippetController2.old.test.ts +++ b/src/vs/editor/contrib/snippet/test/snippetController2.old.test.ts @@ -7,7 +7,7 @@ import * as assert from 'assert'; import { Position } from 'vs/editor/common/core/position'; import { Selection } from 'vs/editor/common/core/selection'; -import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2'; +import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2'; import { TestCodeEditor, withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor'; import { Cursor } from 'vs/editor/common/controller/cursor'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; diff --git a/src/vs/editor/contrib/snippet/test/snippetController2.test.ts b/src/vs/editor/contrib/snippet/test/snippetController2.test.ts index 33be2e031bb..7d0ee0ea371 100644 --- a/src/vs/editor/contrib/snippet/test/snippetController2.test.ts +++ b/src/vs/editor/contrib/snippet/test/snippetController2.test.ts @@ -6,7 +6,7 @@ import * as assert from 'assert'; import { Selection } from 'vs/editor/common/core/selection'; -import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2'; +import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2'; import { ICommonCodeEditor } from 'vs/editor/common/editorCommon'; import { createTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor'; import { Model } from 'vs/editor/common/model/model'; diff --git a/src/vs/editor/contrib/snippet/test/snippetParser.test.ts b/src/vs/editor/contrib/snippet/test/snippetParser.test.ts index 048cf326e93..0c2fd49ad80 100644 --- a/src/vs/editor/contrib/snippet/test/snippetParser.test.ts +++ b/src/vs/editor/contrib/snippet/test/snippetParser.test.ts @@ -5,7 +5,7 @@ 'use strict'; import * as assert from 'assert'; -import { Scanner, TokenType, SnippetParser, Text, Placeholder, Variable, Marker, TextmateSnippet, Choice, FormatString, Transform } from 'vs/editor/contrib/snippet/browser/snippetParser'; +import { Scanner, TokenType, SnippetParser, Text, Placeholder, Variable, Marker, TextmateSnippet, Choice, FormatString, Transform } from 'vs/editor/contrib/snippet/snippetParser'; suite('SnippetParser', () => { diff --git a/src/vs/editor/contrib/snippet/test/snippetSession.test.ts b/src/vs/editor/contrib/snippet/test/snippetSession.test.ts index 59f1c212945..a021c54f78e 100644 --- a/src/vs/editor/contrib/snippet/test/snippetSession.test.ts +++ b/src/vs/editor/contrib/snippet/test/snippetSession.test.ts @@ -8,7 +8,7 @@ import * as assert from 'assert'; import { Selection } from 'vs/editor/common/core/selection'; import { Range } from 'vs/editor/common/core/range'; import { IPosition, Position } from 'vs/editor/common/core/position'; -import { SnippetSession } from 'vs/editor/contrib/snippet/browser/snippetSession'; +import { SnippetSession } from 'vs/editor/contrib/snippet/snippetSession'; import { ICommonCodeEditor } from 'vs/editor/common/editorCommon'; import { createTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor'; import { Model } from 'vs/editor/common/model/model'; diff --git a/src/vs/editor/contrib/snippet/test/snippetVariables.test.ts b/src/vs/editor/contrib/snippet/test/snippetVariables.test.ts index 44259233ef8..991b5a97e28 100644 --- a/src/vs/editor/contrib/snippet/test/snippetVariables.test.ts +++ b/src/vs/editor/contrib/snippet/test/snippetVariables.test.ts @@ -8,8 +8,8 @@ import * as assert from 'assert'; import { isWindows } from 'vs/base/common/platform'; import URI from 'vs/base/common/uri'; import { Selection } from 'vs/editor/common/core/selection'; -import { EditorSnippetVariableResolver } from 'vs/editor/contrib/snippet/browser/snippetVariables'; -import { SnippetParser, Variable } from 'vs/editor/contrib/snippet/browser/snippetParser'; +import { EditorSnippetVariableResolver } from 'vs/editor/contrib/snippet/snippetVariables'; +import { SnippetParser, Variable } from 'vs/editor/contrib/snippet/snippetParser'; import { Model } from 'vs/editor/common/model/model'; suite('Snippet Variables Resolver', function () { diff --git a/src/vs/editor/contrib/suggest/browser/completionModel.ts b/src/vs/editor/contrib/suggest/completionModel.ts similarity index 100% rename from src/vs/editor/contrib/suggest/browser/completionModel.ts rename to src/vs/editor/contrib/suggest/completionModel.ts diff --git a/src/vs/editor/contrib/suggest/browser/media/Class_16x.svg b/src/vs/editor/contrib/suggest/media/Class_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Class_16x.svg rename to src/vs/editor/contrib/suggest/media/Class_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Class_inverse_16x.svg b/src/vs/editor/contrib/suggest/media/Class_inverse_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Class_inverse_16x.svg rename to src/vs/editor/contrib/suggest/media/Class_inverse_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/ColorPalette_16x.svg b/src/vs/editor/contrib/suggest/media/ColorPalette_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/ColorPalette_16x.svg rename to src/vs/editor/contrib/suggest/media/ColorPalette_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/ColorPalette_inverse_16x.svg b/src/vs/editor/contrib/suggest/media/ColorPalette_inverse_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/ColorPalette_inverse_16x.svg rename to src/vs/editor/contrib/suggest/media/ColorPalette_inverse_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Constant_16x.svg b/src/vs/editor/contrib/suggest/media/Constant_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Constant_16x.svg rename to src/vs/editor/contrib/suggest/media/Constant_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Constant_16x_inverse.svg b/src/vs/editor/contrib/suggest/media/Constant_16x_inverse.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Constant_16x_inverse.svg rename to src/vs/editor/contrib/suggest/media/Constant_16x_inverse.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Document_16x.svg b/src/vs/editor/contrib/suggest/media/Document_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Document_16x.svg rename to src/vs/editor/contrib/suggest/media/Document_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Document_inverse_16x.svg b/src/vs/editor/contrib/suggest/media/Document_inverse_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Document_inverse_16x.svg rename to src/vs/editor/contrib/suggest/media/Document_inverse_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/EnumItem_16x.svg b/src/vs/editor/contrib/suggest/media/EnumItem_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/EnumItem_16x.svg rename to src/vs/editor/contrib/suggest/media/EnumItem_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/EnumItem_inverse_16x.svg b/src/vs/editor/contrib/suggest/media/EnumItem_inverse_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/EnumItem_inverse_16x.svg rename to src/vs/editor/contrib/suggest/media/EnumItem_inverse_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Enumerator_16x.svg b/src/vs/editor/contrib/suggest/media/Enumerator_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Enumerator_16x.svg rename to src/vs/editor/contrib/suggest/media/Enumerator_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Enumerator_inverse_16x.svg b/src/vs/editor/contrib/suggest/media/Enumerator_inverse_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Enumerator_inverse_16x.svg rename to src/vs/editor/contrib/suggest/media/Enumerator_inverse_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Event_16x_vscode.svg b/src/vs/editor/contrib/suggest/media/Event_16x_vscode.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Event_16x_vscode.svg rename to src/vs/editor/contrib/suggest/media/Event_16x_vscode.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Event_16x_vscode_inverse.svg b/src/vs/editor/contrib/suggest/media/Event_16x_vscode_inverse.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Event_16x_vscode_inverse.svg rename to src/vs/editor/contrib/suggest/media/Event_16x_vscode_inverse.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Field_16x.svg b/src/vs/editor/contrib/suggest/media/Field_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Field_16x.svg rename to src/vs/editor/contrib/suggest/media/Field_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Field_inverse_16x.svg b/src/vs/editor/contrib/suggest/media/Field_inverse_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Field_inverse_16x.svg rename to src/vs/editor/contrib/suggest/media/Field_inverse_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Folder_16x.svg b/src/vs/editor/contrib/suggest/media/Folder_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Folder_16x.svg rename to src/vs/editor/contrib/suggest/media/Folder_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Folder_inverse_16x.svg b/src/vs/editor/contrib/suggest/media/Folder_inverse_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Folder_inverse_16x.svg rename to src/vs/editor/contrib/suggest/media/Folder_inverse_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/ImportFile_16x_vscode.svg b/src/vs/editor/contrib/suggest/media/ImportFile_16x_vscode.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/ImportFile_16x_vscode.svg rename to src/vs/editor/contrib/suggest/media/ImportFile_16x_vscode.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/ImportFile_16x_vscode_inverse.svg b/src/vs/editor/contrib/suggest/media/ImportFile_16x_vscode_inverse.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/ImportFile_16x_vscode_inverse.svg rename to src/vs/editor/contrib/suggest/media/ImportFile_16x_vscode_inverse.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/IntelliSenseKeyword_16x.svg b/src/vs/editor/contrib/suggest/media/IntelliSenseKeyword_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/IntelliSenseKeyword_16x.svg rename to src/vs/editor/contrib/suggest/media/IntelliSenseKeyword_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/IntelliSenseKeyword_inverse_16x.svg b/src/vs/editor/contrib/suggest/media/IntelliSenseKeyword_inverse_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/IntelliSenseKeyword_inverse_16x.svg rename to src/vs/editor/contrib/suggest/media/IntelliSenseKeyword_inverse_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Interface_16x.svg b/src/vs/editor/contrib/suggest/media/Interface_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Interface_16x.svg rename to src/vs/editor/contrib/suggest/media/Interface_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Interface_inverse_16x.svg b/src/vs/editor/contrib/suggest/media/Interface_inverse_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Interface_inverse_16x.svg rename to src/vs/editor/contrib/suggest/media/Interface_inverse_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/LocalVariable_16x_vscode.svg b/src/vs/editor/contrib/suggest/media/LocalVariable_16x_vscode.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/LocalVariable_16x_vscode.svg rename to src/vs/editor/contrib/suggest/media/LocalVariable_16x_vscode.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/LocalVariable_16x_vscode_inverse.svg b/src/vs/editor/contrib/suggest/media/LocalVariable_16x_vscode_inverse.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/LocalVariable_16x_vscode_inverse.svg rename to src/vs/editor/contrib/suggest/media/LocalVariable_16x_vscode_inverse.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Method_16x.svg b/src/vs/editor/contrib/suggest/media/Method_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Method_16x.svg rename to src/vs/editor/contrib/suggest/media/Method_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Method_inverse_16x.svg b/src/vs/editor/contrib/suggest/media/Method_inverse_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Method_inverse_16x.svg rename to src/vs/editor/contrib/suggest/media/Method_inverse_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Misc_16x.svg b/src/vs/editor/contrib/suggest/media/Misc_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Misc_16x.svg rename to src/vs/editor/contrib/suggest/media/Misc_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Misc_inverse_16x.svg b/src/vs/editor/contrib/suggest/media/Misc_inverse_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Misc_inverse_16x.svg rename to src/vs/editor/contrib/suggest/media/Misc_inverse_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Namespace_16x.svg b/src/vs/editor/contrib/suggest/media/Namespace_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Namespace_16x.svg rename to src/vs/editor/contrib/suggest/media/Namespace_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Namespace_inverse_16x.svg b/src/vs/editor/contrib/suggest/media/Namespace_inverse_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Namespace_inverse_16x.svg rename to src/vs/editor/contrib/suggest/media/Namespace_inverse_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Operator_16x_vscode.svg b/src/vs/editor/contrib/suggest/media/Operator_16x_vscode.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Operator_16x_vscode.svg rename to src/vs/editor/contrib/suggest/media/Operator_16x_vscode.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Operator_16x_vscode_inverse.svg b/src/vs/editor/contrib/suggest/media/Operator_16x_vscode_inverse.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Operator_16x_vscode_inverse.svg rename to src/vs/editor/contrib/suggest/media/Operator_16x_vscode_inverse.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Property_16x.svg b/src/vs/editor/contrib/suggest/media/Property_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Property_16x.svg rename to src/vs/editor/contrib/suggest/media/Property_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Property_inverse_16x.svg b/src/vs/editor/contrib/suggest/media/Property_inverse_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Property_inverse_16x.svg rename to src/vs/editor/contrib/suggest/media/Property_inverse_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Ruler_16x.svg b/src/vs/editor/contrib/suggest/media/Ruler_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Ruler_16x.svg rename to src/vs/editor/contrib/suggest/media/Ruler_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Ruler_inverse_16x.svg b/src/vs/editor/contrib/suggest/media/Ruler_inverse_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Ruler_inverse_16x.svg rename to src/vs/editor/contrib/suggest/media/Ruler_inverse_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Snippet_16x.svg b/src/vs/editor/contrib/suggest/media/Snippet_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Snippet_16x.svg rename to src/vs/editor/contrib/suggest/media/Snippet_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Snippet_inverse_16x.svg b/src/vs/editor/contrib/suggest/media/Snippet_inverse_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Snippet_inverse_16x.svg rename to src/vs/editor/contrib/suggest/media/Snippet_inverse_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/String_16x.svg b/src/vs/editor/contrib/suggest/media/String_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/String_16x.svg rename to src/vs/editor/contrib/suggest/media/String_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/String_inverse_16x.svg b/src/vs/editor/contrib/suggest/media/String_inverse_16x.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/String_inverse_16x.svg rename to src/vs/editor/contrib/suggest/media/String_inverse_16x.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Structure_16x_vscode.svg b/src/vs/editor/contrib/suggest/media/Structure_16x_vscode.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Structure_16x_vscode.svg rename to src/vs/editor/contrib/suggest/media/Structure_16x_vscode.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Structure_16x_vscode_inverse.svg b/src/vs/editor/contrib/suggest/media/Structure_16x_vscode_inverse.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Structure_16x_vscode_inverse.svg rename to src/vs/editor/contrib/suggest/media/Structure_16x_vscode_inverse.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Template_16x_vscode.svg b/src/vs/editor/contrib/suggest/media/Template_16x_vscode.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Template_16x_vscode.svg rename to src/vs/editor/contrib/suggest/media/Template_16x_vscode.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/Template_16x_vscode_inverse.svg b/src/vs/editor/contrib/suggest/media/Template_16x_vscode_inverse.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/Template_16x_vscode_inverse.svg rename to src/vs/editor/contrib/suggest/media/Template_16x_vscode_inverse.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/close-dark.svg b/src/vs/editor/contrib/suggest/media/close-dark.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/close-dark.svg rename to src/vs/editor/contrib/suggest/media/close-dark.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/close.svg b/src/vs/editor/contrib/suggest/media/close.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/close.svg rename to src/vs/editor/contrib/suggest/media/close.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/info.svg b/src/vs/editor/contrib/suggest/media/info.svg similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/info.svg rename to src/vs/editor/contrib/suggest/media/info.svg diff --git a/src/vs/editor/contrib/suggest/browser/media/suggest.css b/src/vs/editor/contrib/suggest/media/suggest.css similarity index 100% rename from src/vs/editor/contrib/suggest/browser/media/suggest.css rename to src/vs/editor/contrib/suggest/media/suggest.css diff --git a/src/vs/editor/contrib/suggest/browser/suggest.ts b/src/vs/editor/contrib/suggest/suggest.ts similarity index 100% rename from src/vs/editor/contrib/suggest/browser/suggest.ts rename to src/vs/editor/contrib/suggest/suggest.ts diff --git a/src/vs/editor/contrib/suggest/browser/suggestController.ts b/src/vs/editor/contrib/suggest/suggestController.ts similarity index 98% rename from src/vs/editor/contrib/suggest/browser/suggestController.ts rename to src/vs/editor/contrib/suggest/suggestController.ts index 202e87f8a38..9e4c2752c2f 100644 --- a/src/vs/editor/contrib/suggest/browser/suggestController.ts +++ b/src/vs/editor/contrib/suggest/suggestController.ts @@ -22,8 +22,8 @@ import { registerEditorContribution } from 'vs/editor/browser/editorBrowserExten import { EditOperation } from 'vs/editor/common/core/editOperation'; import { Range } from 'vs/editor/common/core/range'; import { ISuggestSupport } from 'vs/editor/common/modes'; -import { SnippetParser } from 'vs/editor/contrib/snippet/browser/snippetParser'; -import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2'; +import { SnippetParser } from 'vs/editor/contrib/snippet/snippetParser'; +import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2'; import { Context as SuggestContext } from './suggest'; import { SuggestModel, State } from './suggestModel'; import { ICompletionItem } from './completionModel'; diff --git a/src/vs/editor/contrib/suggest/browser/suggestModel.ts b/src/vs/editor/contrib/suggest/suggestModel.ts similarity index 100% rename from src/vs/editor/contrib/suggest/browser/suggestModel.ts rename to src/vs/editor/contrib/suggest/suggestModel.ts diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts b/src/vs/editor/contrib/suggest/suggestWidget.ts similarity index 99% rename from src/vs/editor/contrib/suggest/browser/suggestWidget.ts rename to src/vs/editor/contrib/suggest/suggestWidget.ts index aa88e693c8c..6f3e556957a 100644 --- a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts +++ b/src/vs/editor/contrib/suggest/suggestWidget.ts @@ -30,7 +30,7 @@ import { attachListStyler } from 'vs/platform/theme/common/styler'; import { IThemeService, ITheme, registerThemingParticipant } from 'vs/platform/theme/common/themeService'; import { registerColor, editorWidgetBackground, listFocusBackground, activeContrastBorder, listHighlightForeground, editorForeground, editorWidgetBorder, focusBorder, textLinkForeground, textCodeBlockBackground } from 'vs/platform/theme/common/colorRegistry'; import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage'; -import { MarkdownRenderer } from 'vs/editor/contrib/markdown/browser/markdownRenderer'; +import { MarkdownRenderer } from 'vs/editor/contrib/markdown/markdownRenderer'; import { IModeService } from 'vs/editor/common/services/modeService'; import { IOpenerService } from 'vs/platform/opener/common/opener'; diff --git a/src/vs/editor/contrib/suggest/test/completionModel.test.ts b/src/vs/editor/contrib/suggest/test/completionModel.test.ts index 1785a8cbfa5..ac54e0244bc 100644 --- a/src/vs/editor/contrib/suggest/test/completionModel.test.ts +++ b/src/vs/editor/contrib/suggest/test/completionModel.test.ts @@ -6,8 +6,8 @@ import * as assert from 'assert'; import { ISuggestion, ISuggestResult, ISuggestSupport, SuggestionType } from 'vs/editor/common/modes'; -import { ISuggestionItem, getSuggestionComparator } from 'vs/editor/contrib/suggest/browser/suggest'; -import { CompletionModel } from 'vs/editor/contrib/suggest/browser/completionModel'; +import { ISuggestionItem, getSuggestionComparator } from 'vs/editor/contrib/suggest/suggest'; +import { CompletionModel } from 'vs/editor/contrib/suggest/completionModel'; import { IPosition } from 'vs/editor/common/core/position'; import { TPromise } from 'vs/base/common/winjs.base'; diff --git a/src/vs/editor/contrib/suggest/test/suggest.test.ts b/src/vs/editor/contrib/suggest/test/suggest.test.ts index 88dee0e561c..474c634583f 100644 --- a/src/vs/editor/contrib/suggest/test/suggest.test.ts +++ b/src/vs/editor/contrib/suggest/test/suggest.test.ts @@ -8,7 +8,7 @@ import * as assert from 'assert'; import URI from 'vs/base/common/uri'; import { IDisposable } from 'vs/base/common/lifecycle'; import { SuggestRegistry } from 'vs/editor/common/modes'; -import { provideSuggestionItems } from 'vs/editor/contrib/suggest/browser/suggest'; +import { provideSuggestionItems } from 'vs/editor/contrib/suggest/suggest'; import { Position } from 'vs/editor/common/core/position'; import { Model } from 'vs/editor/common/model/model'; diff --git a/src/vs/editor/contrib/suggest/test/suggestModel.test.ts b/src/vs/editor/contrib/suggest/test/suggestModel.test.ts index 77f5fda5725..f65d8440173 100644 --- a/src/vs/editor/contrib/suggest/test/suggestModel.test.ts +++ b/src/vs/editor/contrib/suggest/test/suggestModel.test.ts @@ -12,7 +12,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { Model } from 'vs/editor/common/model/model'; import { ICommonCodeEditor, Handler } from 'vs/editor/common/editorCommon'; import { ISuggestSupport, ISuggestResult, SuggestRegistry, SuggestTriggerKind } from 'vs/editor/common/modes'; -import { SuggestModel, LineContext } from 'vs/editor/contrib/suggest/browser/suggestModel'; +import { SuggestModel, LineContext } from 'vs/editor/contrib/suggest/suggestModel'; import { TestCodeEditor, MockScopeLocation } from 'vs/editor/test/browser/testCodeEditor'; import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService'; diff --git a/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.ts b/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.ts similarity index 100% rename from src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.ts rename to src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.ts diff --git a/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts b/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts similarity index 100% rename from src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts rename to src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts diff --git a/src/vs/editor/contrib/wordOperations/test/wordOperations.test.ts b/src/vs/editor/contrib/wordOperations/test/wordOperations.test.ts index a3a5a4b34ef..7c5e6b99102 100644 --- a/src/vs/editor/contrib/wordOperations/test/wordOperations.test.ts +++ b/src/vs/editor/contrib/wordOperations/test/wordOperations.test.ts @@ -16,7 +16,7 @@ import { CursorWordStartRightSelect, CursorWordEndRightSelect, CursorWordRightSelect, DeleteWordLeft, DeleteWordStartLeft, DeleteWordEndLeft, DeleteWordRight, DeleteWordStartRight, DeleteWordEndRight -} from 'vs/editor/contrib/wordOperations/common/wordOperations'; +} from 'vs/editor/contrib/wordOperations/wordOperations'; import { EditorCommand } from 'vs/editor/common/editorCommonExtensions'; suite('WordOperations', () => { diff --git a/src/vs/editor/contrib/wordOperations/common/wordOperations.ts b/src/vs/editor/contrib/wordOperations/wordOperations.ts similarity index 100% rename from src/vs/editor/contrib/wordOperations/common/wordOperations.ts rename to src/vs/editor/contrib/wordOperations/wordOperations.ts diff --git a/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.css b/src/vs/editor/contrib/zoneWidget/zoneWidget.css similarity index 100% rename from src/vs/editor/contrib/zoneWidget/browser/zoneWidget.css rename to src/vs/editor/contrib/zoneWidget/zoneWidget.css diff --git a/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts b/src/vs/editor/contrib/zoneWidget/zoneWidget.ts similarity index 100% rename from src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts rename to src/vs/editor/contrib/zoneWidget/zoneWidget.ts diff --git a/src/vs/editor/editor.all.ts b/src/vs/editor/editor.all.ts index 0d260d2b283..094db4a748d 100644 --- a/src/vs/editor/editor.all.ts +++ b/src/vs/editor/editor.all.ts @@ -10,35 +10,34 @@ import 'vs/editor/browser/widget/codeEditorWidget'; import 'vs/editor/browser/widget/diffEditorWidget'; import 'vs/editor/browser/widget/diffNavigator'; -import 'vs/editor/contrib/bracketMatching/common/bracketMatching'; -import 'vs/css!vs/editor/contrib/bracketMatching/browser/bracketMatching'; -import 'vs/editor/contrib/caretOperations/common/caretOperations'; -import 'vs/editor/contrib/caretOperations/common/transpose'; -import 'vs/editor/contrib/clipboard/browser/clipboard'; -import 'vs/editor/contrib/codelens/browser/codelensController'; -import 'vs/editor/contrib/comment/common/comment'; -import 'vs/editor/contrib/contextmenu/browser/contextmenu'; -import 'vs/editor/contrib/cursorUndo/browser/cursorUndo'; -import 'vs/editor/contrib/dnd/browser/dnd'; -import 'vs/editor/contrib/find/browser/find'; -import 'vs/editor/contrib/folding/browser/folding'; -import 'vs/editor/contrib/format/browser/formatActions'; -import 'vs/editor/contrib/goToDeclaration/browser/goToDeclarationCommands'; -import 'vs/editor/contrib/goToDeclaration/browser/goToDeclarationMouse'; -import 'vs/editor/contrib/gotoError/browser/gotoError'; -import 'vs/editor/contrib/hover/browser/hover'; -import 'vs/editor/contrib/inPlaceReplace/common/inPlaceReplace'; -import 'vs/editor/contrib/linesOperations/common/linesOperations'; -import 'vs/editor/contrib/links/browser/links'; +import 'vs/editor/contrib/bracketMatching/bracketMatching'; +import 'vs/editor/contrib/caretOperations/caretOperations'; +import 'vs/editor/contrib/caretOperations/transpose'; +import 'vs/editor/contrib/clipboard/clipboard'; +import 'vs/editor/contrib/codelens/codelensController'; +import 'vs/editor/contrib/colorPicker/colorDetector'; +import 'vs/editor/contrib/comment/comment'; +import 'vs/editor/contrib/contextmenu/contextmenu'; +import 'vs/editor/contrib/cursorUndo/cursorUndo'; +import 'vs/editor/contrib/dnd/dnd'; +import 'vs/editor/contrib/find/find'; +import 'vs/editor/contrib/folding/folding'; +import 'vs/editor/contrib/format/formatActions'; +import 'vs/editor/contrib/goToDeclaration/goToDeclarationCommands'; +import 'vs/editor/contrib/goToDeclaration/goToDeclarationMouse'; +import 'vs/editor/contrib/gotoError/gotoError'; +import 'vs/editor/contrib/hover/hover'; +import 'vs/editor/contrib/inPlaceReplace/inPlaceReplace'; +import 'vs/editor/contrib/linesOperations/linesOperations'; +import 'vs/editor/contrib/links/links'; import 'vs/editor/contrib/multicursor/multicursor'; -import 'vs/editor/contrib/parameterHints/browser/parameterHints'; -import 'vs/editor/contrib/quickFix/browser/quickFixCommands'; -import 'vs/editor/contrib/referenceSearch/browser/referenceSearch'; -import 'vs/editor/contrib/rename/browser/rename'; -import 'vs/editor/contrib/smartSelect/common/smartSelect'; -import 'vs/editor/contrib/snippet/browser/snippetController2'; -import 'vs/editor/contrib/suggest/browser/suggestController'; -import 'vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode'; -import 'vs/editor/contrib/wordHighlighter/common/wordHighlighter'; -import 'vs/editor/contrib/wordOperations/common/wordOperations'; -import 'vs/editor/contrib/colorPicker/browser/colorDetector'; +import 'vs/editor/contrib/parameterHints/parameterHints'; +import 'vs/editor/contrib/quickFix/quickFixCommands'; +import 'vs/editor/contrib/referenceSearch/referenceSearch'; +import 'vs/editor/contrib/rename/rename'; +import 'vs/editor/contrib/smartSelect/smartSelect'; +import 'vs/editor/contrib/snippet/snippetController2'; +import 'vs/editor/contrib/suggest/suggestController'; +import 'vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode'; +import 'vs/editor/contrib/wordHighlighter/wordHighlighter'; +import 'vs/editor/contrib/wordOperations/wordOperations'; diff --git a/src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.ts b/src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.ts index 773aad1b2a6..86f02042372 100644 --- a/src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.ts +++ b/src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.ts @@ -21,7 +21,7 @@ import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; import { registerEditorAction, CommonEditorRegistry, EditorAction, EditorCommand } from 'vs/editor/common/editorCommonExtensions'; import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition } from 'vs/editor/browser/editorBrowser'; import { registerEditorContribution } from 'vs/editor/browser/editorBrowserExtensions'; -import { ToggleTabFocusModeAction } from 'vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode'; +import { ToggleTabFocusModeAction } from 'vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode'; import { registerThemingParticipant } from 'vs/platform/theme/common/themeService'; import { editorWidgetBackground, widgetShadow, contrastBorder } from 'vs/platform/theme/common/colorRegistry'; import * as platform from 'vs/base/common/platform'; diff --git a/src/vs/editor/standalone/browser/quickOpen/quickOutline.ts b/src/vs/editor/standalone/browser/quickOpen/quickOutline.ts index 66d6a2029eb..8d00acbe840 100644 --- a/src/vs/editor/standalone/browser/quickOpen/quickOutline.ts +++ b/src/vs/editor/standalone/browser/quickOpen/quickOutline.ts @@ -17,7 +17,7 @@ import { ICommonCodeEditor, ScrollType } from 'vs/editor/common/editorCommon'; import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; import { SymbolInformation, DocumentSymbolProviderRegistry, symbolKindToCssClass, IOutline } from 'vs/editor/common/modes'; import { BaseEditorQuickOpenAction, IDecorator } from './editorQuickOpen'; -import { getDocumentSymbols } from 'vs/editor/contrib/quickOpen/common/quickOpen'; +import { getDocumentSymbols } from 'vs/editor/contrib/quickOpen/quickOpen'; import { registerEditorAction, ServicesAccessor } from 'vs/editor/common/editorCommonExtensions'; import { KeyCode, KeyMod } from 'vs/base/common/keyCodes'; import { Range } from 'vs/editor/common/core/range'; diff --git a/src/vs/workbench/api/electron-browser/mainThreadEditor.ts b/src/vs/workbench/api/electron-browser/mainThreadEditor.ts index bc23649dbe8..c5c6e7df58a 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadEditor.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadEditor.ts @@ -11,7 +11,7 @@ import { IModelService } from 'vs/editor/common/services/modelService'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { Range, IRange } from 'vs/editor/common/core/range'; import { Selection, ISelection } from 'vs/editor/common/core/selection'; -import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2'; +import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2'; import { EndOfLine, TextEditorLineNumbersStyle } from 'vs/workbench/api/node/extHostTypes'; import { TextEditorCursorStyle, cursorStyleToString } from 'vs/editor/common/config/editorOptions'; import { ICursorSelectionChangedEvent } from 'vs/editor/common/controller/cursorEvents'; diff --git a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts index d81c18b6085..82e964f6a87 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts @@ -17,8 +17,8 @@ import { Range } from 'vs/editor/common/core/range'; import { Selection } from 'vs/editor/common/core/selection'; import { Position } from 'vs/editor/common/core/position'; import { trimTrailingWhitespace } from 'vs/editor/common/commands/trimTrailingWhitespaceCommand'; -import { getDocumentFormattingEdits } from 'vs/editor/contrib/format/common/format'; -import { EditOperationsCommand } from 'vs/editor/contrib/format/common/formatCommand'; +import { getDocumentFormattingEdits } from 'vs/editor/contrib/format/format'; +import { EditOperationsCommand } from 'vs/editor/contrib/format/formatCommand'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel'; import { ExtHostContext, ExtHostDocumentSaveParticipantShape, IExtHostContext } from '../node/extHost.protocol'; diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts index 28dcafe4a0f..0cd0f0cac28 100644 --- a/src/vs/workbench/browser/parts/editor/editorStatus.ts +++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts @@ -25,8 +25,8 @@ import { IDisposable, combinedDisposable, dispose } from 'vs/base/common/lifecyc import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; import { IEditorAction, ICommonCodeEditor, EndOfLineSequence, IModel } from 'vs/editor/common/editorCommon'; import { IModelLanguageChangedEvent, IModelOptionsChangedEvent } from 'vs/editor/common/model/textModelEvents'; -import { TrimTrailingWhitespaceAction } from 'vs/editor/contrib/linesOperations/common/linesOperations'; -import { IndentUsingSpaces, IndentUsingTabs, DetectIndentation, IndentationToSpacesAction, IndentationToTabsAction } from 'vs/editor/contrib/indentation/common/indentation'; +import { TrimTrailingWhitespaceAction } from 'vs/editor/contrib/linesOperations/linesOperations'; +import { IndentUsingSpaces, IndentUsingTabs, DetectIndentation, IndentationToSpacesAction, IndentationToTabsAction } from 'vs/editor/contrib/indentation/indentation'; import { BaseBinaryResourceEditor } from 'vs/workbench/browser/parts/editor/binaryEditor'; import { BinaryResourceDiffEditor } from 'vs/workbench/browser/parts/editor/binaryDiffEditor'; import { IEditor as IBaseEditor, IEditorInput } from 'vs/platform/editor/common/editor'; diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.ts b/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.ts index 0471f7d2531..a732da5c78e 100644 --- a/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.ts +++ b/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.ts @@ -22,7 +22,7 @@ import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; import { registerEditorAction, CommonEditorRegistry, EditorAction, EditorCommand } from 'vs/editor/common/editorCommonExtensions'; import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition } from 'vs/editor/browser/editorBrowser'; import { registerEditorContribution } from 'vs/editor/browser/editorBrowserExtensions'; -import { ToggleTabFocusModeAction } from 'vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode'; +import { ToggleTabFocusModeAction } from 'vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode'; import { registerThemingParticipant } from 'vs/platform/theme/common/themeService'; import { editorWidgetBackground, widgetShadow, contrastBorder } from 'vs/platform/theme/common/colorRegistry'; import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; diff --git a/src/vs/workbench/parts/debug/browser/breakpointWidget.ts b/src/vs/workbench/parts/debug/browser/breakpointWidget.ts index d74302cfd6e..9f1df5fea58 100644 --- a/src/vs/workbench/parts/debug/browser/breakpointWidget.ts +++ b/src/vs/workbench/parts/debug/browser/breakpointWidget.ts @@ -13,7 +13,7 @@ import * as lifecycle from 'vs/base/common/lifecycle'; import * as dom from 'vs/base/browser/dom'; import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; -import { ZoneWidget } from 'vs/editor/contrib/zoneWidget/browser/zoneWidget'; +import { ZoneWidget } from 'vs/editor/contrib/zoneWidget/zoneWidget'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { IDebugService, IBreakpoint, IRawBreakpoint } from 'vs/workbench/parts/debug/common/debug'; import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent'; diff --git a/src/vs/workbench/parts/debug/browser/exceptionWidget.ts b/src/vs/workbench/parts/debug/browser/exceptionWidget.ts index d5cf00cb85a..44a219488cc 100644 --- a/src/vs/workbench/parts/debug/browser/exceptionWidget.ts +++ b/src/vs/workbench/parts/debug/browser/exceptionWidget.ts @@ -6,7 +6,7 @@ import 'vs/css!../browser/media/exceptionWidget'; import * as nls from 'vs/nls'; import * as dom from 'vs/base/browser/dom'; -import { ZoneWidget } from 'vs/editor/contrib/zoneWidget/browser/zoneWidget'; +import { ZoneWidget } from 'vs/editor/contrib/zoneWidget/zoneWidget'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { IExceptionInfo } from 'vs/workbench/parts/debug/common/debug'; import { RunOnceScheduler } from 'vs/base/common/async'; diff --git a/src/vs/workbench/parts/debug/electron-browser/repl.ts b/src/vs/workbench/parts/debug/electron-browser/repl.ts index cfa965a53e5..26e2e328e94 100644 --- a/src/vs/workbench/parts/debug/electron-browser/repl.ts +++ b/src/vs/workbench/parts/debug/electron-browser/repl.ts @@ -17,8 +17,8 @@ import { CancellationToken } from 'vs/base/common/cancellation'; import { KeyCode } from 'vs/base/common/keyCodes'; import { ITree, ITreeOptions } from 'vs/base/parts/tree/browser/tree'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; -import { Context as SuggestContext } from 'vs/editor/contrib/suggest/browser/suggest'; -import { SuggestController } from 'vs/editor/contrib/suggest/browser/suggestController'; +import { Context as SuggestContext } from 'vs/editor/contrib/suggest/suggest'; +import { SuggestController } from 'vs/editor/contrib/suggest/suggestController'; import { IReadOnlyModel, ICommonCodeEditor } from 'vs/editor/common/editorCommon'; import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; import { Position } from 'vs/editor/common/core/position'; diff --git a/src/vs/workbench/parts/debug/electron-browser/replEditor.ts b/src/vs/workbench/parts/debug/electron-browser/replEditor.ts index a1ffe9fe3cf..68dec27acad 100644 --- a/src/vs/workbench/parts/debug/electron-browser/replEditor.ts +++ b/src/vs/workbench/parts/debug/electron-browser/replEditor.ts @@ -15,9 +15,9 @@ import { ICommandService } from 'vs/platform/commands/common/commands'; // Allowed Editor Contributions: import { MenuPreventer } from 'vs/workbench/parts/codeEditor/electron-browser/menuPreventer'; import { SelectionClipboard } from 'vs/workbench/parts/codeEditor/electron-browser/selectionClipboard'; -import { ContextMenuController } from 'vs/editor/contrib/contextmenu/browser/contextmenu'; -import { SuggestController } from 'vs/editor/contrib/suggest/browser/suggestController'; -import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2'; +import { ContextMenuController } from 'vs/editor/contrib/contextmenu/contextmenu'; +import { SuggestController } from 'vs/editor/contrib/suggest/suggestController'; +import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2'; import { TabCompletionController } from 'vs/workbench/parts/snippets/electron-browser/tabCompletion'; import { IThemeService } from 'vs/platform/theme/common/themeService'; diff --git a/src/vs/workbench/parts/html/browser/webviewFindWidget.ts b/src/vs/workbench/parts/html/browser/webviewFindWidget.ts index 3f35b6d15b6..28b438e3acf 100644 --- a/src/vs/workbench/parts/html/browser/webviewFindWidget.ts +++ b/src/vs/workbench/parts/html/browser/webviewFindWidget.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { SimpleFindWidget } from 'vs/editor/contrib/find/browser/simpleFindWidget'; +import { SimpleFindWidget } from 'vs/editor/contrib/find/simpleFindWidget'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import Webview from './webview'; diff --git a/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.ts b/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.ts index 9e42e972169..e4c08040952 100644 --- a/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.ts +++ b/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.ts @@ -18,7 +18,7 @@ import * as editorCommon from 'vs/editor/common/editorCommon'; import { ServicesAccessor, registerEditorCommand, EditorCommand } from 'vs/editor/common/editorCommonExtensions'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { registerEditorContribution } from 'vs/editor/browser/editorBrowserExtensions'; -import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2'; +import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2'; import { SmartSnippetInserter } from 'vs/workbench/parts/preferences/common/smartSnippetInserter'; import { DefineKeybindingOverlayWidget } from 'vs/workbench/parts/preferences/browser/keybindingWidgets'; import { FloatingClickWidget } from 'vs/workbench/parts/preferences/browser/preferencesWidgets'; diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts index b45405fd092..9edba8968c3 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts @@ -48,8 +48,8 @@ import { ITextFileService } from 'vs/workbench/services/textfile/common/textfile import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService'; import { getCodeEditor } from 'vs/editor/common/services/codeEditorService'; import { IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/browser/editor'; -import { FoldingController } from 'vs/editor/contrib/folding/browser/folding'; -import { FindController } from 'vs/editor/contrib/find/browser/find'; +import { FoldingController } from 'vs/editor/contrib/folding/folding'; +import { FindController } from 'vs/editor/contrib/find/find'; import { SelectionHighlighter } from 'vs/editor/contrib/multicursor/multicursor'; import { IEditorOptions } from 'vs/editor/common/config/editorOptions'; import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry'; diff --git a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts index 814bd641bf2..dd215266269 100644 --- a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts @@ -20,7 +20,7 @@ import { IEditor, IModelDecorationsChangeAccessor, OverviewRulerLane, IModelDelt import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { Position, IEditorInput, ITextEditorOptions } from 'vs/platform/editor/common/editor'; -import { getDocumentSymbols } from 'vs/editor/contrib/quickOpen/common/quickOpen'; +import { getDocumentSymbols } from 'vs/editor/contrib/quickOpen/quickOpen'; import { DocumentSymbolProviderRegistry, SymbolInformation, symbolKindToCssClass } from 'vs/editor/common/modes'; import { getCodeEditor } from 'vs/editor/common/services/codeEditorService'; import { IRange } from 'vs/editor/common/core/range'; diff --git a/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts b/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts index 37daf1f50d6..a7742e6beb5 100644 --- a/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts +++ b/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts @@ -30,14 +30,14 @@ import { Color, RGBA } from 'vs/base/common/color'; import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser'; import { registerEditorContribution } from 'vs/editor/browser/editorBrowserExtensions'; import { registerEditorAction, ServicesAccessor, EditorAction, CommonEditorRegistry } from 'vs/editor/common/editorCommonExtensions'; -import { PeekViewWidget, getOuterEditor } from 'vs/editor/contrib/referenceSearch/browser/peekViewWidget'; +import { PeekViewWidget, getOuterEditor } from 'vs/editor/contrib/referenceSearch/peekViewWidget'; import { IContextKeyService, IContextKey, ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey'; import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; import { KeyCode, KeyMod } from 'vs/base/common/keyCodes'; import { Position } from 'vs/editor/common/core/position'; import { rot } from 'vs/base/common/numbers'; import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry'; -import { peekViewBorder, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground } from 'vs/editor/contrib/referenceSearch/browser/referencesWidget'; +import { peekViewBorder, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground } from 'vs/editor/contrib/referenceSearch/referencesWidget'; import { EmbeddedDiffEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget'; import { IDiffEditorOptions } from 'vs/editor/common/config/editorOptions'; import { Action, IAction, ActionRunner } from 'vs/base/common/actions'; diff --git a/src/vs/workbench/parts/search/browser/search.contribution.ts b/src/vs/workbench/parts/search/browser/search.contribution.ts index c12109102e3..a8eddf21c3d 100644 --- a/src/vs/workbench/parts/search/browser/search.contribution.ts +++ b/src/vs/workbench/parts/search/browser/search.contribution.ts @@ -26,7 +26,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService'; -import { getSelectionSearchString } from 'vs/editor/contrib/find/common/find'; +import { getSelectionSearchString } from 'vs/editor/contrib/find/findController'; import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { KeyMod, KeyCode } from 'vs/base/common/keyCodes'; import { ITree } from 'vs/base/parts/tree/browser/tree'; @@ -36,7 +36,7 @@ import * as Constants from 'vs/workbench/parts/search/common/constants'; import { registerContributions as replaceContributions } from 'vs/workbench/parts/search/browser/replaceContributions'; import { registerContributions as searchWidgetContributions } from 'vs/workbench/parts/search/browser/searchWidget'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; -import { ToggleCaseSensitiveKeybinding, ToggleRegexKeybinding, ToggleWholeWordKeybinding, ShowPreviousFindTermKeybinding, ShowNextFindTermKeybinding } from 'vs/editor/contrib/find/common/findModel'; +import { ToggleCaseSensitiveKeybinding, ToggleRegexKeybinding, ToggleWholeWordKeybinding, ShowPreviousFindTermKeybinding, ShowNextFindTermKeybinding } from 'vs/editor/contrib/find/findModel'; import { ISearchWorkbenchService, SearchWorkbenchService } from 'vs/workbench/parts/search/common/searchModel'; import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { SearchViewlet } from 'vs/workbench/parts/search/browser/searchViewlet'; diff --git a/src/vs/workbench/parts/search/browser/searchWidget.ts b/src/vs/workbench/parts/search/browser/searchWidget.ts index b0215734b21..296b05dc2d2 100644 --- a/src/vs/workbench/parts/search/browser/searchWidget.ts +++ b/src/vs/workbench/parts/search/browser/searchWidget.ts @@ -23,7 +23,7 @@ import Event, { Emitter } from 'vs/base/common/event'; import { Builder } from 'vs/base/browser/builder'; import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { isSearchViewletFocused, appendKeyBindingLabel } from 'vs/workbench/parts/search/browser/searchActions'; -import { CONTEXT_FIND_WIDGET_NOT_VISIBLE } from 'vs/editor/contrib/find/common/findController'; +import { CONTEXT_FIND_WIDGET_NOT_VISIBLE } from 'vs/editor/contrib/find/findController'; import { HistoryNavigator } from 'vs/base/common/history'; import * as Constants from 'vs/workbench/parts/search/common/constants'; import { attachInputBoxStyler, attachFindInputBoxStyler, attachButtonStyler } from 'vs/platform/theme/common/styler'; diff --git a/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.ts b/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.ts index e002059a219..35b344890d3 100644 --- a/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.ts +++ b/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.ts @@ -13,7 +13,7 @@ import { IModeService } from 'vs/editor/common/services/modeService'; import { LanguageId } from 'vs/editor/common/modes'; import { ICommandService, CommandsRegistry } from 'vs/platform/commands/common/commands'; import { ISnippetsService, Snippet } from 'vs/workbench/parts/snippets/electron-browser/snippets.contribution'; -import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2'; +import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2'; import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; interface ISnippetPick extends IPickOpenEntry { diff --git a/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.ts b/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.ts index b262f72df95..d9341f13c3e 100644 --- a/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.ts +++ b/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.ts @@ -19,8 +19,8 @@ import * as nls from 'vs/nls'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { LanguageId } from 'vs/editor/common/modes'; import { TPromise } from 'vs/base/common/winjs.base'; -import { SnippetParser, Variable, Placeholder, Text } from 'vs/editor/contrib/snippet/browser/snippetParser'; -import { EditorSnippetVariableResolver } from 'vs/editor/contrib/snippet/browser/snippetVariables'; +import { SnippetParser, Variable, Placeholder, Text } from 'vs/editor/contrib/snippet/snippetParser'; +import { EditorSnippetVariableResolver } from 'vs/editor/contrib/snippet/snippetVariables'; export const ISnippetsService = createDecorator('snippetService'); diff --git a/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts b/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts index 8f062847599..f5993bb7a3a 100644 --- a/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts +++ b/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts @@ -8,11 +8,11 @@ import { localize } from 'vs/nls'; import { IModel } from 'vs/editor/common/editorCommon'; import { ISuggestSupport, ISuggestResult, ISuggestion, LanguageId, SuggestionType, SnippetType } from 'vs/editor/common/modes'; import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; -import { setSnippetSuggestSupport } from 'vs/editor/contrib/suggest/browser/suggest'; +import { setSnippetSuggestSupport } from 'vs/editor/contrib/suggest/suggest'; import { IModeService } from 'vs/editor/common/services/modeService'; import { Position } from 'vs/editor/common/core/position'; import { overlap, compare, startsWith } from 'vs/base/common/strings'; -import { SnippetParser } from 'vs/editor/contrib/snippet/browser/snippetParser'; +import { SnippetParser } from 'vs/editor/contrib/snippet/snippetParser'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { IExtensionService } from 'vs/platform/extensions/common/extensions'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; diff --git a/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.ts b/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.ts index 0c665574d30..36b4501b879 100644 --- a/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.ts +++ b/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.ts @@ -17,8 +17,8 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import * as editorCommon from 'vs/editor/common/editorCommon'; import { Range } from 'vs/editor/common/core/range'; import { CommonEditorRegistry, registerCommonEditorContribution, EditorCommand } from 'vs/editor/common/editorCommonExtensions'; -import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2'; -import { showSimpleSuggestions } from 'vs/editor/contrib/suggest/browser/suggest'; +import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2'; +import { showSimpleSuggestions } from 'vs/editor/contrib/suggest/suggest'; import { IConfigurationRegistry, Extensions as ConfigExt } from 'vs/platform/configuration/common/configurationRegistry'; import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts index 0d7bb112081..cc79fb6c3ff 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts @@ -23,7 +23,7 @@ import { Registry } from 'vs/platform/registry/common/platform'; import { ShowAllCommandsAction } from 'vs/workbench/parts/quickopen/browser/commandsHandler'; import { SyncActionDescriptor } from 'vs/platform/actions/common/actions'; import { TerminalService } from 'vs/workbench/parts/terminal/electron-browser/terminalService'; -import { ToggleTabFocusModeAction } from 'vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode'; +import { ToggleTabFocusModeAction } from 'vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode'; import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry'; import { OpenNextRecentlyUsedEditorInGroupAction, OpenPreviousRecentlyUsedEditorInGroupAction, FocusActiveGroupAction, FocusFirstGroupAction, FocusSecondGroupAction, FocusThirdGroupAction } from 'vs/workbench/browser/parts/editor/editorActions'; diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.ts index 43202651a4d..431ea507364 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { SimpleFindWidget } from 'vs/editor/contrib/find/browser/simpleFindWidget'; +import { SimpleFindWidget } from 'vs/editor/contrib/find/simpleFindWidget'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { ITerminalService, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_INPUT_FOCUSED } from 'vs/workbench/parts/terminal/common/terminal'; import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; diff --git a/src/vs/workbench/services/themes/electron-browser/themeCompatibility.ts b/src/vs/workbench/services/themes/electron-browser/themeCompatibility.ts index 05a2f54c778..a05bfc5cf4f 100644 --- a/src/vs/workbench/services/themes/electron-browser/themeCompatibility.ts +++ b/src/vs/workbench/services/themes/electron-browser/themeCompatibility.ts @@ -8,8 +8,8 @@ import { Color } from 'vs/base/common/color'; import * as colorRegistry from 'vs/platform/theme/common/colorRegistry'; import * as editorColorRegistry from 'vs/editor/common/view/editorColorRegistry'; -import * as wordHighlighter from 'vs/editor/contrib/wordHighlighter/common/wordHighlighter'; -import { peekViewEditorMatchHighlight, peekViewResultsMatchHighlight } from 'vs/editor/contrib/referenceSearch/browser/referencesWidget'; +import * as wordHighlighter from 'vs/editor/contrib/wordHighlighter/wordHighlighter'; +import { peekViewEditorMatchHighlight, peekViewResultsMatchHighlight } from 'vs/editor/contrib/referenceSearch/referencesWidget'; const settingToColorIdMapping: { [settingId: string]: string[] } = {}; function addSettingMapping(settingId: string, colorId: string) { diff --git a/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts b/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts index 49a7be6f3dd..64bbf3d593c 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts +++ b/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts @@ -24,20 +24,20 @@ import { MainThreadCommands } from 'vs/workbench/api/electron-browser/mainThread import { IHeapService } from 'vs/workbench/api/electron-browser/mainThreadHeapService'; import { ExtHostDocuments } from 'vs/workbench/api/node/extHostDocuments'; import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumentsAndEditors'; -import { getDocumentSymbols } from 'vs/editor/contrib/quickOpen/common/quickOpen'; +import { getDocumentSymbols } from 'vs/editor/contrib/quickOpen/quickOpen'; import { DocumentSymbolProviderRegistry, DocumentHighlightKind, Hover } from 'vs/editor/common/modes'; -import { getCodeLensData } from 'vs/editor/contrib/codelens/browser/codelens'; -import { getDefinitionsAtPosition, getImplementationsAtPosition, getTypeDefinitionsAtPosition } from 'vs/editor/contrib/goToDeclaration/browser/goToDeclaration'; -import { getHover } from 'vs/editor/contrib/hover/common/hover'; -import { getOccurrencesAtPosition } from 'vs/editor/contrib/wordHighlighter/common/wordHighlighter'; -import { provideReferences } from 'vs/editor/contrib/referenceSearch/browser/referenceSearch'; -import { getCodeActions } from 'vs/editor/contrib/quickFix/browser/quickFix'; +import { getCodeLensData } from 'vs/editor/contrib/codelens/codelens'; +import { getDefinitionsAtPosition, getImplementationsAtPosition, getTypeDefinitionsAtPosition } from 'vs/editor/contrib/goToDeclaration/goToDeclaration'; +import { getHover } from 'vs/editor/contrib/hover/getHover'; +import { getOccurrencesAtPosition } from 'vs/editor/contrib/wordHighlighter/wordHighlighter'; +import { provideReferences } from 'vs/editor/contrib/referenceSearch/referenceSearch'; +import { getCodeActions } from 'vs/editor/contrib/quickFix/quickFix'; import { getWorkspaceSymbols } from 'vs/workbench/parts/search/common/search'; -import { rename } from 'vs/editor/contrib/rename/browser/rename'; -import { provideSignatureHelp } from 'vs/editor/contrib/parameterHints/common/parameterHints'; -import { provideSuggestionItems } from 'vs/editor/contrib/suggest/browser/suggest'; -import { getDocumentFormattingEdits, getDocumentRangeFormattingEdits, getOnTypeFormattingEdits } from 'vs/editor/contrib/format/common/format'; -import { getLinks } from 'vs/editor/contrib/links/common/links'; +import { rename } from 'vs/editor/contrib/rename/rename'; +import { provideSignatureHelp } from 'vs/editor/contrib/parameterHints/provideSignatureHelp'; +import { provideSuggestionItems } from 'vs/editor/contrib/suggest/suggest'; +import { getDocumentFormattingEdits, getDocumentRangeFormattingEdits, getOnTypeFormattingEdits } from 'vs/editor/contrib/format/format'; +import { getLinks } from 'vs/editor/contrib/links/getLinks'; import { asWinJsPromise } from 'vs/base/common/async'; import { MainContext, ExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; import { ExtHostDiagnostics } from 'vs/workbench/api/node/extHostDiagnostics'; diff --git a/tslint.json b/tslint.json index e5f6005ed78..3a591068174 100644 --- a/tslint.json +++ b/tslint.json @@ -289,7 +289,7 @@ "**/vs/base/parts/*/{common,browser}/**", "**/vs/platform/*/{common,browser}/**", "**/vs/editor/{common,browser}/**", - "**/vs/editor/contrib/*/{common,browser}/**", + "**/vs/editor/contrib/**", // editor/contrib is equivalent to /browser/ by convention "**/vs/workbench/{common,browser}/**", "**/vs/workbench/services/*/{common,browser}/**", "assert" @@ -311,7 +311,7 @@ "**/vs/platform/node/**", "**/vs/platform/*/{common,browser,node,electron-browser}/**", "**/vs/editor/{common,browser,node,electron-browser}/**", - "**/vs/editor/contrib/*/{common,browser,node,electron-browser}/**", + "**/vs/editor/contrib/**", // editor/contrib is equivalent to /browser/ by convention "**/vs/workbench/{common,browser,node,electron-browser,api}/**", "**/vs/workbench/services/*/{common,browser,node,electron-browser}/**", "*" // node modules @@ -392,7 +392,7 @@ "vs/css!./**/*", "**/vs/base/**/{common,browser,node,electron-browser}/**", "**/vs/platform/**/{common,browser,node,electron-browser}/**", - "**/vs/editor/**/{common,browser,node,electron-browser}/**", + "**/vs/editor/**", "**/vs/workbench/{common,browser,node,electron-browser,api}/**", "**/vs/workbench/services/**/{common,browser,node,electron-browser}/**", "*" // node modules