Bug 200691 – Web Inspector: Update Esprima to trunk (minor fixes)

• Component: Web Inspector
• Status: RESOLVED FIXED

[Joseph Pecoraro]

Update Esprima to trunk (minor fixes)

Suggesting master:
https://github.com/jquery/esprima/commit/5e55171feb5adbc2b1d28ef4b2628d5ea9af0848

Some minor fixes and changes:
- RestProperty => RestElement
- SpreadProperty => SpreadElement
- some "async" fixes

[Radar WebKit Bug Importer]

<rdar://problem/54276170>

[Joseph Pecoraro]

Created attachment 376219 [details]
[PATCH] Proposed Fix

[Devin Rousso]

Comment on attachment 376219 [details]
[PATCH] Proposed Fix

View in context: https://bugs.webkit.org/attachment.cgi?id=376219&action=review

rs=me

> Source/WebInspectorUI/ChangeLog:24
> +        - SpreadProperty => SpreadElement.
> +        - RestProperty => RestElement.

It seems more like `SpreadProperty`/`RestProperty` was merged into `SpreadElement`/`RestElement`, rather than a rename.  May be worth mentioning?

[Joseph Pecoraro]

(In reply to Devin Rousso from comment #3)
> Comment on attachment 376219 [details]
> [PATCH] Proposed Fix
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=376219&action=review
> 
> rs=me
> 
> > Source/WebInspectorUI/ChangeLog:24
> > +        - SpreadProperty => SpreadElement.
> > +        - RestProperty => RestElement.
> 
> It seems more like `SpreadProperty`/`RestProperty` was merged into
> `SpreadElement`/`RestElement`, rather than a rename.  May be worth
> mentioning?

They were the same thing with a different name. Now they are just the same thing.

[WebKit Commit Bot]

Comment on attachment 376219 [details]
[PATCH] Proposed Fix

Rejecting attachment 376219 [details] from commit-queue.

Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 376219, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Logging in as [e-mail]...
Fetching: https://bugs.webkit.org/attachment.cgi?id=376219&action=edit
Fetching: https://bugs.webkit.org/show_bug.cgi?id=200691&ctype=xml&excludefield=attachmentdata
Processing 1 patch from 1 bug.
Updating working directory
Processing patch 376219 from bug 200691.
Fetching: https://bugs.webkit.org/attachment.cgi?id=376219
Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	LayoutTests/ChangeLog
	M	LayoutTests/inspector/model/parse-script-syntax-tree-expected.txt
	M	LayoutTests/inspector/model/parse-script-syntax-tree.html
	M	Source/WebInspectorUI/ChangeLog
	M	Source/WebInspectorUI/UserInterface/External/Esprima/esprima.js
	M	Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js
	M	Source/WebInspectorUI/UserInterface/Workers/Formatter/ESTreeWalker.js
	M	Source/WebInspectorUI/UserInterface/Workers/Formatter/EsprimaFormatter.js

ERROR from SVN:
A repository hook failed: Commit blocked by pre-commit hook (exit code 1) with output:

    The following files contain tab characters:

        trunk/Source/WebInspectorUI/UserInterface/External/Esprima/esprima.js

    Please use spaces instead to indent.
    If you must commit a file with tabs, use svn propset to set the "allow-tabs" property.
W: 738da21a39f8ef42cd34568369bf0476eab356d2 and refs/remotes/origin/master differ, using rebase:
:040000 040000 a2606a1eb605a439182493b9b7ca161c6280121d 3553b61c78e6af3c708de29caacf28ce93cdbc29 M	LayoutTests
:040000 040000 ace9f9995967f92ba8cc115d49db77b2f574fe2d 9e565ad35cf15b58a84e791e99a364a0afd1ad2a M	Source
Current branch master is up to date.
ERROR: Not all changes have been committed into SVN, however the committed
ones (if any) seem to be successfully integrated into the working tree.
Please see the above messages for details.


Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	LayoutTests/ChangeLog
	M	LayoutTests/inspector/model/parse-script-syntax-tree-expected.txt
	M	LayoutTests/inspector/model/parse-script-syntax-tree.html
	M	Source/WebInspectorUI/ChangeLog
	M	Source/WebInspectorUI/UserInterface/External/Esprima/esprima.js
	M	Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js
	M	Source/WebInspectorUI/UserInterface/Workers/Formatter/ESTreeWalker.js
	M	Source/WebInspectorUI/UserInterface/Workers/Formatter/EsprimaFormatter.js

ERROR from SVN:
A repository hook failed: Commit blocked by pre-commit hook (exit code 1) with output:

    The following files contain tab characters:

        trunk/Source/WebInspectorUI/UserInterface/External/Esprima/esprima.js

    Please use spaces instead to indent.
    If you must commit a file with tabs, use svn propset to set the "allow-tabs" property.
W: 738da21a39f8ef42cd34568369bf0476eab356d2 and refs/remotes/origin/master differ, using rebase:
:040000 040000 a2606a1eb605a439182493b9b7ca161c6280121d 3553b61c78e6af3c708de29caacf28ce93cdbc29 M	LayoutTests
:040000 040000 ace9f9995967f92ba8cc115d49db77b2f574fe2d 9e565ad35cf15b58a84e791e99a364a0afd1ad2a M	Source
Current branch master is up to date.
ERROR: Not all changes have been committed into SVN, however the committed
ones (if any) seem to be successfully integrated into the working tree.
Please see the above messages for details.


Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit
Updating OpenSource
Current branch master is up to date.

Full output: https://webkit-queues.webkit.org/results/12911865

[Joseph Pecoraro]

https://trac.webkit.org/changeset/248732/webkit