diff --git a/src/vs/editor/browser/controller/mouseTarget.ts b/src/vs/editor/browser/controller/mouseTarget.ts index fef2ffb9f70a3..737daf6d2947f 100644 --- a/src/vs/editor/browser/controller/mouseTarget.ts +++ b/src/vs/editor/browser/controller/mouseTarget.ts @@ -7,7 +7,7 @@ import { IPointerHandlerHelper } from './mouseHandler.js'; import { IMouseTargetContentEmptyData, IMouseTargetMarginData, IMouseTarget, IMouseTargetContentEmpty, IMouseTargetContentText, IMouseTargetContentWidget, IMouseTargetMargin, IMouseTargetOutsideEditor, IMouseTargetOverlayWidget, IMouseTargetScrollbar, IMouseTargetTextarea, IMouseTargetUnknown, IMouseTargetViewZone, IMouseTargetContentTextData, IMouseTargetViewZoneData, MouseTargetType } from '../editorBrowser.js'; import { ClientCoordinates, EditorMouseEvent, EditorPagePosition, PageCoordinates, CoordinatesRelativeToEditor } from '../editorDom.js'; import { PartFingerprint, PartFingerprints } from '../view/viewPart.js'; -import { ViewLine } from '../viewParts/lines/viewLine.js'; +import { ViewLine } from '../viewParts/viewLines/viewLine.js'; import { IViewCursorRenderData } from '../viewParts/viewCursors/viewCursor.js'; import { EditorLayoutInfo, EditorOption } from '../../common/config/editorOptions.js'; import { Position } from '../../common/core/position.js'; diff --git a/src/vs/editor/browser/gpu/fullFileRenderStrategy.ts b/src/vs/editor/browser/gpu/fullFileRenderStrategy.ts index 2771004b42356..d3043134d3195 100644 --- a/src/vs/editor/browser/gpu/fullFileRenderStrategy.ts +++ b/src/vs/editor/browser/gpu/fullFileRenderStrategy.ts @@ -11,7 +11,7 @@ import type { IViewLineTokens } from '../../common/tokens/lineTokens.js'; import type { ViewportData } from '../../common/viewLayout/viewLinesViewportData.js'; import type { ViewLineRenderingData } from '../../common/viewModel.js'; import type { ViewContext } from '../../common/viewModel/viewContext.js'; -import type { ViewLineOptions } from '../viewParts/lines/viewLineOptions.js'; +import type { ViewLineOptions } from '../viewParts/viewLines/viewLineOptions.js'; import type { ITextureAtlasPageGlyph } from './atlas/atlas.js'; import type { TextureAtlas } from './atlas/textureAtlas.js'; import { fullFileRenderStrategyWgsl } from './fullFileRenderStrategy.wgsl.js'; diff --git a/src/vs/editor/browser/gpu/gpu.ts b/src/vs/editor/browser/gpu/gpu.ts index c0a5fc6845c58..b4001c7291198 100644 --- a/src/vs/editor/browser/gpu/gpu.ts +++ b/src/vs/editor/browser/gpu/gpu.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import type { ViewportData } from '../../common/viewLayout/viewLinesViewportData.js'; -import type { ViewLineOptions } from '../viewParts/lines/viewLineOptions.js'; +import type { ViewLineOptions } from '../viewParts/viewLines/viewLineOptions.js'; export const enum BindingId { GlyphInfo0, diff --git a/src/vs/editor/browser/view.ts b/src/vs/editor/browser/view.ts index ab059a2b47d89..2d0df73f6bb23 100644 --- a/src/vs/editor/browser/view.ts +++ b/src/vs/editor/browser/view.ts @@ -27,7 +27,7 @@ import { EditorScrollbar } from './viewParts/editorScrollbar/editorScrollbar.js' import { GlyphMarginWidgets } from './viewParts/glyphMargin/glyphMargin.js'; import { IndentGuidesOverlay } from './viewParts/indentGuides/indentGuides.js'; import { LineNumbersOverlay } from './viewParts/lineNumbers/lineNumbers.js'; -import { ViewLines } from './viewParts/lines/viewLines.js'; +import { ViewLines } from './viewParts/viewLines/viewLines.js'; import { LinesDecorationsOverlay } from './viewParts/linesDecorations/linesDecorations.js'; import { Margin } from './viewParts/margin/margin.js'; import { MarginViewLineDecorationsOverlay } from './viewParts/marginDecorations/marginDecorations.js'; @@ -56,7 +56,7 @@ import { ViewContext } from '../common/viewModel/viewContext.js'; import { IInstantiationService } from '../../platform/instantiation/common/instantiation.js'; import { IColorTheme, getThemeTypeSelector } from '../../platform/theme/common/themeService.js'; import { ViewGpuContext } from './gpu/viewGpuContext.js'; -import { ViewLinesGpu } from './viewParts/linesGpu/viewLinesGpu.js'; +import { ViewLinesGpu } from './viewParts/viewLinesGpu/viewLinesGpu.js'; import { AbstractEditContext } from './controller/editContext/editContextUtils.js'; import { IVisibleRangeProvider, TextAreaEditContext } from './controller/editContext/textArea/textAreaEditContext.js'; import { NativeEditContext } from './controller/editContext/native/nativeEditContext.js'; diff --git a/src/vs/editor/browser/viewParts/lines/domReadingContext.ts b/src/vs/editor/browser/viewParts/viewLines/domReadingContext.ts similarity index 100% rename from src/vs/editor/browser/viewParts/lines/domReadingContext.ts rename to src/vs/editor/browser/viewParts/viewLines/domReadingContext.ts diff --git a/src/vs/editor/browser/viewParts/lines/rangeUtil.ts b/src/vs/editor/browser/viewParts/viewLines/rangeUtil.ts similarity index 100% rename from src/vs/editor/browser/viewParts/lines/rangeUtil.ts rename to src/vs/editor/browser/viewParts/viewLines/rangeUtil.ts diff --git a/src/vs/editor/browser/viewParts/lines/viewLine.ts b/src/vs/editor/browser/viewParts/viewLines/viewLine.ts similarity index 99% rename from src/vs/editor/browser/viewParts/lines/viewLine.ts rename to src/vs/editor/browser/viewParts/viewLines/viewLine.ts index 209a85d8d5bf7..85534265898d5 100644 --- a/src/vs/editor/browser/viewParts/lines/viewLine.ts +++ b/src/vs/editor/browser/viewParts/viewLines/viewLine.ts @@ -18,7 +18,7 @@ import { isHighContrast } from '../../../../platform/theme/common/theme.js'; import { EditorFontLigatures } from '../../../common/config/editorOptions.js'; import { DomReadingContext } from './domReadingContext.js'; import type { ViewLineOptions } from './viewLineOptions.js'; -import { ViewLinesGpu } from '../linesGpu/viewLinesGpu.js'; +import { ViewLinesGpu } from '../viewLinesGpu/viewLinesGpu.js'; const canUseFastRenderedViewLine = (function () { if (platform.isNative) { diff --git a/src/vs/editor/browser/viewParts/lines/viewLineOptions.ts b/src/vs/editor/browser/viewParts/viewLines/viewLineOptions.ts similarity index 100% rename from src/vs/editor/browser/viewParts/lines/viewLineOptions.ts rename to src/vs/editor/browser/viewParts/viewLines/viewLineOptions.ts diff --git a/src/vs/editor/browser/viewParts/lines/viewLines.css b/src/vs/editor/browser/viewParts/viewLines/viewLines.css similarity index 100% rename from src/vs/editor/browser/viewParts/lines/viewLines.css rename to src/vs/editor/browser/viewParts/viewLines/viewLines.css diff --git a/src/vs/editor/browser/viewParts/lines/viewLines.ts b/src/vs/editor/browser/viewParts/viewLines/viewLines.ts similarity index 100% rename from src/vs/editor/browser/viewParts/lines/viewLines.ts rename to src/vs/editor/browser/viewParts/viewLines/viewLines.ts diff --git a/src/vs/editor/browser/viewParts/linesGpu/viewLinesGpu.ts b/src/vs/editor/browser/viewParts/viewLinesGpu/viewLinesGpu.ts similarity index 99% rename from src/vs/editor/browser/viewParts/linesGpu/viewLinesGpu.ts rename to src/vs/editor/browser/viewParts/viewLinesGpu/viewLinesGpu.ts index 60c42904ed281..9cf20bdb4607e 100644 --- a/src/vs/editor/browser/viewParts/linesGpu/viewLinesGpu.ts +++ b/src/vs/editor/browser/viewParts/viewLinesGpu/viewLinesGpu.ts @@ -20,7 +20,7 @@ import { observeDevicePixelDimensions, quadVertices } from '../../gpu/gpuUtils.j import type { ViewGpuContext } from '../../gpu/viewGpuContext.js'; import type { RenderingContext, RestrictedRenderingContext } from '../../view/renderingContext.js'; import { ViewPart } from '../../view/viewPart.js'; -import { ViewLineOptions } from '../lines/viewLineOptions.js'; +import { ViewLineOptions } from '../viewLines/viewLineOptions.js'; const enum GlyphStorageBufferInfo { diff --git a/src/vs/editor/contrib/gpu/browser/gpuActions.ts b/src/vs/editor/contrib/gpu/browser/gpuActions.ts index b28a6cf6915fe..f56b32818bdac 100644 --- a/src/vs/editor/contrib/gpu/browser/gpuActions.ts +++ b/src/vs/editor/contrib/gpu/browser/gpuActions.ts @@ -17,7 +17,7 @@ import type { ICodeEditor } from '../../../browser/editorBrowser.js'; import { EditorAction, registerEditorAction, type ServicesAccessor } from '../../../browser/editorExtensions.js'; import { ensureNonNullable } from '../../../browser/gpu/gpuUtils.js'; import { GlyphRasterizer } from '../../../browser/gpu/raster/glyphRasterizer.js'; -import { ViewLinesGpu } from '../../../browser/viewParts/linesGpu/viewLinesGpu.js'; +import { ViewLinesGpu } from '../../../browser/viewParts/viewLinesGpu/viewLinesGpu.js'; class DebugEditorGpuRendererAction extends EditorAction { diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts index 882f7a9dfdbd1..8dff794019968 100644 --- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts +++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts @@ -10,7 +10,7 @@ import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.j import { ThemeIcon } from '../../../../base/common/themables.js'; import './stickyScroll.css'; import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference } from '../../../browser/editorBrowser.js'; -import { getColumnOfNodeOffset } from '../../../browser/viewParts/lines/viewLine.js'; +import { getColumnOfNodeOffset } from '../../../browser/viewParts/viewLines/viewLine.js'; import { EmbeddedCodeEditorWidget } from '../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js'; import { EditorLayoutInfo, EditorOption, RenderLineNumbersType } from '../../../common/config/editorOptions.js'; import { Position } from '../../../common/core/position.js';