Skip to content

Commit 154ae98

Browse files
committed
param isVariadic
1 parent 69c645e commit 154ae98

7 files changed

Lines changed: 5230 additions & 10671 deletions

File tree

package-lock.json

Lines changed: 5130 additions & 10586 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,17 @@
3232
"eslint-plugin-promise": "^4.2.1",
3333
"eslint-plugin-standard": "^4.0.1",
3434
"lodash": "^4.17.21",
35-
"nodemon": "^1.18.10",
35+
"node-sass": "^9.0.0",
36+
"nodemon": "^3.0.3",
3637
"npm-run-all": "^4.1.5",
3738
"rollup": "^1.4.1",
3839
"rollup-plugin-babel": "^4.3.2",
3940
"rollup-plugin-commonjs": "^9.2.2",
4041
"rollup-plugin-legacy": "^1.0.0",
4142
"rollup-plugin-node-resolve": "^4.0.1",
4243
"rollup-plugin-uglify": "^6.0.4",
43-
"stylelint": "^15.6.0",
44-
"stylelint-config-standard-scss": "^9.0.0"
44+
"stylelint": "^14.1.0",
45+
"stylelint-config-standard-scss": "^3.0.0"
4546
},
4647
"dependencies": {}
4748
}

rollup.config.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ var tasks = [
3636
// }),
3737
// nodePolyfills(),
3838
resolve({
39-
jsnext: true,
40-
main: true,
39+
// jsnext: true,
40+
// main: true,
41+
mainFields: ['jsnext:main'],
4142
browser: true,
4243
}),
4344
commonjs({
@@ -66,8 +67,9 @@ if (process.env.NODE_ENV !== 'watch') {
6667
// }),
6768
// nodePolyfills(),
6869
resolve({
69-
jsnext: true,
70-
main: true,
70+
// jsnext: true,
71+
// main: true,
72+
mainFields: ['jsnext:main'],
7173
browser: true,
7274
}),
7375
commonjs({

src/js/main.js

Lines changed: 75 additions & 69 deletions
Large diffs are not rendered by default.

src/js/main.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/js_src/Logger/DumpObject.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,17 +122,15 @@ DumpObject.prototype.dump = function (abs) {
122122
var dumpOpts = this.dumper.getDumpOpts()
123123
try {
124124
abs.debugVersion = this.dumper.getRequestInfo().$container.data('meta').debugVersion
125-
if (typeof abs.sort === 'undefined') {
126-
abs.sort = 'vis name'
127-
} else if (abs.sort === 'visibility') {
128-
if (versionCompare(abs.debugVersion, '3.2') === -1) {
129-
abs.sort = 'vis name'
130-
}
131-
}
132125
if (typeof abs.cfgFlags === 'undefined') {
133126
abs.cfgFlags = 0x1FFFFFF & ~this.BRIEF
134127
}
135128
abs = this.mergeInherited(abs)
129+
if (typeof abs.sort === 'undefined') {
130+
abs.sort = 'vis name'
131+
} else if (abs.sort === 'visibility' && versionCompare(abs.debugVersion, '3.2') === -1) {
132+
abs.sort = 'vis name'
133+
}
136134
if (typeof abs.implementsList === 'undefined') {
137135
// PhpDebugConsole < 3.1
138136
abs.implementsList = abs.implements

src/js_src/Logger/Object/Methods.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,19 @@ Methods.prototype.dumpParams = function (info, cfg) {
138138
}
139139

140140
Methods.prototype.dumpParamName = function (info, cfg, $param) {
141+
var name = info.name
142+
if (typeof info.isVariadic !== 'undefined') {
143+
name = [
144+
info.isPassedByReference ? '&' : '',
145+
info.isVariadic ? '...' : '',
146+
'$' + info.name,
147+
].join('')
148+
}
141149
$param.append('<span class="t_parameter-name"' +
142150
(cfg.phpDocOutput && info.desc !== null
143151
? ' title="' + info.desc.escapeHtml().replace('\n', ' ') + '"'
144152
: ''
145-
) + '>' + info.name.escapeHtml() + '</span>')
153+
) + '>' + name.escapeHtml() + '</span>')
146154
}
147155

148156
Methods.prototype.dumpParamDefault = function (defaultValue, $param) {

0 commit comments

Comments
 (0)