Commit 3b39cdf5 authored by einbinder's avatar einbinder Committed by Commit bot

DevTools: Move CodeMirrorTextEditor into text_editor module

This is in preperation for CodeMirror-based console

BUG=607690
NOTRY=true

Review-Url: https://codereview.chromium.org/2271683003
Cr-Commit-Position: refs/heads/master@{#414740}
parent f2a06ae7
...@@ -49,6 +49,7 @@ Loaded modules: ...@@ -49,6 +49,7 @@ Loaded modules:
snippets snippets
source_frame source_frame
sources sources
text_editor
ui ui
ui_lazy ui_lazy
workspace workspace
...@@ -72,6 +73,7 @@ Loaded modules: ...@@ -72,6 +73,7 @@ Loaded modules:
snippets snippets
source_frame source_frame
sources sources
text_editor
ui ui
ui_lazy ui_lazy
workspace workspace
...@@ -95,6 +97,7 @@ Loaded modules: ...@@ -95,6 +97,7 @@ Loaded modules:
snippets snippets
source_frame source_frame
sources sources
text_editor
ui ui
ui_lazy ui_lazy
workspace workspace
......
...@@ -53,6 +53,7 @@ devtools_modules_js_files = ...@@ -53,6 +53,7 @@ devtools_modules_js_files =
gypi_values.devtools_source_frame_js_files + gypi_values.devtools_source_frame_js_files +
gypi_values.devtools_sources_js_files + gypi_values.devtools_sources_js_files +
gypi_values.devtools_temp_storage_shared_worker_js_files + gypi_values.devtools_temp_storage_shared_worker_js_files +
gypi_values.devtools_text_editor_js_files +
gypi_values.devtools_timeline_model_js_files + gypi_values.devtools_timeline_model_js_files +
gypi_values.devtools_timeline_js_files + gypi_values.devtools_timeline_js_files +
gypi_values.devtools_ui_lazy_js_files gypi_values.devtools_ui_lazy_js_files
...@@ -161,6 +162,7 @@ action("generate_devtools_grd") { ...@@ -161,6 +162,7 @@ action("generate_devtools_grd") {
resources_out_dir + "snippets/snippets_module.js", resources_out_dir + "snippets/snippets_module.js",
resources_out_dir + "source_frame/source_frame_module.js", resources_out_dir + "source_frame/source_frame_module.js",
resources_out_dir + "sources/sources_module.js", resources_out_dir + "sources/sources_module.js",
resources_out_dir + "text_editor/text_editor_module.js",
resources_out_dir + "timeline_model/timeline_model_module.js", resources_out_dir + "timeline_model/timeline_model_module.js",
resources_out_dir + "timeline/timeline_module.js", resources_out_dir + "timeline/timeline_module.js",
resources_out_dir + "ui_lazy/ui_lazy_module.js", resources_out_dir + "ui_lazy/ui_lazy_module.js",
...@@ -298,6 +300,7 @@ action("build_applications") { ...@@ -298,6 +300,7 @@ action("build_applications") {
resources_out_dir + "snippets/snippets_module.js", resources_out_dir + "snippets/snippets_module.js",
resources_out_dir + "source_frame/source_frame_module.js", resources_out_dir + "source_frame/source_frame_module.js",
resources_out_dir + "sources/sources_module.js", resources_out_dir + "sources/sources_module.js",
resources_out_dir + "text_editor/text_editor_module.js",
resources_out_dir + "timeline_model/timeline_model_module.js", resources_out_dir + "timeline_model/timeline_model_module.js",
resources_out_dir + "timeline/timeline_module.js", resources_out_dir + "timeline/timeline_module.js",
resources_out_dir + "ui_lazy/ui_lazy_module.js", resources_out_dir + "ui_lazy/ui_lazy_module.js",
......
...@@ -124,6 +124,7 @@ ...@@ -124,6 +124,7 @@
'<(PRODUCT_DIR)/resources/inspector/snippets/snippets_module.js', '<(PRODUCT_DIR)/resources/inspector/snippets/snippets_module.js',
'<(PRODUCT_DIR)/resources/inspector/source_frame/source_frame_module.js', '<(PRODUCT_DIR)/resources/inspector/source_frame/source_frame_module.js',
'<(PRODUCT_DIR)/resources/inspector/sources/sources_module.js', '<(PRODUCT_DIR)/resources/inspector/sources/sources_module.js',
'<(PRODUCT_DIR)/resources/inspector/text_editor/text_editor_module.js',
'<(PRODUCT_DIR)/resources/inspector/timeline_model/timeline_model_module.js', '<(PRODUCT_DIR)/resources/inspector/timeline_model/timeline_model_module.js',
'<(PRODUCT_DIR)/resources/inspector/timeline/timeline_module.js', '<(PRODUCT_DIR)/resources/inspector/timeline/timeline_module.js',
'<(PRODUCT_DIR)/resources/inspector/ui_lazy/ui_lazy_module.js', '<(PRODUCT_DIR)/resources/inspector/ui_lazy/ui_lazy_module.js',
...@@ -298,6 +299,7 @@ ...@@ -298,6 +299,7 @@
'<(_output_path)/snippets/snippets_module.js', '<(_output_path)/snippets/snippets_module.js',
'<(_output_path)/source_frame/source_frame_module.js', '<(_output_path)/source_frame/source_frame_module.js',
'<(_output_path)/sources/sources_module.js', '<(_output_path)/sources/sources_module.js',
'<(_output_path)/text_editor/text_editor_module.js',
'<(_output_path)/timeline/timeline_module.js', '<(_output_path)/timeline/timeline_module.js',
'<(_output_path)/timeline_model/timeline_model_module.js', '<(_output_path)/timeline_model/timeline_model_module.js',
'<(_output_path)/ui_lazy/ui_lazy_module.js', '<(_output_path)/ui_lazy/ui_lazy_module.js',
......
...@@ -367,6 +367,7 @@ ...@@ -367,6 +367,7 @@
'front_end/sources/module.json', 'front_end/sources/module.json',
'front_end/snippets/module.json', 'front_end/snippets/module.json',
'front_end/temp_storage_shared_worker/module.json', 'front_end/temp_storage_shared_worker/module.json',
'front_end/text_editor/module.json',
'front_end/timeline_model/module.json', 'front_end/timeline_model/module.json',
'front_end/timeline/module.json', 'front_end/timeline/module.json',
'front_end/toolbox_bootstrap/module.json', 'front_end/toolbox_bootstrap/module.json',
...@@ -660,17 +661,13 @@ ...@@ -660,17 +661,13 @@
'front_end/settings/SettingsScreen.js', 'front_end/settings/SettingsScreen.js',
], ],
'devtools_source_frame_js_files': [ 'devtools_source_frame_js_files': [
'front_end/source_frame/cmdevtools.css',
'front_end/source_frame/fontView.css', 'front_end/source_frame/fontView.css',
'front_end/source_frame/imageView.css', 'front_end/source_frame/imageView.css',
'front_end/source_frame/CodeMirrorTextEditor.js',
'front_end/source_frame/SourcesTextEditor.js', 'front_end/source_frame/SourcesTextEditor.js',
'front_end/source_frame/CodeMirrorUtils.js',
'front_end/source_frame/FontView.js', 'front_end/source_frame/FontView.js',
'front_end/source_frame/ImageView.js', 'front_end/source_frame/ImageView.js',
'front_end/source_frame/ResourceSourceFrame.js', 'front_end/source_frame/ResourceSourceFrame.js',
'front_end/source_frame/SourceFrame.js', 'front_end/source_frame/SourceFrame.js',
'front_end/source_frame/TextEditorAutocompleteController.js',
], ],
'devtools_sources_js_files': [ 'devtools_sources_js_files': [
'front_end/sources/navigatorView.css', 'front_end/sources/navigatorView.css',
...@@ -724,6 +721,12 @@ ...@@ -724,6 +721,12 @@
'devtools_temp_storage_shared_worker_js_files': [ 'devtools_temp_storage_shared_worker_js_files': [
'front_end/temp_storage_shared_worker/TempStorageSharedWorker.js', 'front_end/temp_storage_shared_worker/TempStorageSharedWorker.js',
], ],
'devtools_text_editor_js_files':[
'front_end/text_editor/cmdevtools.css',
'front_end/text_editor/CodeMirrorTextEditor.js',
'front_end/text_editor/CodeMirrorUtils.js',
'front_end/text_editor/TextEditorAutocompleteController.js'
],
'devtools_timeline_model_js_files': [ 'devtools_timeline_model_js_files': [
'front_end/timeline_model/LayerTreeModel.js', 'front_end/timeline_model/LayerTreeModel.js',
'front_end/timeline_model/TimelineFrameModel.js', 'front_end/timeline_model/TimelineFrameModel.js',
...@@ -829,6 +832,7 @@ ...@@ -829,6 +832,7 @@
'<@(devtools_sources_js_files)', '<@(devtools_sources_js_files)',
'<@(devtools_snippets_js_files)', '<@(devtools_snippets_js_files)',
'<@(devtools_temp_storage_shared_worker_js_files)', '<@(devtools_temp_storage_shared_worker_js_files)',
'<@(devtools_text_editor_js_files)',
'<@(devtools_timeline_model_js_files)', '<@(devtools_timeline_model_js_files)',
'<@(devtools_timeline_js_files)', '<@(devtools_timeline_js_files)',
'<@(devtools_ui_lazy_js_files)', '<@(devtools_ui_lazy_js_files)',
......
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
} }
], ],
"dependencies": [ "dependencies": [
"source_frame" "text_editor"
], ],
"scripts": [ "scripts": [
"DefaultCodeMirrorMimeMode.js" "DefaultCodeMirrorMimeMode.js"
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
{ "name": "security", "condition": "!v8only" }, { "name": "security", "condition": "!v8only" },
{ "name": "console" }, { "name": "console" },
{ "name": "source_frame" }, { "name": "source_frame" },
{ "name": "text_editor" },
{ "name": "cm_modes", "type": "remoteInRelease" }, { "name": "cm_modes", "type": "remoteInRelease" },
{ "name": "settings" }, { "name": "settings" },
{ "name": "layers", "condition": "!v8only" }, { "name": "layers", "condition": "!v8only" },
......
{ {
"extensions": [ "extensions": [
{
"type": "@WebInspector.InplaceEditor",
"className": "WebInspector.CodeMirrorUtils"
},
{
"type": "@WebInspector.TokenizerFactory",
"className": "WebInspector.CodeMirrorUtils.TokenizerFactory"
},
{ {
"type": "setting", "type": "setting",
"category": "Sources", "category": "Sources",
...@@ -24,54 +16,17 @@ ...@@ -24,54 +16,17 @@
} }
], ],
"dependencies": [ "dependencies": [
"components" "components",
"text_editor"
], ],
"scripts": [ "scripts": [
"../cm/codemirror.js",
"../cm/css.js",
"../cm/javascript.js",
"../cm/simple.js",
"../cm/xml.js",
"../cm/multiplex.js",
"../cm/htmlmixed.js",
"../cm/htmlembedded.js",
"../cm/matchbrackets.js",
"../cm/closebrackets.js",
"../cm/markselection.js",
"../cm/comment.js",
"../cm/overlay.js",
"../cm/activeline.js",
"CodeMirrorUtils.js",
"TextEditorAutocompleteController.js",
"CodeMirrorTextEditor.js",
"SourcesTextEditor.js", "SourcesTextEditor.js",
"FontView.js", "FontView.js",
"ImageView.js", "ImageView.js",
"SourceFrame.js", "SourceFrame.js",
"ResourceSourceFrame.js" "ResourceSourceFrame.js"
], ],
"skip_compilation": [
"../cm/codemirror.js",
"../cm/css.js",
"../cm/javascript.js",
"../cm/simple.js",
"../cm/xml.js",
"../cm/multiplex.js",
"../cm/htmlmixed.js",
"../cm/htmlembedded.js",
"../cm/matchbrackets.js",
"../cm/closebrackets.js",
"../cm/markselection.js",
"../cm/comment.js",
"../cm/overlay.js",
"../cm/activeline.js"
],
"resources": [ "resources": [
"../cm/codemirror.css",
"cmdevtools.css",
"fontView.css", "fontView.css",
"imageView.css" "imageView.css"
] ]
......
...@@ -39,7 +39,7 @@ WebInspector.CodeMirrorTextEditor = function() ...@@ -39,7 +39,7 @@ WebInspector.CodeMirrorTextEditor = function()
this._gutters = ["CodeMirror-linenumbers"]; this._gutters = ["CodeMirror-linenumbers"];
this.registerRequiredCSS("cm/codemirror.css"); this.registerRequiredCSS("cm/codemirror.css");
this.registerRequiredCSS("source_frame/cmdevtools.css"); this.registerRequiredCSS("text_editor/cmdevtools.css");
WebInspector.CodeMirrorUtils.appendThemeStyle(this.element); WebInspector.CodeMirrorUtils.appendThemeStyle(this.element);
......
...@@ -214,7 +214,7 @@ WebInspector.CodeMirrorCSSLoadView = function() ...@@ -214,7 +214,7 @@ WebInspector.CodeMirrorCSSLoadView = function()
WebInspector.VBox.call(this); WebInspector.VBox.call(this);
this.element.classList.add("hidden"); this.element.classList.add("hidden");
this.registerRequiredCSS("cm/codemirror.css"); this.registerRequiredCSS("cm/codemirror.css");
this.registerRequiredCSS("source_frame/cmdevtools.css"); this.registerRequiredCSS("text_editor/cmdevtools.css");
WebInspector.CodeMirrorUtils.appendThemeStyle(this.element); WebInspector.CodeMirrorUtils.appendThemeStyle(this.element);
} }
......
{
"extensions": [
{
"type": "@WebInspector.InplaceEditor",
"className": "WebInspector.CodeMirrorUtils"
},
{
"type": "@WebInspector.TokenizerFactory",
"className": "WebInspector.CodeMirrorUtils.TokenizerFactory"
}
],
"dependencies": [
"components"
],
"scripts": [
"../cm/codemirror.js",
"../cm/css.js",
"../cm/javascript.js",
"../cm/simple.js",
"../cm/xml.js",
"../cm/multiplex.js",
"../cm/htmlmixed.js",
"../cm/htmlembedded.js",
"../cm/matchbrackets.js",
"../cm/closebrackets.js",
"../cm/markselection.js",
"../cm/comment.js",
"../cm/overlay.js",
"../cm/activeline.js",
"CodeMirrorUtils.js",
"TextEditorAutocompleteController.js",
"CodeMirrorTextEditor.js"
],
"skip_compilation": [
"../cm/codemirror.js",
"../cm/css.js",
"../cm/javascript.js",
"../cm/simple.js",
"../cm/xml.js",
"../cm/multiplex.js",
"../cm/htmlmixed.js",
"../cm/htmlembedded.js",
"../cm/matchbrackets.js",
"../cm/closebrackets.js",
"../cm/markselection.js",
"../cm/comment.js",
"../cm/overlay.js",
"../cm/activeline.js"
],
"resources": [
"../cm/codemirror.css",
"cmdevtools.css"
]
}
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment