From eb751115497c76bc2169463590d2caa2c02f4e4d Mon Sep 17 00:00:00 2001 From: Tim van der Lippe Date: Mon, 19 Apr 2021 13:07:59 +0100 Subject: [PATCH] Move snippets to panels/snippets R=aerotwist@chromium.org Bug: 1187573 Change-Id: I5c9c27398f331fb853eabfe6c278ddc4cc306034 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2831971 Commit-Queue: Tim van der Lippe Reviewed-by: Paul Lewis --- BUILD.gn | 2 +- config/gni/all_devtools_files.gni | 2 +- config/gni/all_devtools_modules.gni | 6 ++--- config/gni/devtools_grd_files.gni | 12 +++++----- config/gni/devtools_module_entrypoints.gni | 4 ++-- front_end/BUILD.gn | 4 ++-- front_end/core/i18n/locales/en-US.json | 24 +++++++++---------- front_end/core/i18n/locales/en-XL.json | 24 +++++++++---------- front_end/core/root/Runtime.ts | 1 + front_end/entrypoints/shell/shell.json | 2 +- front_end/main/BUILD.gn | 2 +- front_end/main/MainImpl.ts | 2 +- front_end/panels/changes/BUILD.gn | 2 +- front_end/panels/changes/ChangesSidebar.ts | 2 +- front_end/panels/changes/module.json | 2 +- front_end/{ => panels}/snippets/BUILD.gn | 18 +++++++------- .../{ => panels}/snippets/ModuleUIStrings.ts | 7 +++--- front_end/{ => panels}/snippets/OWNERS | 0 .../snippets/ScriptSnippetFileSystem.ts | 18 +++++++------- .../snippets/SnippetsQuickOpen.ts | 8 +++---- front_end/{ => panels}/snippets/module.json | 0 .../{ => panels}/snippets/snippets-legacy.ts | 0 front_end/{ => panels}/snippets/snippets.ts | 0 front_end/panels/sources/BUILD.gn | 2 +- .../sources/JavaScriptCompilerPlugin.ts | 2 +- front_end/panels/sources/NavigatorView.ts | 2 +- front_end/panels/sources/SnippetsPlugin.ts | 2 +- front_end/panels/sources/SourcesNavigator.ts | 2 +- front_end/panels/sources/SourcesPanel.ts | 2 +- .../panels/sources/TabbedEditorContainer.ts | 2 +- front_end/panels/sources/module.json | 2 +- 31 files changed, 79 insertions(+), 79 deletions(-) rename front_end/{ => panels}/snippets/BUILD.gn (57%) rename front_end/{ => panels}/snippets/ModuleUIStrings.ts (51%) rename front_end/{ => panels}/snippets/OWNERS (100%) rename front_end/{ => panels}/snippets/ScriptSnippetFileSystem.ts (92%) rename front_end/{ => panels}/snippets/SnippetsQuickOpen.ts (88%) rename front_end/{ => panels}/snippets/module.json (100%) rename front_end/{ => panels}/snippets/snippets-legacy.ts (100%) rename front_end/{ => panels}/snippets/snippets.ts (100%) diff --git a/BUILD.gn b/BUILD.gn index 3ec6abf8b1..d4f01de388 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -137,7 +137,7 @@ non_autostart_non_remote_modules = [ "panels/search/search_module.js", "panels/security/security_module.js", "settings/settings_module.js", - "snippets/snippets_module.js", + "panels/snippets/snippets_module.js", "ui/legacy/components/source_frame/source_frame_module.js", "panels/sources/sources_module.js", "ui/legacy/components/text_editor/text_editor_module.js", diff --git a/config/gni/all_devtools_files.gni b/config/gni/all_devtools_files.gni index 49415a5b85..f58de3361e 100644 --- a/config/gni/all_devtools_files.gni +++ b/config/gni/all_devtools_files.gni @@ -272,7 +272,7 @@ all_devtools_files = [ "front_end/settings/module.json", "front_end/settings/settingsScreen.css", "front_end/entrypoints/shell/shell.json", - "front_end/snippets/module.json", + "front_end/panels/snippets/module.json", "front_end/ui/legacy/components/source_frame/fontView.css", "front_end/ui/legacy/components/source_frame/imageView.css", "front_end/ui/legacy/components/source_frame/jsonView.css", diff --git a/config/gni/all_devtools_modules.gni b/config/gni/all_devtools_modules.gni index 878e634def..437b73cb1b 100644 --- a/config/gni/all_devtools_modules.gni +++ b/config/gni/all_devtools_modules.gni @@ -479,6 +479,9 @@ all_typescript_module_sources = [ "panels/search/SearchView.js", "panels/security/SecurityModel.js", "panels/security/SecurityPanel.js", + "panels/snippets/ModuleUIStrings.js", + "panels/snippets/ScriptSnippetFileSystem.js", + "panels/snippets/SnippetsQuickOpen.js", "panels/sources/AddSourceMapURLDialog.js", "panels/sources/BreakpointEditDialog.js", "panels/sources/CSSPlugin.js", @@ -517,9 +520,6 @@ all_typescript_module_sources = [ "settings/FrameworkIgnoreListSettingsTab.js", "settings/KeybindsSettingsTab.js", "settings/SettingsScreen.js", - "snippets/ModuleUIStrings.js", - "snippets/ScriptSnippetFileSystem.js", - "snippets/SnippetsQuickOpen.js", "theme_support/theme_support_impl.js", "third_party/acorn-loose/package/dist/acorn-loose.mjs", "third_party/acorn/package/dist/acorn.mjs", diff --git a/config/gni/devtools_grd_files.gni b/config/gni/devtools_grd_files.gni index 456208bb7b..7007b6427f 100644 --- a/config/gni/devtools_grd_files.gni +++ b/config/gni/devtools_grd_files.gni @@ -372,6 +372,9 @@ grd_files_release_sources = [ "front_end/panels/security/security-meta.js", "front_end/panels/security/security.js", "front_end/panels/security/security_module.js", + "front_end/panels/snippets/snippets-legacy.js", + "front_end/panels/snippets/snippets.js", + "front_end/panels/snippets/snippets_module.js", "front_end/panels/sources/sources-legacy.js", "front_end/panels/sources/sources-meta.js", "front_end/panels/sources/sources.js", @@ -380,9 +383,6 @@ grd_files_release_sources = [ "front_end/settings/settings-meta.js", "front_end/settings/settings.js", "front_end/settings/settings_module.js", - "front_end/snippets/snippets-legacy.js", - "front_end/snippets/snippets.js", - "front_end/snippets/snippets_module.js", "front_end/theme_support/theme_support.js", "front_end/third_party/acorn/acorn.js", "front_end/third_party/chromium/client-variations/client-variations.js", @@ -934,6 +934,9 @@ grd_files_debug_sources = [ "front_end/panels/search/SearchView.js", "front_end/panels/security/SecurityModel.js", "front_end/panels/security/SecurityPanel.js", + "front_end/panels/snippets/ModuleUIStrings.js", + "front_end/panels/snippets/ScriptSnippetFileSystem.js", + "front_end/panels/snippets/SnippetsQuickOpen.js", "front_end/panels/sources/AddSourceMapURLDialog.js", "front_end/panels/sources/BreakpointEditDialog.js", "front_end/panels/sources/CSSPlugin.js", @@ -972,9 +975,6 @@ grd_files_debug_sources = [ "front_end/settings/FrameworkIgnoreListSettingsTab.js", "front_end/settings/KeybindsSettingsTab.js", "front_end/settings/SettingsScreen.js", - "front_end/snippets/ModuleUIStrings.js", - "front_end/snippets/ScriptSnippetFileSystem.js", - "front_end/snippets/SnippetsQuickOpen.js", "front_end/theme_support/theme_support_impl.js", "front_end/third_party/acorn-loose/package/dist/acorn-loose.mjs", "front_end/third_party/acorn/package/dist/acorn.mjs", diff --git a/config/gni/devtools_module_entrypoints.gni b/config/gni/devtools_module_entrypoints.gni index f2aaba4d10..78c6025933 100644 --- a/config/gni/devtools_module_entrypoints.gni +++ b/config/gni/devtools_module_entrypoints.gni @@ -149,14 +149,14 @@ devtools_module_entrypoint_sources = [ "panels/security/security-legacy.js", "panels/security/security-meta.js", "panels/security/security.js", + "panels/snippets/snippets-legacy.js", + "panels/snippets/snippets.js", "panels/sources/sources-legacy.js", "panels/sources/sources-meta.js", "panels/sources/sources.js", "settings/settings-legacy.js", "settings/settings-meta.js", "settings/settings.js", - "snippets/snippets-legacy.js", - "snippets/snippets.js", "theme_support/theme_support.js", "third_party/acorn/acorn.js", "third_party/chromium/client-variations/client-variations.js", diff --git a/front_end/BUILD.gn b/front_end/BUILD.gn index 25042db74c..4156494f0f 100644 --- a/front_end/BUILD.gn +++ b/front_end/BUILD.gn @@ -50,7 +50,7 @@ group("front_end") { "panels/event_listeners:bundle", "panels/screencast:bundle", "panels/search:bundle", - "snippets:bundle", + "panels/snippets:bundle", "theme_support:bundle", "third_party/diff:bundle", "third_party/lighthouse", @@ -130,9 +130,9 @@ group("legacy_entrypoints") { "panels/profiler:legacy", "panels/search:legacy", "panels/security:legacy", + "panels/snippets:legacy", "panels/sources:legacy", "settings:legacy", - "snippets:legacy", "third_party/diff:legacy", "timeline:legacy", "ui/legacy:legacy", diff --git a/front_end/core/i18n/locales/en-US.json b/front_end/core/i18n/locales/en-US.json index cf9be278d3..46b83841c7 100644 --- a/front_end/core/i18n/locales/en-US.json +++ b/front_end/core/i18n/locales/en-US.json @@ -8156,6 +8156,18 @@ "panels/security/SecurityPanel.ts | yourPageRequestedNonsecure": { "message": "Your page requested non-secure resources that were blocked." }, + "panels/snippets/ScriptSnippetFileSystem.ts | linkedTo": { + "message": "Linked to {PH1}" + }, + "panels/snippets/ScriptSnippetFileSystem.ts | scriptSnippet": { + "message": "Script snippet #{PH1}" + }, + "panels/snippets/SnippetsQuickOpen.ts | noSnippetsFound": { + "message": "No snippets found." + }, + "panels/snippets/SnippetsQuickOpen.ts | runSnippet": { + "message": "Run snippet" + }, "panels/sources/AddSourceMapURLDialog.ts | add": { "message": "Add" }, @@ -9104,18 +9116,6 @@ "settings/SettingsScreen.ts | warning": { "message": "WARNING:" }, - "snippets/ScriptSnippetFileSystem.ts | linkedTo": { - "message": "Linked to {PH1}" - }, - "snippets/ScriptSnippetFileSystem.ts | scriptSnippet": { - "message": "Script snippet #{PH1}" - }, - "snippets/SnippetsQuickOpen.ts | noSnippetsFound": { - "message": "No snippets found." - }, - "snippets/SnippetsQuickOpen.ts | runSnippet": { - "message": "Run snippet" - }, "timeline/CountersGraph.ts | documents": { "message": "Documents" }, diff --git a/front_end/core/i18n/locales/en-XL.json b/front_end/core/i18n/locales/en-XL.json index a1ea20fd75..8bee803c69 100644 --- a/front_end/core/i18n/locales/en-XL.json +++ b/front_end/core/i18n/locales/en-XL.json @@ -8156,6 +8156,18 @@ "panels/security/SecurityPanel.ts | yourPageRequestedNonsecure": { "message": "Ŷóûŕ p̂áĝé r̂éq̂úêśt̂éd̂ ńôń-ŝéĉúr̂é r̂éŝóûŕĉéŝ t́ĥát̂ ẃêŕê b́l̂óĉḱêd́." }, + "panels/snippets/ScriptSnippetFileSystem.ts | linkedTo": { + "message": "L̂ín̂ḱêd́ t̂ó {PH1}" + }, + "panels/snippets/ScriptSnippetFileSystem.ts | scriptSnippet": { + "message": "Ŝćr̂íp̂t́ ŝńîṕp̂ét̂ #{PH1}" + }, + "panels/snippets/SnippetsQuickOpen.ts | noSnippetsFound": { + "message": "N̂ó ŝńîṕp̂ét̂ś f̂óûńd̂." + }, + "panels/snippets/SnippetsQuickOpen.ts | runSnippet": { + "message": "R̂ún̂ śn̂íp̂ṕêt́" + }, "panels/sources/AddSourceMapURLDialog.ts | add": { "message": "Âd́d̂" }, @@ -9104,18 +9116,6 @@ "settings/SettingsScreen.ts | warning": { "message": "ŴÁR̂ŃÎŃĜ:" }, - "snippets/ScriptSnippetFileSystem.ts | linkedTo": { - "message": "L̂ín̂ḱêd́ t̂ó {PH1}" - }, - "snippets/ScriptSnippetFileSystem.ts | scriptSnippet": { - "message": "Ŝćr̂íp̂t́ ŝńîṕp̂ét̂ #{PH1}" - }, - "snippets/SnippetsQuickOpen.ts | noSnippetsFound": { - "message": "N̂ó ŝńîṕp̂ét̂ś f̂óûńd̂." - }, - "snippets/SnippetsQuickOpen.ts | runSnippet": { - "message": "R̂ún̂ śn̂íp̂ṕêt́" - }, "timeline/CountersGraph.ts | documents": { "message": "D̂óĉúm̂én̂t́ŝ" }, diff --git a/front_end/core/root/Runtime.ts b/front_end/core/root/Runtime.ts index 561f2dbab6..2081ed1c61 100644 --- a/front_end/core/root/Runtime.ts +++ b/front_end/core/root/Runtime.ts @@ -47,6 +47,7 @@ export const mappingForLayoutTests = new Map([ ['panels/application', 'resources'], ['panels/search', 'search'], ['panels/sources', 'sources'], + ['panels/snippets', 'snippets'], ['models/persistence', 'persistence'], ['third_party/diff', 'diff'], ['ui/legacy/components/inline_editor', 'inline_editor'], diff --git a/front_end/entrypoints/shell/shell.json b/front_end/entrypoints/shell/shell.json index 0f6b2ba554..f5f24ac8ff 100644 --- a/front_end/entrypoints/shell/shell.json +++ b/front_end/entrypoints/shell/shell.json @@ -23,7 +23,7 @@ { "name": "ui/legacy/components/quick_open" }, { "name": "panels/search" }, { "name": "settings" }, - { "name": "snippets" }, + { "name": "panels/snippets" }, { "name": "ui/legacy/components/source_frame" }, { "name": "panels/sources" }, { "name": "ui/legacy/components/text_editor" }, diff --git a/front_end/main/BUILD.gn b/front_end/main/BUILD.gn index 9c22ce4da3..0991ba6ee0 100644 --- a/front_end/main/BUILD.gn +++ b/front_end/main/BUILD.gn @@ -27,7 +27,7 @@ devtools_module("main") { "../models/persistence:bundle", "../models/recorder:bundle", "../models/workspace:bundle", - "../snippets:bundle", + "../panels/snippets:bundle", "../theme_support:bundle", "../timeline:bundle", "../ui/legacy:bundle", diff --git a/front_end/main/MainImpl.ts b/front_end/main/MainImpl.ts index 657b9ff899..110957112d 100644 --- a/front_end/main/MainImpl.ts +++ b/front_end/main/MainImpl.ts @@ -49,7 +49,7 @@ import * as Logs from '../models/logs/logs.js'; import * as Persistence from '../models/persistence/persistence.js'; import * as Recorder from '../models/recorder/recorder.js'; import * as Workspace from '../models/workspace/workspace.js'; -import * as Snippets from '../snippets/snippets.js'; +import * as Snippets from '../panels/snippets/snippets.js'; import * as ThemeSupport from '../theme_support/theme_support.js'; import * as Timeline from '../timeline/timeline.js'; import * as PerfUI from '../ui/legacy/components/perf_ui/perf_ui.js'; diff --git a/front_end/panels/changes/BUILD.gn b/front_end/panels/changes/BUILD.gn index 89f50488e1..8dcc10717a 100644 --- a/front_end/panels/changes/BUILD.gn +++ b/front_end/panels/changes/BUILD.gn @@ -17,7 +17,7 @@ devtools_module("changes") { "../../core/common:bundle", "../../core/i18n:bundle", "../../models/workspace:bundle", - "../../snippets:bundle", + "../../panels/snippets:bundle", "../../third_party/diff:bundle", "../../ui/legacy:bundle", "../../ui/legacy/components/text_editor:bundle", diff --git a/front_end/panels/changes/ChangesSidebar.ts b/front_end/panels/changes/ChangesSidebar.ts index 6eb5c999b8..55cfa4df9d 100644 --- a/front_end/panels/changes/ChangesSidebar.ts +++ b/front_end/panels/changes/ChangesSidebar.ts @@ -7,9 +7,9 @@ import * as Common from '../../core/common/common.js'; import * as i18n from '../../core/i18n/i18n.js'; import * as Platform from '../../core/platform/platform.js'; import * as Workspace from '../../models/workspace/workspace.js'; -import * as Snippets from '../../snippets/snippets.js'; import * as UI from '../../ui/legacy/legacy.js'; import * as WorkspaceDiff from '../../workspace_diff/workspace_diff.js'; +import * as Snippets from '../snippets/snippets.js'; const UIStrings = { /** diff --git a/front_end/panels/changes/module.json b/front_end/panels/changes/module.json index 07a91d04c2..8bb2fdd4cc 100644 --- a/front_end/panels/changes/module.json +++ b/front_end/panels/changes/module.json @@ -3,7 +3,7 @@ "workspace_diff", "ui/legacy/components/text_editor", "models/persistence", - "snippets", + "panels/snippets", "ui/legacy" ], "resources": [ diff --git a/front_end/snippets/BUILD.gn b/front_end/panels/snippets/BUILD.gn similarity index 57% rename from front_end/snippets/BUILD.gn rename to front_end/panels/snippets/BUILD.gn index c41c7dacdd..0c3643fd7a 100644 --- a/front_end/snippets/BUILD.gn +++ b/front_end/panels/snippets/BUILD.gn @@ -2,8 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("../../scripts/build/ninja/devtools_entrypoint.gni") -import("../../scripts/build/ninja/devtools_module.gni") +import("../../../scripts/build/ninja/devtools_entrypoint.gni") +import("../../../scripts/build/ninja/devtools_module.gni") devtools_module("snippets") { sources = [ @@ -13,13 +13,13 @@ devtools_module("snippets") { ] deps = [ - "../core/common:bundle", - "../core/i18n:bundle", - "../core/sdk:bundle", - "../models/persistence:bundle", - "../models/text_utils:bundle", - "../models/workspace:bundle", - "../ui/legacy/components/quick_open:bundle", + "../../core/common:bundle", + "../../core/i18n:bundle", + "../../core/sdk:bundle", + "../../models/persistence:bundle", + "../../models/text_utils:bundle", + "../../models/workspace:bundle", + "../../ui/legacy/components/quick_open:bundle", ] } diff --git a/front_end/snippets/ModuleUIStrings.ts b/front_end/panels/snippets/ModuleUIStrings.ts similarity index 51% rename from front_end/snippets/ModuleUIStrings.ts rename to front_end/panels/snippets/ModuleUIStrings.ts index 6866d1abdd..1c255938af 100644 --- a/front_end/snippets/ModuleUIStrings.ts +++ b/front_end/panels/snippets/ModuleUIStrings.ts @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import * as i18n from '../core/i18n/i18n.js'; -export const UIStrings = { -}; -i18n.i18n.registerUIStrings('snippets/ModuleUIStrings.ts', UIStrings); +import * as i18n from '../../core/i18n/i18n.js'; +export const UIStrings = {}; +i18n.i18n.registerUIStrings('panels/snippets/ModuleUIStrings.ts', UIStrings); diff --git a/front_end/snippets/OWNERS b/front_end/panels/snippets/OWNERS similarity index 100% rename from front_end/snippets/OWNERS rename to front_end/panels/snippets/OWNERS diff --git a/front_end/snippets/ScriptSnippetFileSystem.ts b/front_end/panels/snippets/ScriptSnippetFileSystem.ts similarity index 92% rename from front_end/snippets/ScriptSnippetFileSystem.ts rename to front_end/panels/snippets/ScriptSnippetFileSystem.ts index 3925e548a3..4e05075f31 100644 --- a/front_end/snippets/ScriptSnippetFileSystem.ts +++ b/front_end/panels/snippets/ScriptSnippetFileSystem.ts @@ -4,15 +4,15 @@ /* eslint-disable rulesdir/no_underscored_properties */ -import * as Common from '../core/common/common.js'; -import * as i18n from '../core/i18n/i18n.js'; -import * as Platform from '../core/platform/platform.js'; -import * as SDK from '../core/sdk/sdk.js'; -import * as Persistence from '../models/persistence/persistence.js'; +import * as Common from '../../core/common/common.js'; +import * as i18n from '../../core/i18n/i18n.js'; +import * as Platform from '../../core/platform/platform.js'; +import * as SDK from '../../core/sdk/sdk.js'; +import * as Persistence from '../../models/persistence/persistence.js'; -import type * as TextUtils from '../models/text_utils/text_utils.js'; -import * as UI from '../ui/legacy/legacy.js'; -import * as Workspace from '../models/workspace/workspace.js'; +import type * as TextUtils from '../../models/text_utils/text_utils.js'; +import * as UI from '../../ui/legacy/legacy.js'; +import * as Workspace from '../../models/workspace/workspace.js'; const UIStrings = { /** @@ -26,7 +26,7 @@ const UIStrings = { */ linkedTo: 'Linked to {PH1}', }; -const str_ = i18n.i18n.registerUIStrings('snippets/ScriptSnippetFileSystem.ts', UIStrings); +const str_ = i18n.i18n.registerUIStrings('panels/snippets/ScriptSnippetFileSystem.ts', UIStrings); const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_); function escapeSnippetName(name: string): string { diff --git a/front_end/snippets/SnippetsQuickOpen.ts b/front_end/panels/snippets/SnippetsQuickOpen.ts similarity index 88% rename from front_end/snippets/SnippetsQuickOpen.ts rename to front_end/panels/snippets/SnippetsQuickOpen.ts index 79377a0c55..869909350a 100644 --- a/front_end/snippets/SnippetsQuickOpen.ts +++ b/front_end/panels/snippets/SnippetsQuickOpen.ts @@ -4,9 +4,9 @@ /* eslint-disable rulesdir/no_underscored_properties */ -import * as i18n from '../core/i18n/i18n.js'; -import * as QuickOpen from '../ui/legacy/components/quick_open/quick_open.js'; -import type * as Workspace from '../models/workspace/workspace.js'; +import * as i18n from '../../core/i18n/i18n.js'; +import * as QuickOpen from '../../ui/legacy/components/quick_open/quick_open.js'; +import type * as Workspace from '../../models/workspace/workspace.js'; import {evaluateScriptSnippet, findSnippetsProject} from './ScriptSnippetFileSystem.js'; @@ -20,7 +20,7 @@ const UIStrings = { */ runSnippet: 'Run snippet', }; -const str_ = i18n.i18n.registerUIStrings('snippets/SnippetsQuickOpen.ts', UIStrings); +const str_ = i18n.i18n.registerUIStrings('panels/snippets/SnippetsQuickOpen.ts', UIStrings); const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_); const i18nLazyString = i18n.i18n.getLazilyComputedLocalizedString.bind(undefined, str_); diff --git a/front_end/snippets/module.json b/front_end/panels/snippets/module.json similarity index 100% rename from front_end/snippets/module.json rename to front_end/panels/snippets/module.json diff --git a/front_end/snippets/snippets-legacy.ts b/front_end/panels/snippets/snippets-legacy.ts similarity index 100% rename from front_end/snippets/snippets-legacy.ts rename to front_end/panels/snippets/snippets-legacy.ts diff --git a/front_end/snippets/snippets.ts b/front_end/panels/snippets/snippets.ts similarity index 100% rename from front_end/snippets/snippets.ts rename to front_end/panels/snippets/snippets.ts diff --git a/front_end/panels/sources/BUILD.gn b/front_end/panels/sources/BUILD.gn index d0c59edd4d..fb62993102 100644 --- a/front_end/panels/sources/BUILD.gn +++ b/front_end/panels/sources/BUILD.gn @@ -62,7 +62,7 @@ devtools_module("sources") { "../../panels/console_counters:bundle", "../../panels/coverage:bundle", "../../panels/search:bundle", - "../../snippets:bundle", + "../../panels/snippets:bundle", "../../third_party/diff:bundle", "../../ui/components/linear_memory_inspector:bundle", "../../ui/legacy:bundle", diff --git a/front_end/panels/sources/JavaScriptCompilerPlugin.ts b/front_end/panels/sources/JavaScriptCompilerPlugin.ts index f94415987c..c9bdd110fc 100644 --- a/front_end/panels/sources/JavaScriptCompilerPlugin.ts +++ b/front_end/panels/sources/JavaScriptCompilerPlugin.ts @@ -7,9 +7,9 @@ import * as SDK from '../../core/sdk/sdk.js'; import * as Bindings from '../../models/bindings/bindings.js'; import * as Workspace from '../../models/workspace/workspace.js'; -import * as Snippets from '../../snippets/snippets.js'; import * as SourceFrame from '../../ui/legacy/components/source_frame/source_frame.js'; // eslint-disable-line no-unused-vars import * as UI from '../../ui/legacy/legacy.js'; +import * as Snippets from '../snippets/snippets.js'; import {Plugin} from './Plugin.js'; diff --git a/front_end/panels/sources/NavigatorView.ts b/front_end/panels/sources/NavigatorView.ts index f7c9a3d1ca..0bdf39d312 100644 --- a/front_end/panels/sources/NavigatorView.ts +++ b/front_end/panels/sources/NavigatorView.ts @@ -38,8 +38,8 @@ import * as SDK from '../../core/sdk/sdk.js'; import * as Bindings from '../../models/bindings/bindings.js'; import * as Persistence from '../../models/persistence/persistence.js'; import * as Workspace from '../../models/workspace/workspace.js'; -import * as Snippets from '../../snippets/snippets.js'; import * as UI from '../../ui/legacy/legacy.js'; +import * as Snippets from '../snippets/snippets.js'; import {SearchSourcesView} from './SearchSourcesView.js'; diff --git a/front_end/panels/sources/SnippetsPlugin.ts b/front_end/panels/sources/SnippetsPlugin.ts index ac7b7db06e..a47ee7d15d 100644 --- a/front_end/panels/sources/SnippetsPlugin.ts +++ b/front_end/panels/sources/SnippetsPlugin.ts @@ -7,9 +7,9 @@ import * as Host from '../../core/host/host.js'; import * as i18n from '../../core/i18n/i18n.js'; import * as Workspace from '../../models/workspace/workspace.js'; // eslint-disable-line no-unused-vars -import * as Snippets from '../../snippets/snippets.js'; import * as SourceFrame from '../../ui/legacy/components/source_frame/source_frame.js'; // eslint-disable-line no-unused-vars import * as UI from '../../ui/legacy/legacy.js'; +import * as Snippets from '../snippets/snippets.js'; import {Plugin} from './Plugin.js'; diff --git a/front_end/panels/sources/SourcesNavigator.ts b/front_end/panels/sources/SourcesNavigator.ts index 7224ff64ec..c19fa43780 100644 --- a/front_end/panels/sources/SourcesNavigator.ts +++ b/front_end/panels/sources/SourcesNavigator.ts @@ -37,8 +37,8 @@ import * as SDK from '../../core/sdk/sdk.js'; import * as Persistence from '../../models/persistence/persistence.js'; import * as Recorder from '../../models/recorder/recorder.js'; import * as Workspace from '../../models/workspace/workspace.js'; -import * as Snippets from '../../snippets/snippets.js'; import * as UI from '../../ui/legacy/legacy.js'; +import * as Snippets from '../snippets/snippets.js'; import {NavigatorUISourceCodeTreeNode, NavigatorView} from './NavigatorView.js'; // eslint-disable-line no-unused-vars diff --git a/front_end/panels/sources/SourcesPanel.ts b/front_end/panels/sources/SourcesPanel.ts index eea22e2c35..2218b613a7 100644 --- a/front_end/panels/sources/SourcesPanel.ts +++ b/front_end/panels/sources/SourcesPanel.ts @@ -39,9 +39,9 @@ import * as Bindings from '../../models/bindings/bindings.js'; import * as Extensions from '../../models/extensions/extensions.js'; import * as Recorder from '../../models/recorder/recorder.js'; import * as Workspace from '../../models/workspace/workspace.js'; -import * as Snippets from '../../snippets/snippets.js'; import * as ObjectUI from '../../ui/legacy/components/object_ui/object_ui.js'; import * as UI from '../../ui/legacy/legacy.js'; +import * as Snippets from '../snippets/snippets.js'; import {CallStackSidebarPane} from './CallStackSidebarPane.js'; import {DebuggerPausedMessage} from './DebuggerPausedMessage.js'; diff --git a/front_end/panels/sources/TabbedEditorContainer.ts b/front_end/panels/sources/TabbedEditorContainer.ts index 3e96f61452..4e66899a47 100644 --- a/front_end/panels/sources/TabbedEditorContainer.ts +++ b/front_end/panels/sources/TabbedEditorContainer.ts @@ -37,9 +37,9 @@ import * as Extensions from '../../models/extensions/extensions.js'; import * as Persistence from '../../models/persistence/persistence.js'; import * as TextUtils from '../../models/text_utils/text_utils.js'; import * as Workspace from '../../models/workspace/workspace.js'; -import * as Snippets from '../../snippets/snippets.js'; import * as SourceFrame from '../../ui/legacy/components/source_frame/source_frame.js'; import * as UI from '../../ui/legacy/legacy.js'; +import * as Snippets from '../snippets/snippets.js'; import {SourcesView} from './SourcesView.js'; import {UISourceCodeFrame} from './UISourceCodeFrame.js'; diff --git a/front_end/panels/sources/module.json b/front_end/panels/sources/module.json index e22f50fef4..cbb94d80d5 100644 --- a/front_end/panels/sources/module.json +++ b/front_end/panels/sources/module.json @@ -3,7 +3,7 @@ "components", "panels/search", "ui/legacy/components/source_frame", - "snippets", + "panels/snippets", "models/extensions", "models/persistence", "ui/legacy/components/quick_open",