Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (236708 => 236709)
--- trunk/Source/WebInspectorUI/ChangeLog 2018-10-02 02:15:02 UTC (rev 236708)
+++ trunk/Source/WebInspectorUI/ChangeLog 2018-10-02 02:27:11 UTC (rev 236709)
@@ -1,3 +1,21 @@
+2018-10-01 Devin Rousso <drou...@apple.com>
+
+ Web Inspector: remove analyzer manager
+ https://bugs.webkit.org/show_bug.cgi?id=190162
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Main.html:
+ * UserInterface/Base/Main.js:
+ (WI.loaded):
+
+ * UserInterface/Controllers/AnalyzerManager.js: Removed.
+ * UserInterface/Models/AnalyzerMessage.js: Removed.
+
+ * Scripts/copy-user-interface-resources.pl:
+ * UserInterface/External/ESLint/LICENSE: Removed.
+ * UserInterface/External/ESLint/eslint.js: Removed.
+
2018-10-01 Nikita Vasilyev <nvasil...@apple.com>
Web Inspector: Styles: add an experimental setting for multi-property selection
Modified: trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl (236708 => 236709)
--- trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2018-10-02 02:15:02 UTC (rev 236708)
+++ trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2018-10-02 02:27:11 UTC (rev 236709)
@@ -165,7 +165,6 @@
my $workersDir = File::Spec->catdir($targetResourcePath, 'Workers');
my $codeMirrorPath = File::Spec->catdir($uiRoot, 'External', 'CodeMirror');
my $esprimaPath = File::Spec->catdir($uiRoot, 'External', 'Esprima');
-my $eslintPath = File::Spec->catdir($uiRoot, 'External', 'ESLint');
my $threejsPath = File::Spec->catdir($uiRoot, 'External', 'three.js');
$webInspectorUIAdditionsDir = &webInspectorUIAdditionsDir();
@@ -172,7 +171,6 @@
my $codeMirrorLicense = readLicenseFile(File::Spec->catfile($codeMirrorPath, 'LICENSE'));
my $esprimaLicense = readLicenseFile(File::Spec->catfile($esprimaPath, 'LICENSE'));
-my $eslintLicense = readLicenseFile(File::Spec->catfile($eslintPath, 'LICENSE'));
my $threejsLicense = readLicenseFile(File::Spec->catfile($threejsPath, 'LICENSE'));
make_path($protocolDir, $targetResourcePath);
@@ -318,15 +316,6 @@
'--output-dir', $derivedSourcesDir,
'--output-script-name', 'Esprima.js');
- # Combine the ESLint _javascript_ files in Production builds into a single file (ESLint.js).
- system($perl, $combineResourcesCmd,
- '--input-dir', 'External/ESLint',
- '--input-html', $derivedSourcesMainHTML,
- '--input-html-dir', $uiRoot,
- '--derived-sources-dir', $derivedSourcesDir,
- '--output-dir', $derivedSourcesDir,
- '--output-script-name', 'ESLint.js');
-
# Combine the three.js _javascript_ files in Production builds into a single file (Three.js).
system($perl, $combineResourcesCmd,
'--input-dir', 'External/three.js',
@@ -372,10 +361,6 @@
my $targetEsprimaJS = File::Spec->catfile($targetResourcePath, 'Esprima.js');
seedFile($targetEsprimaJS, $esprimaLicense);
- # Export the license into ESLint.js.
- my $targetESLintJS = File::Spec->catfile($targetResourcePath, 'ESLint.js');
- seedFile($targetESLintJS, $eslintLicense);
-
# Export the license into Three.js.
my $targetThreejsJS = File::Spec->catfile($targetResourcePath, 'Three.js');
seedFile($targetThreejsJS, $threejsLicense);
@@ -396,10 +381,6 @@
my $derivedSourcesEsprimaJS = File::Spec->catfile($derivedSourcesDir, 'Esprima.js');
system(qq("$python" "$jsMinScript" < "$derivedSourcesEsprimaJS" >> "$targetEsprimaJS")) and die "Failed to minify $derivedSourcesEsprimaJS: $!";
- # Minify the ESLint.js file, appending to the license that was exported above.
- my $derivedSourcesESLintJS = File::Spec->catfile($derivedSourcesDir, 'ESLint.js');
- system(qq("$python" "$jsMinScript" < "$derivedSourcesESLintJS" >> "$targetESLintJS")) and die "Failed to minify $derivedSourcesESLintJS: $!";
-
# Minify the Three.js file, appending to the license that was exported above.
my $derivedSourcesThreejsJS = File::Spec->catfile($derivedSourcesDir, 'Three.js');
system(qq("$python" "$jsMinScript" < "$derivedSourcesThreejsJS" >> "$targetThreejsJS")) and die "Failed to minify $derivedSourcesThreejsJS: $!";
@@ -407,9 +388,6 @@
# Copy over the Images directory.
ditto(File::Spec->catdir($uiRoot, 'Images'), File::Spec->catdir($targetResourcePath, 'Images'));
- # Remove ESLint until needed: <https://webkit.org/b/136515> Web Inspector: _javascript_ source text editor should have a linter
- unlink $targetESLintJS;
-
# Copy the Protocol/Legacy and Workers directories.
ditto(File::Spec->catfile($uiRoot, 'Protocol', 'Legacy'), File::Spec->catfile($protocolDir, 'Legacy'));
ditto(File::Spec->catfile($uiRoot, 'Workers'), $workersDir);
Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (236708 => 236709)
--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2018-10-02 02:15:02 UTC (rev 236708)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2018-10-02 02:27:11 UTC (rev 236709)
@@ -116,7 +116,6 @@
this.cssStyleManager = new WI.CSSStyleManager;
this.logManager = new WI.LogManager;
this.issueManager = new WI.IssueManager;
- this.analyzerManager = new WI.AnalyzerManager;
this.runtimeManager = new WI.RuntimeManager;
this.heapManager = new WI.HeapManager;
this.memoryManager = new WI.MemoryManager;
Deleted: trunk/Source/WebInspectorUI/UserInterface/Controllers/AnalyzerManager.js (236708 => 236709)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/AnalyzerManager.js 2018-10-02 02:15:02 UTC (rev 236708)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/AnalyzerManager.js 2018-10-02 02:27:11 UTC (rev 236709)
@@ -1,122 +0,0 @@
-/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-WI.AnalyzerManager = class AnalyzerManager extends WI.Object
-{
- constructor()
- {
- super();
-
- this._eslintConfig = {
- env: {
- "browser": true,
- "node": false
- },
- globals: {
- "document": true
- },
- rules: {
- "consistent-return": 2,
- "curly": 0,
- "eqeqeq": 0,
- "new-parens": 0,
- "no-comma-dangle": 0,
- "no-console": 0,
- "no-constant-condition": 0,
- "no-extra-bind": 2,
- "no-extra-semi": 2,
- "no-proto": 0,
- "no-return-assign": 2,
- "no-trailing-spaces": 2,
- "no-underscore-dangle": 0,
- "no-unused-expressions": 2,
- "no-wrap-func": 2,
- "semi": 2,
- "space-infix-ops": 2,
- "space-return-throw-case": 2,
- "strict": 0,
- "valid-typeof": 2
- }
- };
-
- this._sourceCodeMessagesMap = new WeakMap;
-
- WI.SourceCode.addEventListener(WI.SourceCode.Event.ContentDidChange, this._handleSourceCodeContentDidChange, this);
- }
-
- // Public
-
- getAnalyzerMessagesForSourceCode(sourceCode)
- {
- return new Promise(function(resolve, reject) {
- var analyzer = WI.AnalyzerManager._typeAnalyzerMap.get(sourceCode.type);
- if (!analyzer) {
- reject(new Error("This resource type cannot be analyzed."));
- return;
- }
-
- if (this._sourceCodeMessagesMap.has(sourceCode)) {
- resolve(this._sourceCodeMessagesMap.get(sourceCode));
- return;
- }
-
- function retrieveAnalyzerMessages(properties)
- {
- var analyzerMessages = [];
- var rawAnalyzerMessages = analyzer.verify(sourceCode.content, this._eslintConfig);
-
- // Raw line and column numbers are one-based. SourceCodeLocation expects them to be zero-based so we subtract 1 from each.
- for (var rawAnalyzerMessage of rawAnalyzerMessages)
- analyzerMessages.push(new WI.AnalyzerMessage(new WI.SourceCodeLocation(sourceCode, rawAnalyzerMessage.line - 1, rawAnalyzerMessage.column - 1), rawAnalyzerMessage.message, rawAnalyzerMessage.ruleId));
-
- this._sourceCodeMessagesMap.set(sourceCode, analyzerMessages);
-
- resolve(analyzerMessages);
- }
-
- sourceCode.requestContent().then(retrieveAnalyzerMessages.bind(this)).catch(handlePromiseException);
- }.bind(this));
- }
-
- sourceCodeCanBeAnalyzed(sourceCode)
- {
- return sourceCode.type === WI.Resource.Type.Script;
- }
-
- // Private
-
- _handleSourceCodeContentDidChange(event)
- {
- var sourceCode = event.target;
-
- // Since sourceCode has changed, remove it and its messages from the map so getAnalyzerMessagesForSourceCode will have to reanalyze the next time it is called.
- this._sourceCodeMessagesMap.delete(sourceCode);
- }
-};
-
-WI.AnalyzerManager._typeAnalyzerMap = new Map;
-
-// <https://webkit.org/b/136515> Web Inspector: _javascript_ source text editor should have a linter
-// WI.AnalyzerManager._typeAnalyzerMap.set(WI.Resource.Type.Script, eslint);
Modified: trunk/Source/WebInspectorUI/UserInterface/Main.html (236708 => 236709)
--- trunk/Source/WebInspectorUI/UserInterface/Main.html 2018-10-02 02:15:02 UTC (rev 236708)
+++ trunk/Source/WebInspectorUI/UserInterface/Main.html 2018-10-02 02:27:11 UTC (rev 236709)
@@ -321,7 +321,6 @@
<script src=""
<script src=""
- <script src=""
<script src=""
<script src=""
<script src=""
@@ -774,7 +773,6 @@
<script src=""
<script src=""
- <script src=""
<script src=""
<script src=""
<script src=""
Deleted: trunk/Source/WebInspectorUI/UserInterface/Models/AnalyzerMessage.js (236708 => 236709)
--- trunk/Source/WebInspectorUI/UserInterface/Models/AnalyzerMessage.js 2018-10-02 02:15:02 UTC (rev 236708)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/AnalyzerMessage.js 2018-10-02 02:27:11 UTC (rev 236709)
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-WI.AnalyzerMessage = class AnalyzerMessage
-{
- constructor(sourceCodeLocation, text, ruleIdentifier)
- {
- console.assert(sourceCodeLocation instanceof WI.SourceCodeLocation);
- console.assert(typeof text === "string");
-
- this._sourceCodeLocation = sourceCodeLocation;
- this._text = text;
- this._ruleIdentifier = ruleIdentifier;
- }
-
- // Public
-
- get sourceCodeLocation() { return this._sourceCodeLocation; }
- get sourceCode() { return this._sourceCodeLocation.sourceCode; }
- get text() { return this._text; }
- get ruleIdentifier() { return this._ruleIdentifier; }
-};
Modified: trunk/Source/WebKit/ChangeLog (236708 => 236709)
--- trunk/Source/WebKit/ChangeLog 2018-10-02 02:15:02 UTC (rev 236708)
+++ trunk/Source/WebKit/ChangeLog 2018-10-02 02:27:11 UTC (rev 236709)
@@ -1,3 +1,13 @@
+2018-10-01 Devin Rousso <drou...@apple.com>
+
+ Web Inspector: remove analyzer manager
+ https://bugs.webkit.org/show_bug.cgi?id=190162
+
+ Reviewed by Joseph Pecoraro.
+
+ * InspectorGResources.cmake:
+ Remove eslint.
+
2018-09-30 Ryosuke Niwa <rn...@webkit.org>
Add a new variant of serializePreservingVisualAppearance which takes VisibleSelection
Modified: trunk/Source/WebKit/InspectorGResources.cmake (236708 => 236709)
--- trunk/Source/WebKit/InspectorGResources.cmake 2018-10-02 02:15:02 UTC (rev 236708)
+++ trunk/Source/WebKit/InspectorGResources.cmake 2018-10-02 02:27:11 UTC (rev 236709)
@@ -8,7 +8,6 @@
${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Debug/*.js
${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/CodeMirror/*.css
${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/CodeMirror/*.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/ESLint/*.js
${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/Esprima/*.js
${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/three.js/*.js
${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Models/*.js
