From 84cec8766db77062cc984c777dd716358ee8fd6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Donny/=EA=B0=95=EB=8F=99=EC=9C=A4?= Date: Sun, 8 Oct 2023 09:39:51 +0900 Subject: [PATCH] refactor(atoms): Remove usage of `js_word!` to drop `string-cache` (#7976) **Description:** This PR is to prepare removal of `string-cache`. Actually, this PR does not remove it. Instead, this PR only removes direct usages of `js_word!`s, especially in patterns. **Related issue:** - #4946. --- .cargo/config.toml | 28 +- bindings/binding_core_node/src/bundle.rs | 6 +- clippy.toml | 6 + crates/jsdoc/tests/fixtures/abstracttag.debug | 16 +- crates/jsdoc/tests/fixtures/accesstag.debug | 42 +- crates/jsdoc/tests/fixtures/alias.debug | 10 +- crates/jsdoc/tests/fixtures/alias2.debug | 8 +- crates/jsdoc/tests/fixtures/alias3.debug | 10 +- crates/jsdoc/tests/fixtures/alias4.debug | 16 +- crates/jsdoc/tests/fixtures/alias5.debug | 36 +- crates/jsdoc/tests/fixtures/alias6.debug | 14 +- .../jsdoc/tests/fixtures/aliasexports.debug | 18 +- crates/jsdoc/tests/fixtures/aliasglobal.debug | 6 +- .../jsdoc/tests/fixtures/aliasglobal2.debug | 15 +- .../jsdoc/tests/fixtures/aliasresolve.debug | 18 +- .../jsdoc/tests/fixtures/aliasresolve2.debug | 18 +- crates/jsdoc/tests/fixtures/also.debug | 55 +- crates/jsdoc/tests/fixtures/also2.debug | 17 +- .../jsdoc/tests/fixtures/anonymousclass.debug | 25 +- .../tests/fixtures/anonymousclassparam.debug | 8 +- .../jsdoc/tests/fixtures/arrowfunction.debug | 20 +- .../jsdoc/tests/fixtures/asyncfunction.debug | 31 +- crates/jsdoc/tests/fixtures/asynctag.debug | 10 +- crates/jsdoc/tests/fixtures/augmentall.debug | 25 +- crates/jsdoc/tests/fixtures/augmentall2.debug | 25 +- crates/jsdoc/tests/fixtures/augmentstag.debug | 39 +- .../jsdoc/tests/fixtures/augmentstag2.debug | 6 +- .../jsdoc/tests/fixtures/augmentstag3.debug | 22 +- .../jsdoc/tests/fixtures/augmentstag4.debug | 25 +- .../jsdoc/tests/fixtures/augmentstag5.debug | 52 +- .../jsdoc/tests/fixtures/augmentstag6.debug | 14 +- crates/jsdoc/tests/fixtures/authortag.debug | 16 +- crates/jsdoc/tests/fixtures/borrowstag.debug | 14 +- crates/jsdoc/tests/fixtures/borrowstag2.debug | 20 +- crates/jsdoc/tests/fixtures/callbacktag.debug | 16 +- .../jsdoc/tests/fixtures/classdesctag.debug | 26 +- .../tests/fixtures/classproperties.debug | 8 +- crates/jsdoc/tests/fixtures/classtag.debug | 4 +- crates/jsdoc/tests/fixtures/classtag2.debug | 61 +- .../tests/fixtures/classwithoutname.debug | 7 +- crates/jsdoc/tests/fixtures/constanttag.debug | 26 +- .../jsdoc/tests/fixtures/constanttag2.debug | 2 +- .../jsdoc/tests/fixtures/constructortag.debug | 20 +- .../jsdoc/tests/fixtures/constructstag.debug | 26 +- .../jsdoc/tests/fixtures/constructstag2.debug | 18 +- .../jsdoc/tests/fixtures/constructstag3.debug | 32 +- .../jsdoc/tests/fixtures/constructstag4.debug | 28 +- .../jsdoc/tests/fixtures/constructstag5.debug | 14 +- .../jsdoc/tests/fixtures/copyrighttag.debug | 6 +- .../jsdoc/tests/fixtures/defaultparams.debug | 101 +- .../jsdoc/tests/fixtures/defaultparams2.debug | 11 +- crates/jsdoc/tests/fixtures/defaulttag.debug | 66 +- crates/jsdoc/tests/fixtures/definetag.debug | 8 +- .../jsdoc/tests/fixtures/deprecatedtag.debug | 12 +- .../jsdoc/tests/fixtures/descriptiontag.debug | 13 +- .../jsdoc/tests/fixtures/destructuring.debug | 8 +- crates/jsdoc/tests/fixtures/dicttag.debug | 6 +- crates/jsdoc/tests/fixtures/doclet.debug | 25 +- .../jsdoc/tests/fixtures/emptycomments.debug | 12 +- crates/jsdoc/tests/fixtures/enumtag.debug | 24 +- crates/jsdoc/tests/fixtures/enumtag2.debug | 37 +- crates/jsdoc/tests/fixtures/enumtag3.debug | 10 +- .../jsdoc/tests/fixtures/eventfirestag.debug | 36 +- crates/jsdoc/tests/fixtures/eventorder.debug | 29 +- crates/jsdoc/tests/fixtures/exampletag.debug | 22 +- .../jsdoc/tests/fixtures/exceptiontag.debug | 26 +- crates/jsdoc/tests/fixtures/exportclass.debug | 11 +- .../jsdoc/tests/fixtures/exportdefault.debug | 10 +- .../tests/fixtures/exportdefaultclass.debug | 12 +- crates/jsdoc/tests/fixtures/exports.debug | 44 +- crates/jsdoc/tests/fixtures/exportstag.debug | 18 +- crates/jsdoc/tests/fixtures/exportstag2.debug | 12 +- crates/jsdoc/tests/fixtures/exportstag3.debug | 10 +- crates/jsdoc/tests/fixtures/exportstag4.debug | 12 +- crates/jsdoc/tests/fixtures/exportstag5.debug | 14 +- crates/jsdoc/tests/fixtures/exportstag6.debug | 19 +- crates/jsdoc/tests/fixtures/exportstag7.debug | 16 +- crates/jsdoc/tests/fixtures/exportstag8.debug | 6 +- crates/jsdoc/tests/fixtures/exporttag.debug | 16 +- crates/jsdoc/tests/fixtures/externaltag.debug | 42 +- .../jsdoc/tests/fixtures/externaltag2.debug | 18 +- .../jsdoc/tests/fixtures/externaltag3.debug | 37 +- crates/jsdoc/tests/fixtures/externstag.debug | 8 +- crates/jsdoc/tests/fixtures/file.debug | 10 +- .../tests/fixtures/fileoverviewtag.debug | 6 +- .../jsdoc/tests/fixtures/funcExpression.debug | 8 +- .../tests/fixtures/funcExpression2.debug | 8 +- .../tests/fixtures/funcExpression3.debug | 8 +- crates/jsdoc/tests/fixtures/functiontag.debug | 8 +- crates/jsdoc/tests/fixtures/generators.debug | 8 +- crates/jsdoc/tests/fixtures/getset.debug | 39 +- crates/jsdoc/tests/fixtures/getset2.debug | 15 +- crates/jsdoc/tests/fixtures/globaltag.debug | 12 +- .../tests/fixtures/hideconstructortag.debug | 78 +- crates/jsdoc/tests/fixtures/ignoretag.debug | 4 +- crates/jsdoc/tests/fixtures/ignoretag2.debug | 4 +- .../tests/fixtures/implicitcasttag.debug | 10 +- .../jsdoc/tests/fixtures/inheritdoctag.debug | 58 +- .../jsdoc/tests/fixtures/inlinecomment.debug | 4 +- .../tests/fixtures/inlineparamcomment.debug | 4 +- .../tests/fixtures/inlineparamcomment2.debug | 12 +- crates/jsdoc/tests/fixtures/inner.debug | 4 +- crates/jsdoc/tests/fixtures/innerscope.debug | 10 +- crates/jsdoc/tests/fixtures/innerscope2.debug | 10 +- .../tests/fixtures/instanceproperty.debug | 8 +- .../tests/fixtures/interface-implements.debug | 62 +- .../jsdoc/tests/fixtures/interfacetag2.debug | 8 +- .../jsdoc/tests/fixtures/interfacetag3.debug | 8 +- crates/jsdoc/tests/fixtures/kindtag.debug | 6 +- crates/jsdoc/tests/fixtures/lends.debug | 16 +- crates/jsdoc/tests/fixtures/lends2.debug | 16 +- crates/jsdoc/tests/fixtures/lends3.debug | 16 +- crates/jsdoc/tests/fixtures/lends4.debug | 14 +- crates/jsdoc/tests/fixtures/lends5.debug | 14 +- crates/jsdoc/tests/fixtures/lends6.debug | 28 +- crates/jsdoc/tests/fixtures/lendsglobal.debug | 14 +- crates/jsdoc/tests/fixtures/letkeyword.debug | 9 +- crates/jsdoc/tests/fixtures/licensetag.debug | 6 +- crates/jsdoc/tests/fixtures/linktag.debug | 22 +- crates/jsdoc/tests/fixtures/listenstag.debug | 46 +- crates/jsdoc/tests/fixtures/memberoftag.debug | 18 +- .../jsdoc/tests/fixtures/memberoftag2.debug | 12 +- .../jsdoc/tests/fixtures/memberoftag3.debug | 20 +- .../jsdoc/tests/fixtures/memberoftag4.debug | 21 +- .../jsdoc/tests/fixtures/memberoftag5.debug | 11 +- .../tests/fixtures/memberoftagforced.debug | 50 +- crates/jsdoc/tests/fixtures/membertag.debug | 32 +- .../tests/fixtures/methoddefinition.debug | 4 +- crates/jsdoc/tests/fixtures/mixintag.debug | 19 +- crates/jsdoc/tests/fixtures/mixintag2.debug | 56 +- crates/jsdoc/tests/fixtures/modifiestag.debug | 7 +- .../jsdoc/tests/fixtures/moduleclasses.debug | 20 +- crates/jsdoc/tests/fixtures/moduleinner.debug | 24 +- .../tests/fixtures/moduleisconstructor.debug | 35 +- .../tests/fixtures/moduleisconstructor2.debug | 32 +- .../tests/fixtures/moduleisfunction.debug | 18 +- .../tests/fixtures/modules/data/mod-1.debug | 8 +- .../tests/fixtures/modules/data/mod-2.debug | 8 +- .../tests/fixtures/modules/data/mod-3.debug | 18 +- crates/jsdoc/tests/fixtures/moduletag.debug | 14 +- crates/jsdoc/tests/fixtures/moduletag10.debug | 8 +- crates/jsdoc/tests/fixtures/moduletag11.debug | 15 +- crates/jsdoc/tests/fixtures/moduletag2.debug | 12 +- crates/jsdoc/tests/fixtures/moduletag3.debug | 32 +- crates/jsdoc/tests/fixtures/moduletag4.debug | 22 +- crates/jsdoc/tests/fixtures/moduletag5.debug | 8 +- crates/jsdoc/tests/fixtures/moduletag6.debug | 15 +- crates/jsdoc/tests/fixtures/moduletag7.debug | 10 +- crates/jsdoc/tests/fixtures/moduletag8.debug | 19 +- crates/jsdoc/tests/fixtures/moduletag9.debug | 8 +- .../jsdoc/tests/fixtures/namespacetag.debug | 22 +- crates/jsdoc/tests/fixtures/nametag.debug | 16 +- crates/jsdoc/tests/fixtures/noaliastag.debug | 6 +- .../jsdoc/tests/fixtures/nocollapsetag.debug | 11 +- .../jsdoc/tests/fixtures/nocompiletag.debug | 6 +- .../tests/fixtures/nosideeffectstag.debug | 7 +- .../tests/fixtures/numericpropertytag.debug | 22 +- crates/jsdoc/tests/fixtures/objectlit.debug | 6 +- crates/jsdoc/tests/fixtures/objectlit2.debug | 4 +- crates/jsdoc/tests/fixtures/objectlit3.debug | 8 +- crates/jsdoc/tests/fixtures/overridetag.debug | 58 +- .../jsdoc/tests/fixtures/overridetag2.debug | 55 +- crates/jsdoc/tests/fixtures/packagetag.debug | 6 +- crates/jsdoc/tests/fixtures/packagetag2.debug | 6 +- crates/jsdoc/tests/fixtures/paramtag.debug | 80 +- crates/jsdoc/tests/fixtures/paramtag2.debug | 22 +- .../tests/fixtures/paramtaginvalidtype.debug | 12 +- crates/jsdoc/tests/fixtures/plugins.debug | 12 +- .../tests/fixtures/polymerbehaviortag.debug | 6 +- crates/jsdoc/tests/fixtures/polymertag.debug | 7 +- crates/jsdoc/tests/fixtures/preservetag.debug | 6 +- crates/jsdoc/tests/fixtures/privatetag.debug | 8 +- crates/jsdoc/tests/fixtures/privatetag2.debug | 6 +- crates/jsdoc/tests/fixtures/projecttag.debug | 18 +- crates/jsdoc/tests/fixtures/propertytag.debug | 30 +- .../jsdoc/tests/fixtures/protectedtag.debug | 22 +- .../jsdoc/tests/fixtures/protectedtag2.debug | 13 +- crates/jsdoc/tests/fixtures/publictag.debug | 8 +- crates/jsdoc/tests/fixtures/publictag2.debug | 6 +- crates/jsdoc/tests/fixtures/quotename.debug | 16 +- crates/jsdoc/tests/fixtures/quotename2.debug | 10 +- crates/jsdoc/tests/fixtures/readonlytag.debug | 8 +- crates/jsdoc/tests/fixtures/requirestag.debug | 42 +- crates/jsdoc/tests/fixtures/restparams.debug | 36 +- crates/jsdoc/tests/fixtures/restparams2.debug | 12 +- crates/jsdoc/tests/fixtures/returnstag.debug | 32 +- crates/jsdoc/tests/fixtures/scopetags.debug | 21 +- crates/jsdoc/tests/fixtures/seetag.debug | 12 +- crates/jsdoc/tests/fixtures/sincetag.debug | 6 +- .../jsdoc/tests/fixtures/specialchars.debug | 8 +- .../jsdoc/tests/fixtures/specialnames.debug | 14 +- crates/jsdoc/tests/fixtures/structtag.debug | 8 +- crates/jsdoc/tests/fixtures/summarytag.debug | 6 +- crates/jsdoc/tests/fixtures/suppresstag.debug | 8 +- crates/jsdoc/tests/fixtures/templatetag.debug | 12 +- .../tests/fixtures/this-and-objectlit.debug | 6 +- crates/jsdoc/tests/fixtures/this.debug | 6 +- crates/jsdoc/tests/fixtures/this2.debug | 12 +- crates/jsdoc/tests/fixtures/this3.debug | 2 +- crates/jsdoc/tests/fixtures/this4.debug | 6 +- crates/jsdoc/tests/fixtures/this5.debug | 16 +- crates/jsdoc/tests/fixtures/this6.debug | 22 +- crates/jsdoc/tests/fixtures/thistag.debug | 12 +- crates/jsdoc/tests/fixtures/thistag2.debug | 18 +- crates/jsdoc/tests/fixtures/todotag.debug | 11 +- crates/jsdoc/tests/fixtures/typedeftag.debug | 32 +- crates/jsdoc/tests/fixtures/typedeftag2.debug | 8 +- crates/jsdoc/tests/fixtures/typekind.debug | 8 +- crates/jsdoc/tests/fixtures/typetag.debug | 18 +- crates/jsdoc/tests/fixtures/typetag2.debug | 6 +- .../jsdoc/tests/fixtures/typetaginline.debug | 86 +- .../tests/fixtures/typetagwithnewline.debug | 16 +- .../tests/fixtures/undocumentedtag.debug | 7 +- .../tests/fixtures/unrestrictedtag.debug | 8 +- crates/jsdoc/tests/fixtures/utf8.debug | 6 +- crates/jsdoc/tests/fixtures/var.debug | 6 +- crates/jsdoc/tests/fixtures/variations.debug | 76 +- .../jsdoc/tests/fixtures/variationtag.debug | 22 +- crates/jsdoc/tests/fixtures/versiontag.debug | 6 +- crates/jsdoc/tests/fixtures/virtual.debug | 6 +- crates/jsdoc/tests/fixtures/virtual2.debug | 30 +- crates/jsdoc/tests/fixtures/virtual3.debug | 14 +- crates/jsdoc/tests/fixtures/yieldstag.debug | 30 +- crates/swc/src/lib.rs | 1 + crates/swc_atoms/Cargo.toml | 1 + crates/swc_atoms/build.rs | 2 +- crates/swc_atoms/src/lib.rs | 263 +-- crates/swc_bundler/examples/bundle.rs | 7 +- crates/swc_bundler/src/bundler/chunk/cjs.rs | 3 +- .../src/bundler/chunk/computed_key.rs | 11 +- crates/swc_bundler/src/bundler/chunk/merge.rs | 21 +- crates/swc_bundler/src/bundler/export.rs | 8 +- crates/swc_bundler/src/bundler/finalize.rs | 7 +- crates/swc_bundler/src/bundler/import/mod.rs | 21 +- crates/swc_bundler/src/bundler/keywords.rs | 3 +- crates/swc_bundler/src/bundler/load.rs | 9 +- crates/swc_bundler/src/lib.rs | 1 + crates/swc_bundler/src/modules/sort/stmt.rs | 7 +- crates/swc_bundler/src/util.rs | 6 +- crates/swc_bundler/tests/deno.rs | 7 +- crates/swc_bundler/tests/fixture.rs | 7 +- crates/swc_core/src/lib.rs | 4 + crates/swc_css_ast/src/at_rule.rs | 1 - crates/swc_css_ast/src/base.rs | 9 + crates/swc_css_ast/src/lib.rs | 4 +- crates/swc_css_ast/src/selector.rs | 2 +- crates/swc_css_ast/src/token.rs | 9 +- crates/swc_css_ast/src/value.rs | 17 +- crates/swc_css_codegen/src/lib.rs | 3 +- .../src/compiler/color_alpha_parameter.rs | 17 +- .../src/compiler/color_hex_alpha.rs | 3 +- .../swc_css_compat/src/compiler/color_hwb.rs | 13 +- .../color_space_separated_parameters.rs | 9 +- .../src/compiler/custom_media.rs | 5 +- .../src/compiler/legacy_rgb_and_hsl.rs | 15 +- .../src/compiler/media_query_ranges.rs | 49 +- .../src/compiler/selector_not.rs | 5 +- ...custom_property_no_missing_var_function.rs | 3 +- .../rules/font_family_no_duplicate_names.rs | 6 +- .../swc_css_minifier/src/compressor/angle.rs | 3 +- .../src/compressor/calc_sum.rs | 96 +- .../swc_css_minifier/src/compressor/color.rs | 24 +- .../src/compressor/declaration.rs | 1030 +++++---- .../src/compressor/easing_function.rs | 33 +- .../src/compressor/frequency.rs | 13 +- .../swc_css_minifier/src/compressor/import.rs | 2 +- .../src/compressor/keyframes.rs | 7 +- .../swc_css_minifier/src/compressor/length.rs | 169 +- .../src/compressor/math/mod.rs | 5 +- .../swc_css_minifier/src/compressor/media.rs | 19 +- crates/swc_css_minifier/src/compressor/mod.rs | 28 +- .../swc_css_minifier/src/compressor/rules.rs | 12 +- .../src/compressor/selector.rs | 130 +- .../swc_css_minifier/src/compressor/time.rs | 11 +- .../src/compressor/transform_function.rs | 45 +- crates/swc_css_minifier/src/compressor/url.rs | 3 +- crates/swc_css_minifier/src/lib.rs | 15 +- crates/swc_css_modules/src/imports.rs | 19 +- crates/swc_css_modules/src/lib.rs | 68 +- crates/swc_css_parser/src/lexer/mod.rs | 6 +- crates/swc_css_parser/src/macros.rs | 2 +- .../swc_css_parser/src/parser/at_rules/mod.rs | 246 +-- crates/swc_css_parser/src/parser/input.rs | 5 +- .../src/parser/selectors/mod.rs | 46 +- .../swc_css_parser/src/parser/syntax/mod.rs | 3 +- crates/swc_css_parser/src/parser/util.rs | 5 +- .../src/parser/values_and_units/mod.rs | 822 +++---- .../fixture/at-rule/container/span.swc-stderr | 20 +- .../fixture/at-rule/media/span.swc-stderr | 26 +- .../fixture/at-rule/supports/span.swc-stderr | 54 +- .../fixture/at-rule/unknown/span.swc-stderr | 254 +-- .../fixture/dashed-ident/span.swc-stderr | 8 +- .../fixture/function/calc/span.swc-stderr | 2 +- .../fixture/function/unknown/span.swc-stderr | 4 +- .../selector/pseudo-class/has/span.swc-stderr | 10 +- .../selector/pseudo-class/is/span.swc-stderr | 20 +- .../pseudo-class/unknown/span.swc-stderr | 44 +- .../pseudo-class/where/span.swc-stderr | 8 +- .../pseudo-element/unknown/span.swc-stderr | 44 +- .../tests/fixture/style-block/span.swc-stderr | 22 +- .../styled-jsx/selector/1/span.swc-stderr | 4 +- .../styled-jsx/selector/2/span.swc-stderr | 6 +- .../value/custom-property/span.swc-stderr | 50 +- .../tests/fixture/value/url/span.swc-stderr | 2 +- .../vendor/csstree/basic/span.swc-stderr | 4 +- .../6s_VBuRPHbPiUrh1fWCR_Q/span.swc-stderr | 2 +- .../L0mEf41IMkWcP7NotllkAg/span.swc-stderr | 8 +- .../MvD7ThpMVIxU3dzF71Gpcg/span.swc-stderr | 2 +- .../SnMCumHJazvlgOXgmxJ9Jg/span.swc-stderr | 2 +- .../WQWdwW4B4hm60AQgxTU08Q/span.swc-stderr | 2 +- .../_d22bZcPKDgNEKSyJ2NRsQ/span.swc-stderr | 2 +- .../_e6qpZBWfowEh1P3Wn3orA/span.swc-stderr | 2 +- .../d1BWbOHfSbCE8-_qEz-luA/span.swc-stderr | 2 +- .../pLQn9swtbpZ-CVZMGw0EwA/span.swc-stderr | 2 +- .../rome/custom-properties/span.swc-stderr | 18 +- .../vendor/rome/functions/span.swc-stderr | 2 +- .../vendor/rome/selectors/span.swc-stderr | 4 +- .../recovery/at-rule/document/span.swc-stderr | 8 +- .../at-rule/extra-semi/span.swc-stderr | 2 +- .../at-rule/font-face/span.swc-stderr | 8 +- .../at-rule/import/indent/span.swc-stderr | 2 +- .../import/invalid-layer/span.swc-stderr | 6 +- .../import/invalid-supports/span.swc-stderr | 2 +- .../at-rule/import/no-semi/span.swc-stderr | 4 +- .../at-rule/import/no-url/span.swc-stderr | 2 +- .../at-rule/import/unknown/span.swc-stderr | 10 +- .../keyframes/custom-ident-1/span.swc-stderr | 2 +- .../keyframes/custom-ident-2/span.swc-stderr | 2 +- .../keyframes/custom-ident-3/span.swc-stderr | 2 +- .../keyframes/custom-ident-4/span.swc-stderr | 2 +- .../keyframes/custom-ident/span.swc-stderr | 2 +- .../span.swc-stderr | 10 +- .../keyframe-keyword/span.swc-stderr | 4 +- .../at-rule/layer/block/span.swc-stderr | 6 +- .../layer/string-name-block/span.swc-stderr | 2 +- .../string-name-statement/span.swc-stderr | 2 +- .../at-rule/media/condition-1/span.swc-stderr | 14 +- .../media/condition-and-or/span.swc-stderr | 14 +- .../at-rule/media/condition/span.swc-stderr | 10 +- .../media/feature-name-1/span.swc-stderr | 4 +- .../media/feature-name-2/span.swc-stderr | 2 +- .../media/feature-name/span.swc-stderr | 4 +- .../media/feature-range-2/span.swc-stderr | 6 +- .../media/feature-range-3/span.swc-stderr | 6 +- .../media/feature-range-4/span.swc-stderr | 6 +- .../media/feature-range-5/span.swc-stderr | 6 +- .../media/feature-range-6/span.swc-stderr | 6 +- .../at-rule/media/feature/span.swc-stderr | 4 +- .../media/invalid-nesting/span.swc-stderr | 4 +- .../at-rule/media/media-type/span.swc-stderr | 4 +- .../media/wrong-stylesheet/span.swc-stderr | 6 +- .../page/invalid-pseudo/span.swc-stderr | 2 +- .../at-rule/page/no-space/span.swc-stderr | 4 +- .../at-rule/page/without-page/span.swc-stderr | 8 +- .../supports/no-parens/span.swc-stderr | 4 +- .../non-standard-prelude/span.swc-stderr | 16 +- .../supports/wrong-or-and/span.swc-stderr | 16 +- .../recovery/cdo-and-cdc/span.swc-stderr | 14 +- .../comments/bad-comment-1/span.swc-stderr | 2 +- .../comments/declaration/span.swc-stderr | 2 +- .../declaration/bad-value/span.swc-stderr | 6 +- .../declaration/basic/span.swc-stderr | 2 +- .../declaration/important-1/span.swc-stderr | 4 +- .../declaration/important/span.swc-stderr | 44 +- .../declaration/wrong-name-3/span.swc-stderr | 2 +- .../declaration/wrong-name/span.swc-stderr | 2 +- .../delim-token/at-sign/span.swc-stderr | 2 +- .../escaped/declaration-value/span.swc-stderr | 2 +- .../escaped/id-selector/span.swc-stderr | 2 +- .../recovery/function/base/span.swc-stderr | 12 +- .../function/calc/space/span.swc-stderr | 4 +- .../function/nested-unclosed/span.swc-stderr | 2 +- .../recovery/function/rgb/span.swc-stderr | 18 +- .../function/unclosed-2/span.swc-stderr | 4 +- .../function/unclosed/span.swc-stderr | 2 +- .../tests/recovery/hacks/span.swc-stderr | 124 +- .../tests/recovery/ie-progid/span.swc-stderr | 32 +- .../tests/recovery/number/span.swc-stderr | 10 +- .../qualified-rule/basic/span.swc-stderr | 4 +- .../double-slash-comment/span.swc-stderr | 4 +- .../rules/at-rule-in-middle/span.swc-stderr | 2 +- .../rules/at-rule-with-semi/span.swc-stderr | 2 +- .../rules/unclosed-brackets/span.swc-stderr | 16 +- .../rules/unclosed-curly/span.swc-stderr | 4 +- .../invalid-matcher-1/span.swc-stderr | 2 +- .../invalid-matcher-2/span.swc-stderr | 4 +- .../invalid-matcher-3/span.swc-stderr | 8 +- .../invalid-matcher-4/span.swc-stderr | 6 +- .../attribute/invalid-matcher/span.swc-stderr | 4 +- .../invalid-modifier/span.swc-stderr | 6 +- .../attribute/unclosed/span.swc-stderr | 4 +- .../selector/combinator/two/span.swc-stderr | 2 +- .../selector/id/invalid/span.swc-stderr | 2 +- .../pseudo-class/an-plus-b/span.swc-stderr | 2 +- .../invalid-ident/span.swc-stderr | 2 +- .../pseudo-class/invalid/span.swc-stderr | 8 +- .../pseudo-element/after/span.swc-stderr | 2 +- .../pseudo-element/between/span.swc-stderr | 2 +- .../pseudo-element/invalid/span.swc-stderr | 2 +- .../basic/span.swc-stderr | 20 +- .../invalid-nested-1/span.swc-stderr | 6 +- .../invalid-nested-2/span.swc-stderr | 2 +- .../invalid-nested/span.swc-stderr | 2 +- .../recovery/styled-jsx/1/span.swc-stderr | 12 +- .../recovery/styled-jsx/2/span.swc-stderr | 4 +- .../recovery/unicode-range/span.swc-stderr | 8 +- .../value/at-keyword/1/span.swc-stderr | 2 +- .../value/at-keyword/2/span.swc-stderr | 2 +- .../value/at-keyword/3/span.swc-stderr | 2 +- .../value/at-keyword/4/span.swc-stderr | 2 +- .../value/at-keyword/5/span.swc-stderr | 2 +- .../value/at-keyword/6/span.swc-stderr | 2 +- .../value/at-keyword/7/span.swc-stderr | 2 +- .../exclamation/span.swc-stderr | 4 +- .../only-dashed/span.swc-stderr | 10 +- .../hash/invalid-character-1/span.swc-stderr | 2 +- .../hash/invalid-character-2/span.swc-stderr | 2 +- .../hash/invalid-character-3/span.swc-stderr | 2 +- .../hash/invalid-character-4/span.swc-stderr | 2 +- .../hash/invalid-character-5/span.swc-stderr | 2 +- .../hash/invalid-character-6/span.swc-stderr | 2 +- .../hash/invalid-character-7/span.swc-stderr | 2 +- .../hash/invalid-character-8/span.swc-stderr | 2 +- .../hash/invalid-character/span.swc-stderr | 2 +- .../recovery/value/quotes/span.swc-stderr | 2 +- .../recovery/value/url/basic/span.swc-stderr | 6 +- .../tests/recovery/vercel/001/span.swc-stderr | 2 +- .../tests/recovery/vercel/002/span.swc-stderr | 4 +- .../tests/recovery/vercel/003/span.swc-stderr | 4 +- .../tests/recovery/vercel/004/span.swc-stderr | 10 +- .../tests/recovery/vercel/005/span.swc-stderr | 10 +- crates/swc_css_prefixer/src/prefixer.rs | 1474 ++++++------- crates/swc_css_utils/src/lib.rs | 29 +- crates/swc_css_visit/src/lib.rs | 24 +- crates/swc_ecma_ast/src/expr.rs | 23 +- crates/swc_ecma_ast/src/ident.rs | 17 +- crates/swc_ecma_ast/src/lit.rs | 25 +- crates/swc_ecma_ast/src/macros.rs | 2 +- crates/swc_ecma_ast/src/typescript.rs | 6 +- crates/swc_ecma_dep_graph/src/lib.rs | 9 +- .../src/rules/duplicate_exports.rs | 6 +- .../src/compress/optimize/arguments.rs | 83 +- .../src/compress/optimize/bools.rs | 8 +- .../src/compress/optimize/evaluate.rs | 38 +- .../src/compress/optimize/iife.rs | 9 +- .../src/compress/optimize/inline.rs | 16 +- .../src/compress/optimize/mod.rs | 56 +- .../src/compress/optimize/ops.rs | 9 +- .../src/compress/optimize/sequences.rs | 11 +- .../src/compress/optimize/strings.rs | 29 +- .../src/compress/optimize/unused.rs | 6 +- .../src/compress/optimize/util.rs | 41 +- .../src/compress/pure/bools.rs | 24 +- .../src/compress/pure/evaluate.rs | 17 +- .../src/compress/pure/misc.rs | 51 +- .../src/compress/pure/sequences.rs | 75 +- .../src/compress/pure/strings.rs | 50 +- .../src/compress/pure/unsafes.rs | 6 +- .../src/compress/util/mod.rs | 24 +- crates/swc_ecma_minifier/src/eval.rs | 11 +- crates/swc_ecma_minifier/src/lib.rs | 1 + .../src/pass/mangle_props.rs | 8 +- crates/swc_ecma_minifier/src/util/base54.rs | 4 +- crates/swc_ecma_minifier/src/util/mod.rs | 3 +- crates/swc_ecma_parser/src/lexer/mod.rs | 14 +- crates/swc_ecma_parser/src/lexer/number.rs | 29 +- crates/swc_ecma_parser/src/lexer/util.rs | 4 +- crates/swc_ecma_parser/src/macros.rs | 149 +- .../src/parser/class_and_fn.rs | 92 +- crates/swc_ecma_parser/src/parser/expr.rs | 46 +- crates/swc_ecma_parser/src/parser/expr/ops.rs | 2 +- crates/swc_ecma_parser/src/parser/ident.rs | 44 +- crates/swc_ecma_parser/src/parser/macros.rs | 8 +- crates/swc_ecma_parser/src/parser/object.rs | 15 +- crates/swc_ecma_parser/src/parser/pat.rs | 22 +- crates/swc_ecma_parser/src/parser/stmt.rs | 16 +- .../src/parser/stmt/module_item.rs | 18 +- .../swc_ecma_parser/src/parser/typescript.rs | 51 +- crates/swc_ecma_parser/src/parser/util.rs | 89 +- crates/swc_ecma_parser/src/token.rs | 386 ++-- .../swc_ecma_preset_env/src/corejs2/entry.rs | 29 +- crates/swc_ecma_preset_env/src/corejs2/mod.rs | 18 +- crates/swc_ecma_preset_env/src/lib.rs | 4 +- crates/swc_ecma_quote_macros/src/ast/lit.rs | 10 +- crates/swc_ecma_transforms_base/src/fixer.rs | 19 +- crates/swc_ecma_transforms_base/src/lib.rs | 1 + crates/swc_ecma_transforms_base/src/native.rs | 11 - .../src/rename/analyzer/scope.rs | 10 +- .../src/rename/eval.rs | 7 +- .../src/super_field.rs | 10 +- .../src/es2015/block_scoping/mod.rs | 4 +- .../src/es2015/classes/mod.rs | 4 +- .../src/es2015/destructuring.rs | 20 +- .../src/es2015/for_of.rs | 3 +- .../src/es2015/generator.rs | 4 +- .../src/es2015/parameters.rs | 7 +- .../src/es2015/spread.rs | 12 +- .../src/es2015/template_literal.rs | 17 +- .../src/es2015/typeof_symbol.rs | 30 +- crates/swc_ecma_transforms_compat/src/lib.rs | 1 + .../src/reserved_words.rs | 86 +- crates/swc_ecma_transforms_module/src/amd.rs | 22 +- .../src/common_js.rs | 21 +- crates/swc_ecma_transforms_module/src/lib.rs | 1 + .../src/module_decl_strip.rs | 65 +- .../src/system_js.rs | 16 +- crates/swc_ecma_transforms_module/src/util.rs | 4 +- .../src/const_modules.rs | 4 +- .../src/inline_globals.rs | 24 +- .../src/simplify/branch/mod.rs | 10 +- .../src/simplify/dce/mod.rs | 10 +- .../src/simplify/expr/mod.rs | 73 +- .../src/simplify/inlining/scope.rs | 5 +- .../src/decorators/legacy/metadata.rs | 8 +- .../src/display_name/mod.rs | 28 +- .../swc_ecma_transforms_react/src/jsx/mod.rs | 10 +- .../src/jsx/static_check.rs | 3 +- crates/swc_ecma_transforms_react/src/lib.rs | 1 + .../src/pure_annotations/mod.rs | 4 +- .../swc_ecma_transforms_typescript/src/lib.rs | 1 + .../src/strip_type.rs | 10 +- .../src/ts_enum.rs | 24 +- .../src/typescript.rs | 3 +- .../src/analyzer/mod.rs | 7 +- crates/swc_ecma_usage_analyzer/src/lib.rs | 2 + crates/swc_ecma_usage_analyzer/src/util.rs | 19 +- crates/swc_ecma_utils/src/factory.rs | 5 +- .../src/function/fn_env_hoister.rs | 8 +- crates/swc_ecma_utils/src/lib.rs | 128 +- crates/swc_ecma_utils/src/macros.rs | 2 +- crates/swc_ecma_visit/src/lib.rs | 6 +- crates/swc_estree_compat/src/babelify/expr.rs | 9 +- .../src/babelify/typescript.rs | 8 +- crates/swc_estree_compat/src/swcify/expr.rs | 25 +- crates/swc_html_ast/src/base.rs | 18 +- crates/swc_html_ast/src/token.rs | 12 +- crates/swc_html_codegen/src/lib.rs | 574 +++-- crates/swc_html_minifier/src/lib.rs | 1090 ++++------ crates/swc_html_parser/benches/compare.rs | 3 +- crates/swc_html_parser/src/lexer/mod.rs | 2 +- crates/swc_html_parser/src/parser/macros.rs | 2 +- crates/swc_html_parser/src/parser/mod.rs | 1893 +++++++---------- .../src/parser/open_elements_stack.rs | 219 +- crates/swc_html_visit/src/lib.rs | 20 +- crates/swc_node_bundler/tests/fixture.rs | 7 +- .../src/transform_executor.rs | 2 +- 546 files changed, 7369 insertions(+), 9485 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 58e5039ad560..29544d3d4a25 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -4,17 +4,13 @@ xtask = "run --package xtask --" [build] rustdocflags = ["--cfg", "docsrs"] -rustflags = ["-Z", "share-generics=y"] +rustflags = ["-Zshare-generics=y"] [target.x86_64-unknown-linux-gnu] -rustflags = ["-C", "target-feature=+sse2", "-Z", "share-generics=y"] - -[target.aarch64-apple-darwin] -rustflags = ["-Z", "share-generics=y"] +rustflags = ["-C", "target-feature=+sse2", "-Zshare-generics=y"] [target.aarch64-unknown-linux-gnu] -linker = "aarch64-linux-gnu-gcc" -rustflags = ["-Z", "share-generics=y"] +linker = "aarch64-linux-gnu-gcc" [target.aarch64-unknown-linux-musl] linker = "aarch64-linux-musl-gcc" @@ -23,27 +19,17 @@ rustflags = [ "target-feature=-crt-static", "-C", "link-arg=-lgcc", - "-Z", - "share-generics=y", + "-Zshare-generics=y", ] [target.armv7-unknown-linux-gnueabihf] -linker = "arm-linux-gnueabihf-gcc" -rustflags = ["-Z", "share-generics=y"] +linker = "arm-linux-gnueabihf-gcc" -[target.aarch64-linux-android] -rustflags = ["-Z", "share-generics=y"] [target.x86_64-pc-windows-msvc] linker = "rust-lld" -rustflags = ["-C", "target-feature=+crt-static"] +rustflags = ["-C", "target-feature=+crt-static", "-Zshare-generics=y"] -[target.i686-pc-windows-msvc] -rustflags = ["-C", "target-feature=+crt-static"] [target.aarch64-pc-windows-msvc] -linker = "rust-lld" -rustflags = ["-Z", "share-generics=y"] - -[target.wasm32-unknown-unknown] -rustflags = ["-Z", "share-generics=y"] +linker = "rust-lld" diff --git a/bindings/binding_core_node/src/bundle.rs b/bindings/binding_core_node/src/bundle.rs index 2fe29702c935..a009742fae68 100644 --- a/bindings/binding_core_node/src/bundle.rs +++ b/bindings/binding_core_node/src/bundle.rs @@ -279,7 +279,7 @@ impl swc_core::bundler::Hook for Hook { Ok(vec![ KeyValueProp { - key: PropName::Ident(Ident::new(js_word!("url"), span)), + key: PropName::Ident(Ident::new("url", span)), value: Box::new(Expr::Lit(Lit::Str(Str { span, raw: None, @@ -287,7 +287,7 @@ impl swc_core::bundler::Hook for Hook { }))), }, KeyValueProp { - key: PropName::Ident(Ident::new(js_word!("main"), span)), + key: PropName::Ident(Ident::new("main", span)), value: Box::new(if module_record.is_entry { Expr::Member(MemberExpr { span, @@ -295,7 +295,7 @@ impl swc_core::bundler::Hook for Hook { span, kind: MetaPropKind::ImportMeta, })), - prop: MemberProp::Ident(Ident::new(js_word!("main"), span)), + prop: MemberProp::Ident(Ident::new("main", span)), }) } else { Expr::Lit(Lit::Bool(Bool { span, value: false })) diff --git a/clippy.toml b/clippy.toml index b6619d912215..30bf79298597 100644 --- a/clippy.toml +++ b/clippy.toml @@ -16,5 +16,11 @@ disallowed-names = [ "isize", "usize", ] +ignore-interior-mutability = [ + "bytes::Bytes", + "swc_atoms::Atom", + "swc_atoms::JsWord", + "swc_ecma_ast::Id", +] msrv = "1.58" type-complexity-threshold = 25000 diff --git a/crates/jsdoc/tests/fixtures/abstracttag.debug b/crates/jsdoc/tests/fixtures/abstracttag.debug index 05d30f031ca2..134c6c1b77ae 100644 --- a/crates/jsdoc/tests/fixtures/abstracttag.debug +++ b/crates/jsdoc/tests/fixtures/abstracttag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('abstract' type=static), + value: "abstract", }, tag: Abstract( AbstractTag { @@ -143,7 +143,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -166,7 +166,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -206,7 +206,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -229,7 +229,7 @@ ), ctxt: #0, }, - value: Atom('virtual' type=inline), + value: "virtual", }, tag: Abstract( AbstractTag { diff --git a/crates/jsdoc/tests/fixtures/accesstag.debug b/crates/jsdoc/tests/fixtures/accesstag.debug index aab2589451c4..411a4df7b20b 100644 --- a/crates/jsdoc/tests/fixtures/accesstag.debug +++ b/crates/jsdoc/tests/fixtures/accesstag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('access' type=inline), + value: "access", }, tag: Access( AccessTag { @@ -128,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('private' type=static), + value: "private", }, }, ), @@ -155,7 +155,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -178,7 +178,7 @@ ), ctxt: #0, }, - value: Atom('access' type=inline), + value: "access", }, tag: Access( AccessTag { @@ -201,7 +201,7 @@ ), ctxt: #0, }, - value: Atom('protected' type=static), + value: "protected", }, }, ), @@ -228,7 +228,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -251,7 +251,7 @@ ), ctxt: #0, }, - value: Atom('access' type=inline), + value: "access", }, tag: Access( AccessTag { @@ -274,7 +274,7 @@ ), ctxt: #0, }, - value: Atom('public' type=static), + value: "public", }, }, ), @@ -301,7 +301,7 @@ ), ctxt: #0, }, - value: Atom('nothing' type=inline), + value: "nothing", }, tags: [], }, @@ -325,7 +325,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -348,7 +348,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -388,7 +388,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -411,7 +411,7 @@ ), ctxt: #0, }, - value: Atom('private' type=static), + value: "private", }, tag: Private( PrivateTag { @@ -450,7 +450,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -473,7 +473,7 @@ ), ctxt: #0, }, - value: Atom('protected' type=static), + value: "protected", }, tag: Protected( ProtectedTag { @@ -512,7 +512,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -535,7 +535,7 @@ ), ctxt: #0, }, - value: Atom('public' type=static), + value: "public", }, tag: Public( PublicTag { @@ -573,7 +573,7 @@ ), ctxt: #0, }, - value: Atom('nothing' type=inline), + value: "nothing", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/alias.debug b/crates/jsdoc/tests/fixtures/alias.debug index d06dc663f290..6c4170b49971 100644 --- a/crates/jsdoc/tests/fixtures/alias.debug +++ b/crates/jsdoc/tests/fixtures/alias.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('Give x another name.' type=dynamic), + value: "Give x another name.", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('alias' type=inline), + value: "alias", }, tag: Alias( AliasTag { @@ -76,7 +76,7 @@ ), ctxt: #0, }, - value: Atom('myObject' type=dynamic), + value: "myObject", }, ], }, @@ -103,7 +103,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { @@ -143,7 +143,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/alias2.debug b/crates/jsdoc/tests/fixtures/alias2.debug index 16536f435fa2..fd6ec9eec0bb 100644 --- a/crates/jsdoc/tests/fixtures/alias2.debug +++ b/crates/jsdoc/tests/fixtures/alias2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('alias' type=inline), + value: "alias", }, tag: Alias( AliasTag { @@ -76,7 +76,7 @@ ), ctxt: #0, }, - value: Atom('ns' type=inline), + value: "ns", }, ], }, @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/alias3.debug b/crates/jsdoc/tests/fixtures/alias3.debug index 985a562ca357..daa70744851b 100644 --- a/crates/jsdoc/tests/fixtures/alias3.debug +++ b/crates/jsdoc/tests/fixtures/alias3.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -66,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('@alias trackr.CookieManager' type=dynamic), + value: "@alias trackr.CookieManager", }, ), name: Some( @@ -80,7 +80,7 @@ ), ctxt: #0, }, - value: Atom('@param {object} kv' type=dynamic), + value: "@param {object} kv", }, ), }, @@ -108,7 +108,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/alias4.debug b/crates/jsdoc/tests/fixtures/alias4.debug index 6a2982017bd3..fce93ce34b49 100644 --- a/crates/jsdoc/tests/fixtures/alias4.debug +++ b/crates/jsdoc/tests/fixtures/alias4.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('jacket' type=inline), + value: "jacket", }, }, ), @@ -104,9 +104,7 @@ ), ctxt: #0, }, - value: Atom('Jacket constructor. - * - *' type=dynamic), + value: "Jacket constructor.\n *\n *", }, tags: [ TagItem { @@ -129,7 +127,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -153,7 +151,7 @@ ), ctxt: #0, }, - value: Atom('* @alias module:jacket' type=dynamic), + value: "* @alias module:jacket", }, ), name: None, diff --git a/crates/jsdoc/tests/fixtures/alias5.debug b/crates/jsdoc/tests/fixtures/alias5.debug index ba5f1f78942c..a8d09bdbf564 100644 --- a/crates/jsdoc/tests/fixtures/alias5.debug +++ b/crates/jsdoc/tests/fixtures/alias5.debug @@ -19,9 +19,7 @@ ), ctxt: #0, }, - value: Atom('Toaster singleton. - * - *' type=dynamic), + value: "Toaster singleton.\n *\n *", }, tags: [ TagItem { @@ -44,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -84,9 +82,7 @@ ), ctxt: #0, }, - value: Atom('Toast an item. - * - *' type=dynamic), + value: "Toast an item.\n *\n *", }, tags: [ TagItem { @@ -109,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('alias' type=inline), + value: "alias", }, tag: Alias( AliasTag { @@ -143,7 +139,7 @@ ), ctxt: #0, }, - value: Atom('Toaster' type=inline), + value: "Toaster", }, ], }, @@ -172,9 +168,7 @@ ), ctxt: #0, }, - value: Atom('Clean the toaster. - * - *' type=dynamic), + value: "Clean the toaster.\n *\n *", }, tags: [ TagItem { @@ -197,7 +191,7 @@ ), ctxt: #0, }, - value: Atom('alias' type=inline), + value: "alias", }, tag: Alias( AliasTag { @@ -231,7 +225,7 @@ ), ctxt: #0, }, - value: Atom('clean' type=inline), + value: "clean", }, ], }, @@ -258,7 +252,7 @@ ), ctxt: #0, }, - value: Atom('memberof' type=dynamic), + value: "memberof", }, tag: MemberOf( MemberOfTag { @@ -292,7 +286,7 @@ ), ctxt: #0, }, - value: Atom('Toaster' type=inline), + value: "Toaster", }, ], }, @@ -319,7 +313,7 @@ ), ctxt: #0, }, - value: Atom('instance' type=dynamic), + value: "instance", }, tag: Instance( InstanceTag { @@ -357,9 +351,7 @@ ), ctxt: #0, }, - value: Atom('Get the Toaster instance. - * - *' type=dynamic), + value: "Get the Toaster instance.\n *\n *", }, tags: [ TagItem { @@ -382,7 +374,7 @@ ), ctxt: #0, }, - value: Atom('alias' type=inline), + value: "alias", }, tag: Alias( AliasTag { @@ -416,7 +408,7 @@ ), ctxt: #0, }, - value: Atom('Toaster' type=inline), + value: "Toaster", }, ], }, diff --git a/crates/jsdoc/tests/fixtures/alias6.debug b/crates/jsdoc/tests/fixtures/alias6.debug index d3443797d5f6..04b4362523ae 100644 --- a/crates/jsdoc/tests/fixtures/alias6.debug +++ b/crates/jsdoc/tests/fixtures/alias6.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('example' type=inline), + value: "example", }, }, ), @@ -104,7 +104,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -127,7 +127,7 @@ ), ctxt: #0, }, - value: Atom('alias' type=inline), + value: "alias", }, tag: Alias( AliasTag { @@ -161,7 +161,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, ], }, diff --git a/crates/jsdoc/tests/fixtures/aliasexports.debug b/crates/jsdoc/tests/fixtures/aliasexports.debug index 9a1b5981f1e4..365be010ac24 100644 --- a/crates/jsdoc/tests/fixtures/aliasexports.debug +++ b/crates/jsdoc/tests/fixtures/aliasexports.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('foo' type=inline), + value: "foo", }, }, ), @@ -104,9 +104,7 @@ ), ctxt: #0, }, - value: Atom('Bar class. - * - *' type=dynamic), + value: "Bar class.\n *\n *", }, tags: [ TagItem { @@ -129,7 +127,7 @@ ), ctxt: #0, }, - value: Atom('alias' type=inline), + value: "alias", }, tag: Alias( AliasTag { @@ -163,7 +161,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, ], }, @@ -192,7 +190,7 @@ ), ctxt: #0, }, - value: Atom('Create a Bar.' type=dynamic), + value: "Create a Bar.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/aliasglobal.debug b/crates/jsdoc/tests/fixtures/aliasglobal.debug index a79bd7825a2e..bbe20b31f7bc 100644 --- a/crates/jsdoc/tests/fixtures/aliasglobal.debug +++ b/crates/jsdoc/tests/fixtures/aliasglobal.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('alias' type=inline), + value: "alias", }, tag: Alias( AliasTag { @@ -76,7 +76,7 @@ ), ctxt: #0, }, - value: Atom('' type=dynamic), + value: "", }, ], }, diff --git a/crates/jsdoc/tests/fixtures/aliasglobal2.debug b/crates/jsdoc/tests/fixtures/aliasglobal2.debug index 819971aebb23..2742ca2a9b8d 100644 --- a/crates/jsdoc/tests/fixtures/aliasglobal2.debug +++ b/crates/jsdoc/tests/fixtures/aliasglobal2.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('Creates a new test object. - *' type=dynamic), + value: "Creates a new test object.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('alias' type=inline), + value: "alias", }, tag: Alias( AliasTag { @@ -77,7 +76,7 @@ ), ctxt: #0, }, - value: Atom('Test' type=inline), + value: "Test", }, ], }, @@ -104,7 +103,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -144,7 +143,7 @@ ), ctxt: #0, }, - value: Atom('Document me.' type=dynamic), + value: "Document me.", }, tags: [], }, @@ -168,7 +167,7 @@ ), ctxt: #0, }, - value: Atom('Document me.' type=dynamic), + value: "Document me.", }, tags: [], }, @@ -192,7 +191,7 @@ ), ctxt: #0, }, - value: Atom('Document me.' type=dynamic), + value: "Document me.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/aliasresolve.debug b/crates/jsdoc/tests/fixtures/aliasresolve.debug index 95712b252673..ac872fe637a1 100644 --- a/crates/jsdoc/tests/fixtures/aliasresolve.debug +++ b/crates/jsdoc/tests/fixtures/aliasresolve.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { @@ -130,7 +130,7 @@ ), ctxt: #0, }, - value: Atom('@alias A.F' type=dynamic), + value: "@alias A.F", }, ), }, @@ -158,7 +158,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -181,7 +181,7 @@ ), ctxt: #0, }, - value: Atom('return' type=static), + value: "return", }, tag: Return( ReturnTag { @@ -205,7 +205,7 @@ ), ctxt: #0, }, - value: Atom('{String}' type=dynamic), + value: "{String}", }, ), description: Text { @@ -218,7 +218,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/aliasresolve2.debug b/crates/jsdoc/tests/fixtures/aliasresolve2.debug index d374d5082f61..d11c029b9160 100644 --- a/crates/jsdoc/tests/fixtures/aliasresolve2.debug +++ b/crates/jsdoc/tests/fixtures/aliasresolve2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { @@ -130,7 +130,7 @@ ), ctxt: #0, }, - value: Atom('@alias A.F' type=dynamic), + value: "@alias A.F", }, ), }, @@ -158,7 +158,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -181,7 +181,7 @@ ), ctxt: #0, }, - value: Atom('return' type=static), + value: "return", }, tag: Return( ReturnTag { @@ -205,7 +205,7 @@ ), ctxt: #0, }, - value: Atom('{String}' type=dynamic), + value: "{String}", }, ), description: Text { @@ -218,7 +218,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/also.debug b/crates/jsdoc/tests/fixtures/also.debug index 1b6e592167cf..75e673f161ea 100644 --- a/crates/jsdoc/tests/fixtures/also.debug +++ b/crates/jsdoc/tests/fixtures/also.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -82,8 +82,7 @@ ), ctxt: #0, }, - value: Atom('Set the value of the name property. - *' type=dynamic), + value: "Set the value of the name property.\n *", }, tags: [ TagItem { @@ -106,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -131,7 +130,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -144,7 +143,7 @@ ), ctxt: #0, }, - value: Atom('newName' type=inline), + value: "newName", }, }, ), @@ -171,8 +170,7 @@ ), ctxt: #0, }, - value: Atom('Get the value of the name property. - *' type=dynamic), + value: "Get the value of the name property.\n *", }, tags: [ TagItem { @@ -195,7 +193,7 @@ ), ctxt: #0, }, - value: Atom('returns' type=inline), + value: "returns", }, tag: Return( ReturnTag { @@ -219,7 +217,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), description: Text { @@ -232,7 +230,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -259,8 +257,7 @@ ), ctxt: #0, }, - value: Atom('Set the value of the shape property. - *' type=dynamic), + value: "Set the value of the shape property.\n *", }, tags: [ TagItem { @@ -283,7 +280,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -308,7 +305,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -321,7 +318,7 @@ ), ctxt: #0, }, - value: Atom('newShape' type=dynamic), + value: "newShape", }, }, ), @@ -348,8 +345,7 @@ ), ctxt: #0, }, - value: Atom('Set the value of the shape property, plus some other property. - *' type=dynamic), + value: "Set the value of the shape property, plus some other property.\n *", }, tags: [ TagItem { @@ -372,7 +368,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -397,7 +393,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -410,7 +406,7 @@ ), ctxt: #0, }, - value: Atom('newShape' type=dynamic), + value: "newShape", }, }, ), @@ -435,7 +431,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -460,7 +456,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -473,7 +469,7 @@ ), ctxt: #0, }, - value: Atom('mysteryProperty' type=dynamic), + value: "mysteryProperty", }, }, ), @@ -500,8 +496,7 @@ ), ctxt: #0, }, - value: Atom('Get the value of the shape property. - *' type=dynamic), + value: "Get the value of the shape property.\n *", }, tags: [ TagItem { @@ -524,7 +519,7 @@ ), ctxt: #0, }, - value: Atom('returns' type=inline), + value: "returns", }, tag: Return( ReturnTag { @@ -548,7 +543,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), description: Text { @@ -561,7 +556,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/also2.debug b/crates/jsdoc/tests/fixtures/also2.debug index ee5e4d6d6ed5..123702ba2863 100644 --- a/crates/jsdoc/tests/fixtures/also2.debug +++ b/crates/jsdoc/tests/fixtures/also2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -82,8 +82,7 @@ ), ctxt: #0, }, - value: Atom('Add a lane to the bowling alley. - *' type=dynamic), + value: "Add a lane to the bowling alley.\n *", }, tags: [ TagItem { @@ -106,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('also' type=inline), + value: "also", }, tag: Unknown( UnknownTag { @@ -129,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('* Add the specified number of lanes to the bowling alley.' type=dynamic), + value: "* Add the specified number of lanes to the bowling alley.", }, }, ), @@ -154,7 +153,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -179,7 +178,7 @@ ), ctxt: #0, }, - value: Atom('{number}' type=dynamic), + value: "{number}", }, ), desc: Text { @@ -192,7 +191,7 @@ ), ctxt: #0, }, - value: Atom('[lanes=1] - The number of lanes to add.' type=dynamic), + value: "[lanes=1] - The number of lanes to add.", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/anonymousclass.debug b/crates/jsdoc/tests/fixtures/anonymousclass.debug index 24d43fd5a906..1c00008cff99 100644 --- a/crates/jsdoc/tests/fixtures/anonymousclass.debug +++ b/crates/jsdoc/tests/fixtures/anonymousclass.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('test' type=inline), + value: "test", }, }, ), @@ -104,7 +104,7 @@ ), ctxt: #0, }, - value: Atom('Test class' type=dynamic), + value: "Test class", }, tags: [], }, @@ -128,8 +128,7 @@ ), ctxt: #0, }, - value: Atom('Test constructor - *' type=dynamic), + value: "Test constructor\n *", }, tags: [ TagItem { @@ -152,7 +151,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -177,7 +176,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -190,7 +189,7 @@ ), ctxt: #0, }, - value: Atom('foo - The foo parameter' type=dynamic), + value: "foo - The foo parameter", }, }, ), @@ -217,7 +216,7 @@ ), ctxt: #0, }, - value: Atom('Test member' type=dynamic), + value: "Test member", }, tags: [], }, @@ -241,7 +240,7 @@ ), ctxt: #0, }, - value: Atom('Test method' type=dynamic), + value: "Test method", }, tags: [], }, @@ -265,7 +264,7 @@ ), ctxt: #0, }, - value: Atom('Test static method' type=dynamic), + value: "Test static method", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/anonymousclassparam.debug b/crates/jsdoc/tests/fixtures/anonymousclassparam.debug index a09f0c8cb332..7cfc22576594 100644 --- a/crates/jsdoc/tests/fixtures/anonymousclassparam.debug +++ b/crates/jsdoc/tests/fixtures/anonymousclassparam.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('foo' type=inline), + value: "foo", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/arrowfunction.debug b/crates/jsdoc/tests/fixtures/arrowfunction.debug index 4edd01b83630..64019a7d821e 100644 --- a/crates/jsdoc/tests/fixtures/arrowfunction.debug +++ b/crates/jsdoc/tests/fixtures/arrowfunction.debug @@ -19,9 +19,7 @@ ), ctxt: #0, }, - value: Atom('Increment a number by 1. - * - *' type=dynamic), + value: "Increment a number by 1.\n *\n *", }, tags: [ TagItem { @@ -44,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -69,7 +67,7 @@ ), ctxt: #0, }, - value: Atom('{number}' type=dynamic), + value: "{number}", }, ), desc: Text { @@ -82,7 +80,7 @@ ), ctxt: #0, }, - value: Atom('n - The number to increment.' type=dynamic), + value: "n - The number to increment.", }, }, ), @@ -109,7 +107,7 @@ ), ctxt: #0, }, - value: Atom('Print a value to the console.' type=dynamic), + value: "Print a value to the console.", }, tags: [], }, @@ -133,7 +131,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -156,7 +154,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -179,7 +177,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -206,7 +204,7 @@ ), ctxt: #0, }, - value: Atom('Create a class with a `name` property.' type=dynamic), + value: "Create a class with a `name` property.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/asyncfunction.debug b/crates/jsdoc/tests/fixtures/asyncfunction.debug index 4dbdac834091..a332ad0fee8e 100644 --- a/crates/jsdoc/tests/fixtures/asyncfunction.debug +++ b/crates/jsdoc/tests/fixtures/asyncfunction.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('Add a number. - *' type=dynamic), + value: "Add a number.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -68,7 +67,7 @@ ), ctxt: #0, }, - value: Atom('{number}' type=dynamic), + value: "{number}", }, ), desc: Text { @@ -81,7 +80,7 @@ ), ctxt: #0, }, - value: Atom('x - The number to add.' type=dynamic), + value: "x - The number to add.", }, }, ), @@ -108,8 +107,7 @@ ), ctxt: #0, }, - value: Atom('Subtract a number. - *' type=dynamic), + value: "Subtract a number.\n *", }, tags: [ TagItem { @@ -132,7 +130,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -157,7 +155,7 @@ ), ctxt: #0, }, - value: Atom('{number}' type=dynamic), + value: "{number}", }, ), desc: Text { @@ -170,7 +168,7 @@ ), ctxt: #0, }, - value: Atom('x - The number to subtract.' type=dynamic), + value: "x - The number to subtract.", }, }, ), @@ -197,7 +195,7 @@ ), ctxt: #0, }, - value: Atom('Adder class.' type=dynamic), + value: "Adder class.", }, tags: [], }, @@ -221,7 +219,7 @@ ), ctxt: #0, }, - value: Atom('Construct an Adder instance.' type=dynamic), + value: "Construct an Adder instance.", }, tags: [], }, @@ -245,8 +243,7 @@ ), ctxt: #0, }, - value: Atom('Add a number. - *' type=dynamic), + value: "Add a number.\n *", }, tags: [ TagItem { @@ -269,7 +266,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -294,7 +291,7 @@ ), ctxt: #0, }, - value: Atom('{number}' type=dynamic), + value: "{number}", }, ), desc: Text { @@ -307,7 +304,7 @@ ), ctxt: #0, }, - value: Atom('x - The number to add.' type=dynamic), + value: "x - The number to add.", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/asynctag.debug b/crates/jsdoc/tests/fixtures/asynctag.debug index 02866bbe9c69..894a13a750bb 100644 --- a/crates/jsdoc/tests/fixtures/asynctag.debug +++ b/crates/jsdoc/tests/fixtures/asynctag.debug @@ -19,9 +19,7 @@ ), ctxt: #0, }, - value: Atom('Asynchronous function. - * - *' type=dynamic), + value: "Asynchronous function.\n *\n *", }, tags: [ TagItem { @@ -44,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('function' type=static), + value: "function", }, tag: Function( FunctionTag { @@ -68,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('foo' type=inline), + value: "foo", }, ), }, @@ -94,7 +92,7 @@ ), ctxt: #0, }, - value: Atom('async' type=static), + value: "async", }, tag: Async( AsyncTag { diff --git a/crates/jsdoc/tests/fixtures/augmentall.debug b/crates/jsdoc/tests/fixtures/augmentall.debug index b9b33300ac06..603504b13d31 100644 --- a/crates/jsdoc/tests/fixtures/augmentall.debug +++ b/crates/jsdoc/tests/fixtures/augmentall.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('Parent interface. - *' type=dynamic), + value: "Parent interface.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('interface' type=static), + value: "interface", }, tag: Interface( InterfaceTag { @@ -82,7 +81,7 @@ ), ctxt: #0, }, - value: Atom('Open the connection.' type=dynamic), + value: "Open the connection.", }, tags: [], }, @@ -106,8 +105,7 @@ ), ctxt: #0, }, - value: Atom('Child class. - *' type=dynamic), + value: "Child class.\n *", }, tags: [ TagItem { @@ -130,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -154,7 +152,7 @@ ), ctxt: #0, }, - value: Atom('* @implements {Connection}' type=dynamic), + value: "* @implements {Connection}", }, ), name: None, @@ -183,7 +181,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -206,7 +204,7 @@ ), ctxt: #0, }, - value: Atom('inheritdoc' type=dynamic), + value: "inheritdoc", }, tag: InheritDoc( InheritDocTag { @@ -244,8 +242,7 @@ ), ctxt: #0, }, - value: Atom('Extension of child class. - *' type=dynamic), + value: "Extension of child class.\n *", }, tags: [ TagItem { @@ -268,7 +265,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -292,7 +289,7 @@ ), ctxt: #0, }, - value: Atom('* @extends {Socket}' type=dynamic), + value: "* @extends {Socket}", }, ), name: None, diff --git a/crates/jsdoc/tests/fixtures/augmentall2.debug b/crates/jsdoc/tests/fixtures/augmentall2.debug index 1145f7d53cc8..67c355f34c48 100644 --- a/crates/jsdoc/tests/fixtures/augmentall2.debug +++ b/crates/jsdoc/tests/fixtures/augmentall2.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('Parent interface. - *' type=dynamic), + value: "Parent interface.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('interface' type=static), + value: "interface", }, tag: Interface( InterfaceTag { @@ -82,7 +81,7 @@ ), ctxt: #0, }, - value: Atom('Open the connection.' type=dynamic), + value: "Open the connection.", }, tags: [], }, @@ -106,8 +105,7 @@ ), ctxt: #0, }, - value: Atom('Child interface. - *' type=dynamic), + value: "Child interface.\n *", }, tags: [ TagItem { @@ -130,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('interface' type=static), + value: "interface", }, tag: Interface( InterfaceTag { @@ -154,7 +152,7 @@ ), ctxt: #0, }, - value: Atom('* @extends {Connection}' type=dynamic), + value: "* @extends {Connection}", }, ), }, @@ -182,8 +180,7 @@ ), ctxt: #0, }, - value: Atom('Implementation of child interface. - *' type=dynamic), + value: "Implementation of child interface.\n *", }, tags: [ TagItem { @@ -206,7 +203,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -230,7 +227,7 @@ ), ctxt: #0, }, - value: Atom('* @implements {Socket}' type=dynamic), + value: "* @implements {Socket}", }, ), name: None, @@ -259,7 +256,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -282,7 +279,7 @@ ), ctxt: #0, }, - value: Atom('inheritdoc' type=dynamic), + value: "inheritdoc", }, tag: InheritDoc( InheritDocTag { diff --git a/crates/jsdoc/tests/fixtures/augmentstag.debug b/crates/jsdoc/tests/fixtures/augmentstag.debug index 5ef1e84549a2..701f1ce516fe 100644 --- a/crates/jsdoc/tests/fixtures/augmentstag.debug +++ b/crates/jsdoc/tests/fixtures/augmentstag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('First property' type=dynamic), + value: "First property", }, tags: [], }, @@ -106,8 +106,7 @@ ), ctxt: #0, }, - value: Atom('Second property - *' type=dynamic), + value: "Second property\n *", }, tags: [ TagItem { @@ -130,7 +129,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -153,7 +152,7 @@ ), ctxt: #0, }, - value: Atom('{String}' type=dynamic), + value: "{String}", }, }, ), @@ -180,7 +179,7 @@ ), ctxt: #0, }, - value: Atom('First parent method.' type=dynamic), + value: "First parent method.", }, tags: [], }, @@ -204,7 +203,7 @@ ), ctxt: #0, }, - value: Atom('Second parent method.' type=dynamic), + value: "Second parent method.", }, tags: [], }, @@ -228,7 +227,7 @@ ), ctxt: #0, }, - value: Atom('Third parent method.' type=dynamic), + value: "Third parent method.", }, tags: [], }, @@ -252,7 +251,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -275,7 +274,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -299,7 +298,7 @@ ), ctxt: #0, }, - value: Atom('* @extends Foo' type=dynamic), + value: "* @extends Foo", }, ), name: None, @@ -328,7 +327,7 @@ ), ctxt: #0, }, - value: Atom('Third prop *' type=dynamic), + value: "Third prop *", }, tags: [], }, @@ -352,7 +351,7 @@ ), ctxt: #0, }, - value: Atom('Second child method.' type=dynamic), + value: "Second child method.", }, tags: [], }, @@ -376,7 +375,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -399,7 +398,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -423,7 +422,7 @@ ), ctxt: #0, }, - value: Atom('* @extends {Bar}' type=dynamic), + value: "* @extends {Bar}", }, ), name: None, @@ -452,7 +451,7 @@ ), ctxt: #0, }, - value: Atom('Override prop1' type=dynamic), + value: "Override prop1", }, tags: [], }, @@ -476,7 +475,7 @@ ), ctxt: #0, }, - value: Atom('Third grandchild method.' type=dynamic), + value: "Third grandchild method.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/augmentstag2.debug b/crates/jsdoc/tests/fixtures/augmentstag2.debug index 1300318a7558..433784a0a276 100644 --- a/crates/jsdoc/tests/fixtures/augmentstag2.debug +++ b/crates/jsdoc/tests/fixtures/augmentstag2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -66,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('* @extends UndocumentedThing' type=dynamic), + value: "* @extends UndocumentedThing", }, ), name: None, diff --git a/crates/jsdoc/tests/fixtures/augmentstag3.debug b/crates/jsdoc/tests/fixtures/augmentstag3.debug index a54c41bb27be..29a0fea7639b 100644 --- a/crates/jsdoc/tests/fixtures/augmentstag3.debug +++ b/crates/jsdoc/tests/fixtures/augmentstag3.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('A method.' type=dynamic), + value: "A method.", }, tags: [], }, @@ -106,7 +106,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -129,7 +129,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -169,7 +169,7 @@ ), ctxt: #0, }, - value: Atom('Another method.' type=dynamic), + value: "Another method.", }, tags: [], }, @@ -193,7 +193,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -216,7 +216,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -240,7 +240,7 @@ ), ctxt: #0, }, - value: Atom('* @augments Foo' type=dynamic), + value: "* @augments Foo", }, ), name: None, @@ -267,7 +267,7 @@ ), ctxt: #0, }, - value: Atom('augments' type=dynamic), + value: "augments", }, tag: Augments( AugmentsTag { @@ -301,7 +301,7 @@ ), ctxt: #0, }, - value: Atom('Bar' type=inline), + value: "Bar", }, ], }, diff --git a/crates/jsdoc/tests/fixtures/augmentstag4.debug b/crates/jsdoc/tests/fixtures/augmentstag4.debug index 845e1e4f7d18..417fe82eda37 100644 --- a/crates/jsdoc/tests/fixtures/augmentstag4.debug +++ b/crates/jsdoc/tests/fixtures/augmentstag4.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -66,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('* @classdesc Base class' type=dynamic), + value: "* @classdesc Base class", }, ), name: None, @@ -95,7 +95,7 @@ ), ctxt: #0, }, - value: Atom('member' type=inline), + value: "member", }, tags: [], }, @@ -119,7 +119,7 @@ ), ctxt: #0, }, - value: Atom('another member' type=dynamic), + value: "another member", }, tags: [], }, @@ -143,8 +143,7 @@ ), ctxt: #0, }, - value: Atom('explicitly named member - *' type=dynamic), + value: "explicitly named member\n *", }, tags: [ TagItem { @@ -167,7 +166,7 @@ ), ctxt: #0, }, - value: Atom('function' type=static), + value: "function", }, tag: Function( FunctionTag { @@ -191,7 +190,7 @@ ), ctxt: #0, }, - value: Atom('Base#test3' type=dynamic), + value: "Base#test3", }, ), }, @@ -219,7 +218,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -242,7 +241,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -266,7 +265,7 @@ ), ctxt: #0, }, - value: Atom('* @extends Base' type=dynamic), + value: "* @extends Base", }, ), name: Some( @@ -280,7 +279,7 @@ ), ctxt: #0, }, - value: Atom('* @classdesc Extension of Base' type=dynamic), + value: "* @classdesc Extension of Base", }, ), }, diff --git a/crates/jsdoc/tests/fixtures/augmentstag5.debug b/crates/jsdoc/tests/fixtures/augmentstag5.debug index b1644287758a..b099dd27a136 100644 --- a/crates/jsdoc/tests/fixtures/augmentstag5.debug +++ b/crates/jsdoc/tests/fixtures/augmentstag5.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('lends' type=inline), + value: "lends", }, tag: Lends( LendsTag { @@ -139,7 +139,7 @@ ), ctxt: #0, }, - value: Atom('Base' type=inline), + value: "Base", }, ], }, @@ -168,7 +168,7 @@ ), ctxt: #0, }, - value: Atom('Description for {' type=dynamic), + value: "Description for {", }, tags: [ TagItem { @@ -191,7 +191,7 @@ ), ctxt: #0, }, - value: Atom('link' type=static), + value: "link", }, tag: Unknown( UnknownTag { @@ -214,7 +214,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -241,7 +241,7 @@ ), ctxt: #0, }, - value: Atom('Description for {' type=dynamic), + value: "Description for {", }, tags: [ TagItem { @@ -264,7 +264,7 @@ ), ctxt: #0, }, - value: Atom('link' type=static), + value: "link", }, tag: Unknown( UnknownTag { @@ -287,7 +287,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -314,7 +314,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -337,7 +337,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -377,7 +377,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -400,7 +400,7 @@ ), ctxt: #0, }, - value: Atom('lends' type=inline), + value: "lends", }, tag: Lends( LendsTag { @@ -434,7 +434,7 @@ ), ctxt: #0, }, - value: Atom('Base' type=inline), + value: "Base", }, ], }, @@ -463,7 +463,7 @@ ), ctxt: #0, }, - value: Atom('Description for {' type=dynamic), + value: "Description for {", }, tags: [ TagItem { @@ -486,7 +486,7 @@ ), ctxt: #0, }, - value: Atom('link' type=static), + value: "link", }, tag: Unknown( UnknownTag { @@ -509,7 +509,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -536,7 +536,7 @@ ), ctxt: #0, }, - value: Atom('Description for {' type=dynamic), + value: "Description for {", }, tags: [ TagItem { @@ -559,7 +559,7 @@ ), ctxt: #0, }, - value: Atom('link' type=static), + value: "link", }, tag: Unknown( UnknownTag { @@ -582,7 +582,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -609,7 +609,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -632,7 +632,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -656,7 +656,7 @@ ), ctxt: #0, }, - value: Atom('* @augments Base0' type=dynamic), + value: "* @augments Base0", }, ), name: Some( @@ -670,7 +670,7 @@ ), ctxt: #0, }, - value: Atom('* @augments Base1' type=dynamic), + value: "* @augments Base1", }, ), }, diff --git a/crates/jsdoc/tests/fixtures/augmentstag6.debug b/crates/jsdoc/tests/fixtures/augmentstag6.debug index 163bfbbbf8ea..ca2ae58360e9 100644 --- a/crates/jsdoc/tests/fixtures/augmentstag6.debug +++ b/crates/jsdoc/tests/fixtures/augmentstag6.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('interface' type=static), + value: "interface", }, tag: Interface( InterfaceTag { @@ -81,7 +81,7 @@ ), ctxt: #0, }, - value: Atom('Open the connection.' type=dynamic), + value: "Open the connection.", }, tags: [], }, @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -128,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('interface' type=static), + value: "interface", }, tag: Interface( InterfaceTag { @@ -152,7 +152,7 @@ ), ctxt: #0, }, - value: Atom('* @extends {IConnection}' type=dynamic), + value: "* @extends {IConnection}", }, ), }, @@ -180,7 +180,7 @@ ), ctxt: #0, }, - value: Atom('Close the connection.' type=dynamic), + value: "Close the connection.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/authortag.debug b/crates/jsdoc/tests/fixtures/authortag.debug index 41a05091e462..ec03b91217d3 100644 --- a/crates/jsdoc/tests/fixtures/authortag.debug +++ b/crates/jsdoc/tests/fixtures/authortag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -66,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('@author Michael Mathews ' type=dynamic), + value: "@author Michael Mathews ", }, ), name: None, @@ -95,7 +95,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -118,7 +118,7 @@ ), ctxt: #0, }, - value: Atom('author' type=inline), + value: "author", }, tag: Author( AuthorTag { @@ -141,7 +141,7 @@ ), ctxt: #0, }, - value: Atom('John Doe ' type=dynamic), + value: "John Doe ", }, }, ), @@ -166,7 +166,7 @@ ), ctxt: #0, }, - value: Atom('author' type=inline), + value: "author", }, tag: Author( AuthorTag { @@ -189,7 +189,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/borrowstag.debug b/crates/jsdoc/tests/fixtures/borrowstag.debug index 25429faa5139..239e4cbbe2f4 100644 --- a/crates/jsdoc/tests/fixtures/borrowstag.debug +++ b/crates/jsdoc/tests/fixtures/borrowstag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { @@ -67,7 +67,7 @@ ), ctxt: #0, }, - value: Atom('borrows trstr as trim' type=dynamic), + value: "borrows trstr as trim", }, ), }, @@ -95,7 +95,7 @@ ), ctxt: #0, }, - value: Atom('Remove whitespace from around a string.' type=dynamic), + value: "Remove whitespace from around a string.", }, tags: [ TagItem { @@ -118,7 +118,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -143,7 +143,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -156,7 +156,7 @@ ), ctxt: #0, }, - value: Atom('str' type=inline), + value: "str", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/borrowstag2.debug b/crates/jsdoc/tests/fixtures/borrowstag2.debug index 1e21bfe989cb..c628f1d64222 100644 --- a/crates/jsdoc/tests/fixtures/borrowstag2.debug +++ b/crates/jsdoc/tests/fixtures/borrowstag2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { @@ -67,7 +67,7 @@ ), ctxt: #0, }, - value: Atom('borrows rtrim' type=dynamic), + value: "borrows rtrim", }, ), }, @@ -95,7 +95,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -118,7 +118,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { @@ -143,7 +143,7 @@ ), ctxt: #0, }, - value: Atom('borrows rtrim' type=dynamic), + value: "borrows rtrim", }, ), }, @@ -171,7 +171,7 @@ ), ctxt: #0, }, - value: Atom('Remove whitespace from the right side of a string.' type=dynamic), + value: "Remove whitespace from the right side of a string.", }, tags: [ TagItem { @@ -194,7 +194,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -219,7 +219,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -232,7 +232,7 @@ ), ctxt: #0, }, - value: Atom('str' type=inline), + value: "str", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/callbacktag.debug b/crates/jsdoc/tests/fixtures/callbacktag.debug index 0e943dbc966e..39b8324cb99a 100644 --- a/crates/jsdoc/tests/fixtures/callbacktag.debug +++ b/crates/jsdoc/tests/fixtures/callbacktag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -67,7 +67,7 @@ ), ctxt: #0, }, - value: Atom('{requestResponseCallback}' type=dynamic), + value: "{requestResponseCallback}", }, ), desc: Text { @@ -80,7 +80,7 @@ ), ctxt: #0, }, - value: Atom('cb' type=inline), + value: "cb", }, }, ), @@ -107,7 +107,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -130,7 +130,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -155,7 +155,7 @@ ), ctxt: #0, }, - value: Atom('{wrongTypeCallback}' type=dynamic), + value: "{wrongTypeCallback}", }, ), desc: Text { @@ -168,7 +168,7 @@ ), ctxt: #0, }, - value: Atom('cb' type=inline), + value: "cb", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/classdesctag.debug b/crates/jsdoc/tests/fixtures/classdesctag.debug index 47ffa928f55c..493b4b078c6b 100644 --- a/crates/jsdoc/tests/fixtures/classdesctag.debug +++ b/crates/jsdoc/tests/fixtures/classdesctag.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('Asdf. - *' type=dynamic), + value: "Asdf.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -67,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('* @classdesc A description of the class.' type=dynamic), + value: "* @classdesc A description of the class.", }, ), name: None, @@ -96,7 +95,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -119,7 +118,7 @@ ), ctxt: #0, }, - value: Atom('classdesc' type=dynamic), + value: "classdesc", }, tag: ClassDesc( JSDocClassDescTag { @@ -142,7 +141,7 @@ ), ctxt: #0, }, - value: Atom('A description of the class.' type=dynamic), + value: "A description of the class.", }, }, ), @@ -167,7 +166,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -191,7 +190,7 @@ ), ctxt: #0, }, - value: Atom('Bar' type=inline), + value: "Bar", }, ), name: Some( @@ -205,7 +204,7 @@ ), ctxt: #0, }, - value: Atom('* @constructor' type=dynamic), + value: "* @constructor", }, ), }, @@ -233,8 +232,7 @@ ), ctxt: #0, }, - value: Atom('The Baz class. - *' type=dynamic), + value: "The Baz class.\n *", }, tags: [ TagItem { @@ -257,7 +255,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -281,7 +279,7 @@ ), ctxt: #0, }, - value: Atom('* Description of the Baz class.' type=dynamic), + value: "* Description of the Baz class.", }, ), name: None, diff --git a/crates/jsdoc/tests/fixtures/classproperties.debug b/crates/jsdoc/tests/fixtures/classproperties.debug index a280c7f3d7bb..4fbc208beb1a 100644 --- a/crates/jsdoc/tests/fixtures/classproperties.debug +++ b/crates/jsdoc/tests/fixtures/classproperties.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('Sample class.' type=dynamic), + value: "Sample class.", }, tags: [], }, @@ -43,7 +43,7 @@ ), ctxt: #0, }, - value: Atom('Public property.' type=dynamic), + value: "Public property.", }, tags: [], }, @@ -67,7 +67,7 @@ ), ctxt: #0, }, - value: Atom('Private property.' type=dynamic), + value: "Private property.", }, tags: [], }, @@ -91,7 +91,7 @@ ), ctxt: #0, }, - value: Atom('Property with no value assigned to it.' type=dynamic), + value: "Property with no value assigned to it.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/classtag.debug b/crates/jsdoc/tests/fixtures/classtag.debug index 246174cbcaf8..18a9be3d1e48 100644 --- a/crates/jsdoc/tests/fixtures/classtag.debug +++ b/crates/jsdoc/tests/fixtures/classtag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('Describe the Ticker class here.' type=dynamic), + value: "Describe the Ticker class here.", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { diff --git a/crates/jsdoc/tests/fixtures/classtag2.debug b/crates/jsdoc/tests/fixtures/classtag2.debug index 91d907fee849..4df56aefd7d7 100644 --- a/crates/jsdoc/tests/fixtures/classtag2.debug +++ b/crates/jsdoc/tests/fixtures/classtag2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('Describe the Subscription class here.' type=dynamic), + value: "Describe the Subscription class here.", }, tags: [], }, @@ -43,9 +43,7 @@ ), ctxt: #0, }, - value: Atom('Describe the constructor here. - * - *' type=dynamic), + value: "Describe the constructor here.\n *\n *", }, tags: [ TagItem { @@ -68,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -93,7 +91,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -106,7 +104,7 @@ ), ctxt: #0, }, - value: Atom('name - The name of the subscription.' type=dynamic), + value: "name - The name of the subscription.", }, }, ), @@ -131,7 +129,7 @@ ), ctxt: #0, }, - value: Atom('example' type=inline), + value: "example", }, tag: Example( ExampleTag { @@ -154,8 +152,7 @@ ), ctxt: #0, }, - value: Atom('* var subscription = new Subscription(); - ' type=dynamic), + value: "* var subscription = new Subscription();\n ", }, }, ), @@ -182,7 +179,7 @@ ), ctxt: #0, }, - value: Atom('Force the subscription to expire.' type=dynamic), + value: "Force the subscription to expire.", }, tags: [], }, @@ -206,7 +203,7 @@ ), ctxt: #0, }, - value: Atom('Describe the Subscriber class here.' type=dynamic), + value: "Describe the Subscriber class here.", }, tags: [], }, @@ -230,9 +227,7 @@ ), ctxt: #0, }, - value: Atom('Describe the constructor here. - * - *' type=dynamic), + value: "Describe the constructor here.\n *\n *", }, tags: [ TagItem { @@ -255,7 +250,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -280,7 +275,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -293,7 +288,7 @@ ), ctxt: #0, }, - value: Atom('name - The name of the subscriber.' type=dynamic), + value: "name - The name of the subscriber.", }, }, ), @@ -320,7 +315,7 @@ ), ctxt: #0, }, - value: Atom('Check whether the subscriber has a callback.' type=dynamic), + value: "Check whether the subscriber has a callback.", }, tags: [], }, @@ -344,8 +339,7 @@ ), ctxt: #0, }, - value: Atom('Subclass namespace. - *' type=dynamic), + value: "Subclass namespace.\n *", }, tags: [ TagItem { @@ -368,7 +362,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { @@ -408,8 +402,7 @@ ), ctxt: #0, }, - value: Atom('Expiring subscription subclass. - *' type=dynamic), + value: "Expiring subscription subclass.\n *", }, tags: [ TagItem { @@ -432,7 +425,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -472,9 +465,7 @@ ), ctxt: #0, }, - value: Atom('Describe the constructor here. - * - *' type=dynamic), + value: "Describe the constructor here.\n *\n *", }, tags: [ TagItem { @@ -497,7 +488,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -522,7 +513,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -535,7 +526,7 @@ ), ctxt: #0, }, - value: Atom('name - The name of the subscription.' type=dynamic), + value: "name - The name of the subscription.", }, }, ), @@ -562,7 +553,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -585,7 +576,7 @@ ), ctxt: #0, }, - value: Atom('memberof' type=dynamic), + value: "memberof", }, tag: MemberOf( MemberOfTag { @@ -619,7 +610,7 @@ ), ctxt: #0, }, - value: Atom('subclasses' type=dynamic), + value: "subclasses", }, ], }, @@ -648,7 +639,7 @@ ), ctxt: #0, }, - value: Atom('Instance method.' type=dynamic), + value: "Instance method.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/classwithoutname.debug b/crates/jsdoc/tests/fixtures/classwithoutname.debug index 791b8400eb95..de33b9c3aabd 100644 --- a/crates/jsdoc/tests/fixtures/classwithoutname.debug +++ b/crates/jsdoc/tests/fixtures/classwithoutname.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('Create an instance of MyClass. - *' type=dynamic), + value: "Create an instance of MyClass.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructs' type=dynamic), + value: "constructs", }, tag: Constructs( ConstructsTag { @@ -66,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/constanttag.debug b/crates/jsdoc/tests/fixtures/constanttag.debug index 4190cd79018a..88e21edfdca3 100644 --- a/crates/jsdoc/tests/fixtures/constanttag.debug +++ b/crates/jsdoc/tests/fixtures/constanttag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constant' type=static), + value: "constant", }, tag: Const( ConstTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('const' type=static), + value: "const", }, tag: Const( ConstTag { @@ -145,7 +145,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -168,7 +168,7 @@ ), ctxt: #0, }, - value: Atom('const' type=static), + value: "const", }, tag: Const( ConstTag { @@ -208,7 +208,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -231,7 +231,7 @@ ), ctxt: #0, }, - value: Atom('const' type=static), + value: "const", }, tag: Const( ConstTag { @@ -271,7 +271,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -294,7 +294,7 @@ ), ctxt: #0, }, - value: Atom('const' type=static), + value: "const", }, tag: Const( ConstTag { @@ -334,7 +334,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -357,7 +357,7 @@ ), ctxt: #0, }, - value: Atom('const' type=static), + value: "const", }, tag: Const( ConstTag { @@ -397,7 +397,7 @@ ), ctxt: #0, }, - value: Atom('auto-detected const' type=dynamic), + value: "auto-detected const", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/constanttag2.debug b/crates/jsdoc/tests/fixtures/constanttag2.debug index 9cdc4a07fc18..ed747068726c 100644 --- a/crates/jsdoc/tests/fixtures/constanttag2.debug +++ b/crates/jsdoc/tests/fixtures/constanttag2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('ES 2015 class assigned to a const' type=dynamic), + value: "ES 2015 class assigned to a const", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/constructortag.debug b/crates/jsdoc/tests/fixtures/constructortag.debug index 0600565eee7c..9e7da1c2bebf 100644 --- a/crates/jsdoc/tests/fixtures/constructortag.debug +++ b/crates/jsdoc/tests/fixtures/constructortag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('Describe your constructor function here.' type=dynamic), + value: "Describe your constructor function here.", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -66,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('Describe your class here.' type=dynamic), + value: "Describe your class here.", }, ), name: Some( @@ -80,7 +80,7 @@ ), ctxt: #0, }, - value: Atom('@constructor' type=dynamic), + value: "@constructor", }, ), }, @@ -106,7 +106,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -131,7 +131,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -144,7 +144,7 @@ ), ctxt: #0, }, - value: Atom('url' type=static), + value: "url", }, }, ), @@ -169,7 +169,7 @@ ), ctxt: #0, }, - value: Atom('throws' type=inline), + value: "throws", }, tag: Throw( ThrowTag { @@ -192,7 +192,7 @@ ), ctxt: #0, }, - value: Atom('MalformedURL' type=dynamic), + value: "MalformedURL", }, }, ), @@ -219,7 +219,7 @@ ), ctxt: #0, }, - value: Atom('Document your method here.' type=dynamic), + value: "Document your method here.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/constructstag.debug b/crates/jsdoc/tests/fixtures/constructstag.debug index cfbc26b164aa..0202fd85ca3c 100644 --- a/crates/jsdoc/tests/fixtures/constructstag.debug +++ b/crates/jsdoc/tests/fixtures/constructstag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('Document your constructor function here.' type=dynamic), + value: "Document your constructor function here.", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructs' type=dynamic), + value: "constructs", }, tag: Constructs( ConstructsTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('TextBlock' type=dynamic), + value: "TextBlock", }, }, ), @@ -90,7 +90,7 @@ ), ctxt: #0, }, - value: Atom('classdesc' type=dynamic), + value: "classdesc", }, tag: ClassDesc( JSDocClassDescTag { @@ -113,7 +113,7 @@ ), ctxt: #0, }, - value: Atom('Describe your class here' type=dynamic), + value: "Describe your class here", }, }, ), @@ -138,7 +138,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -163,7 +163,7 @@ ), ctxt: #0, }, - value: Atom('{object}' type=dynamic), + value: "{object}", }, ), desc: Text { @@ -176,7 +176,7 @@ ), ctxt: #0, }, - value: Atom('opts' type=inline), + value: "opts", }, }, ), @@ -201,7 +201,7 @@ ), ctxt: #0, }, - value: Atom('throws' type=inline), + value: "throws", }, tag: Throw( ThrowTag { @@ -224,7 +224,7 @@ ), ctxt: #0, }, - value: Atom('MissingNode' type=dynamic), + value: "MissingNode", }, }, ), @@ -251,7 +251,7 @@ ), ctxt: #0, }, - value: Atom('Document your method here.' type=dynamic), + value: "Document your method here.", }, tags: [ TagItem { @@ -274,7 +274,7 @@ ), ctxt: #0, }, - value: Atom('memberof' type=dynamic), + value: "memberof", }, tag: MemberOf( MemberOfTag { @@ -308,7 +308,7 @@ ), ctxt: #0, }, - value: Atom('TextBlock' type=dynamic), + value: "TextBlock", }, ], }, diff --git a/crates/jsdoc/tests/fixtures/constructstag2.debug b/crates/jsdoc/tests/fixtures/constructstag2.debug index 48f1b3706f3d..f379cf6e3865 100644 --- a/crates/jsdoc/tests/fixtures/constructstag2.debug +++ b/crates/jsdoc/tests/fixtures/constructstag2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructs' type=dynamic), + value: "constructs", }, tag: Constructs( ConstructsTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('Menu' type=inline), + value: "Menu", }, }, ), @@ -90,7 +90,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -115,7 +115,7 @@ ), ctxt: #0, }, - value: Atom('items' type=inline), + value: "items", }, ), desc: Text { @@ -128,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -155,7 +155,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -178,7 +178,7 @@ ), ctxt: #0, }, - value: Atom('memberof' type=dynamic), + value: "memberof", }, tag: MemberOf( MemberOfTag { @@ -212,7 +212,7 @@ ), ctxt: #0, }, - value: Atom('Menu' type=inline), + value: "Menu", }, ], }, diff --git a/crates/jsdoc/tests/fixtures/constructstag3.debug b/crates/jsdoc/tests/fixtures/constructstag3.debug index 97bde76229a4..a8f8a9673e58 100644 --- a/crates/jsdoc/tests/fixtures/constructstag3.debug +++ b/crates/jsdoc/tests/fixtures/constructstag3.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('A class that represents a person.' type=dynamic), + value: "A class that represents a person.", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('constructs' type=dynamic), + value: "constructs", }, tag: Constructs( ConstructsTag { @@ -128,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('Person' type=inline), + value: "Person", }, }, ), @@ -153,7 +153,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -178,7 +178,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -191,7 +191,7 @@ ), ctxt: #0, }, - value: Atom('name' type=static), + value: "name", }, }, ), @@ -218,7 +218,7 @@ ), ctxt: #0, }, - value: Atom('The name of the person.' type=dynamic), + value: "The name of the person.", }, tags: [], }, @@ -242,7 +242,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -265,7 +265,7 @@ ), ctxt: #0, }, - value: Atom('memberof' type=dynamic), + value: "memberof", }, tag: MemberOf( MemberOfTag { @@ -299,7 +299,7 @@ ), ctxt: #0, }, - value: Atom('Person' type=inline), + value: "Person", }, ], }, @@ -326,7 +326,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -351,7 +351,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -364,7 +364,7 @@ ), ctxt: #0, }, - value: Atom('message' type=inline), + value: "message", }, }, ), @@ -391,7 +391,7 @@ ), ctxt: #0, }, - value: Atom('The person's message.' type=dynamic), + value: "The person's message.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/constructstag4.debug b/crates/jsdoc/tests/fixtures/constructstag4.debug index ea3fcaea1b04..a3ed5625a050 100644 --- a/crates/jsdoc/tests/fixtures/constructstag4.debug +++ b/crates/jsdoc/tests/fixtures/constructstag4.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('lends' type=inline), + value: "lends", }, tag: Lends( LendsTag { @@ -76,7 +76,7 @@ ), ctxt: #0, }, - value: Atom('Person' type=inline), + value: "Person", }, ], }, @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('Describe the constructor.' type=dynamic), + value: "Describe the constructor.", }, tags: [ TagItem { @@ -128,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('classdesc' type=dynamic), + value: "classdesc", }, tag: ClassDesc( JSDocClassDescTag { @@ -151,7 +151,7 @@ ), ctxt: #0, }, - value: Atom('A class that represents a person.' type=dynamic), + value: "A class that represents a person.", }, }, ), @@ -176,7 +176,7 @@ ), ctxt: #0, }, - value: Atom('constructs' type=dynamic), + value: "constructs", }, tag: Constructs( ConstructsTag { @@ -199,7 +199,7 @@ ), ctxt: #0, }, - value: Atom('@param {string} name' type=dynamic), + value: "@param {string} name", }, }, ), @@ -226,7 +226,7 @@ ), ctxt: #0, }, - value: Atom('The name of the person.' type=dynamic), + value: "The name of the person.", }, tags: [], }, @@ -250,7 +250,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -273,7 +273,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -298,7 +298,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -311,7 +311,7 @@ ), ctxt: #0, }, - value: Atom('message' type=inline), + value: "message", }, }, ), @@ -338,7 +338,7 @@ ), ctxt: #0, }, - value: Atom('The person's message.' type=dynamic), + value: "The person's message.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/constructstag5.debug b/crates/jsdoc/tests/fixtures/constructstag5.debug index 3f9bb80dc18c..6a9628095386 100644 --- a/crates/jsdoc/tests/fixtures/constructstag5.debug +++ b/crates/jsdoc/tests/fixtures/constructstag5.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('lends' type=inline), + value: "lends", }, tag: Lends( LendsTag { @@ -76,7 +76,7 @@ ), ctxt: #0, }, - value: Atom('Duck' type=inline), + value: "Duck", }, ], }, @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('Constructs a duck.' type=dynamic), + value: "Constructs a duck.", }, tags: [ TagItem { @@ -128,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('constructs' type=dynamic), + value: "constructs", }, tag: Constructs( ConstructsTag { @@ -151,7 +151,7 @@ ), ctxt: #0, }, - value: Atom('@param tog' type=dynamic), + value: "@param tog", }, }, ), @@ -178,7 +178,7 @@ ), ctxt: #0, }, - value: Atom('Say hello.' type=dynamic), + value: "Say hello.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/copyrighttag.debug b/crates/jsdoc/tests/fixtures/copyrighttag.debug index 0718200135fd..08ed0f4482e7 100644 --- a/crates/jsdoc/tests/fixtures/copyrighttag.debug +++ b/crates/jsdoc/tests/fixtures/copyrighttag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -66,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('@copyright (c) 2011 Michael Mathews' type=dynamic), + value: "@copyright (c) 2011 Michael Mathews", }, ), name: None, diff --git a/crates/jsdoc/tests/fixtures/defaultparams.debug b/crates/jsdoc/tests/fixtures/defaultparams.debug index 8971e65f6aaa..65d597370775 100644 --- a/crates/jsdoc/tests/fixtures/defaultparams.debug +++ b/crates/jsdoc/tests/fixtures/defaultparams.debug @@ -19,9 +19,7 @@ ), ctxt: #0, }, - value: Atom('Set the user's first name. - * - *' type=dynamic), + value: "Set the user's first name.\n *\n *", }, tags: [ TagItem { @@ -44,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -69,7 +67,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -82,7 +80,7 @@ ), ctxt: #0, }, - value: Atom('firstName - The user's first name.' type=dynamic), + value: "firstName - The user's first name.", }, }, ), @@ -109,9 +107,7 @@ ), ctxt: #0, }, - value: Atom('Set the user's last name. - * - *' type=dynamic), + value: "Set the user's last name.\n *\n *", }, tags: [ TagItem { @@ -134,7 +130,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -159,7 +155,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -172,7 +168,7 @@ ), ctxt: #0, }, - value: Atom('[lastName=Braun] - The user's last name.' type=dynamic), + value: "[lastName=Braun] - The user's last name.", }, }, ), @@ -199,9 +195,7 @@ ), ctxt: #0, }, - value: Atom('Set the user's first, middle, and last names. - * - *' type=dynamic), + value: "Set the user's first, middle, and last names.\n *\n *", }, tags: [ TagItem { @@ -224,7 +218,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -249,7 +243,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -262,7 +256,7 @@ ), ctxt: #0, }, - value: Atom('firstName - The user's first name.' type=dynamic), + value: "firstName - The user's first name.", }, }, ), @@ -287,7 +281,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -312,7 +306,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -325,7 +319,7 @@ ), ctxt: #0, }, - value: Atom('middleName - The user's middle name.' type=dynamic), + value: "middleName - The user's middle name.", }, }, ), @@ -350,7 +344,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -375,7 +369,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -388,7 +382,7 @@ ), ctxt: #0, }, - value: Atom('lastName - The user's last name.' type=dynamic), + value: "lastName - The user's last name.", }, }, ), @@ -415,9 +409,7 @@ ), ctxt: #0, }, - value: Atom('Set the user's manager. - * - *' type=dynamic), + value: "Set the user's manager.\n *\n *", }, tags: [ TagItem { @@ -440,7 +432,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -465,7 +457,7 @@ ), ctxt: #0, }, - value: Atom('{Manager}' type=dynamic), + value: "{Manager}", }, ), desc: Text { @@ -478,7 +470,7 @@ ), ctxt: #0, }, - value: Atom('manager - The manager.' type=dynamic), + value: "manager - The manager.", }, }, ), @@ -505,9 +497,7 @@ ), ctxt: #0, }, - value: Atom('Set whether the user is currently active. - * - *' type=dynamic), + value: "Set whether the user is currently active.\n *\n *", }, tags: [ TagItem { @@ -530,7 +520,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -555,7 +545,7 @@ ), ctxt: #0, }, - value: Atom('{boolean}' type=dynamic), + value: "{boolean}", }, ), desc: Text { @@ -568,7 +558,7 @@ ), ctxt: #0, }, - value: Atom('isActive - Set to `true` if active; otherwise, `false`.' type=dynamic), + value: "isActive - Set to `true` if active; otherwise, `false`.", }, }, ), @@ -595,8 +585,7 @@ ), ctxt: #0, }, - value: Atom('Set the year in which the employee was born. - *' type=dynamic), + value: "Set the year in which the employee was born.\n *", }, tags: [ TagItem { @@ -619,7 +608,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -644,7 +633,7 @@ ), ctxt: #0, }, - value: Atom('{number}' type=dynamic), + value: "{number}", }, ), desc: Text { @@ -657,7 +646,7 @@ ), ctxt: #0, }, - value: Atom('year - The four-digit birth year.' type=dynamic), + value: "year - The four-digit birth year.", }, }, ), @@ -684,9 +673,7 @@ ), ctxt: #0, }, - value: Atom('Set the name of the user's dog. At this time, only one dog is supported. - * - *' type=dynamic), + value: "Set the name of the user's dog. At this time, only one dog is supported.\n *\n *", }, tags: [ TagItem { @@ -709,7 +696,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -734,7 +721,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -747,7 +734,7 @@ ), ctxt: #0, }, - value: Atom('dogName - The name of the user's dog.' type=dynamic), + value: "dogName - The name of the user's dog.", }, }, ), @@ -774,9 +761,7 @@ ), ctxt: #0, }, - value: Atom('Set the user's favorite pizza toppings. - * - *' type=dynamic), + value: "Set the user's favorite pizza toppings.\n *\n *", }, tags: [ TagItem { @@ -799,7 +784,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -824,7 +809,7 @@ ), ctxt: #0, }, - value: Atom('{PizzaToppings}' type=dynamic), + value: "{PizzaToppings}", }, ), desc: Text { @@ -837,7 +822,7 @@ ), ctxt: #0, }, - value: Atom('toppings - The user's favorite toppings.' type=dynamic), + value: "toppings - The user's favorite toppings.", }, }, ), @@ -864,9 +849,7 @@ ), ctxt: #0, }, - value: Atom('Set whether the user is a ninja. - * - *' type=dynamic), + value: "Set whether the user is a ninja.\n *\n *", }, tags: [ TagItem { @@ -889,7 +872,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -914,7 +897,7 @@ ), ctxt: #0, }, - value: Atom('{boolean}' type=dynamic), + value: "{boolean}", }, ), desc: Text { @@ -927,7 +910,7 @@ ), ctxt: #0, }, - value: Atom('isNinja - Set to `true` if the user is a ninja; otherwise, `false`.' type=dynamic), + value: "isNinja - Set to `true` if the user is a ninja; otherwise, `false`.", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/defaultparams2.debug b/crates/jsdoc/tests/fixtures/defaultparams2.debug index a46d3743b56d..79df674bd70f 100644 --- a/crates/jsdoc/tests/fixtures/defaultparams2.debug +++ b/crates/jsdoc/tests/fixtures/defaultparams2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('Class representing pizza toppings.' type=dynamic), + value: "Class representing pizza toppings.", }, tags: [], }, @@ -43,8 +43,7 @@ ), ctxt: #0, }, - value: Atom('Set whether sardines are included in the pizza toppings. - *' type=dynamic), + value: "Set whether sardines are included in the pizza toppings.\n *", }, tags: [ TagItem { @@ -67,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -92,7 +91,7 @@ ), ctxt: #0, }, - value: Atom('{boolean}' type=dynamic), + value: "{boolean}", }, ), desc: Text { @@ -105,7 +104,7 @@ ), ctxt: #0, }, - value: Atom('[bool] `true` to include sardines, `false` to omit them.' type=dynamic), + value: "[bool] `true` to include sardines, `false` to omit them.", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/defaulttag.debug b/crates/jsdoc/tests/fixtures/defaulttag.debug index 6480ee328782..a1fae1b2dfa7 100644 --- a/crates/jsdoc/tests/fixtures/defaulttag.debug +++ b/crates/jsdoc/tests/fixtures/defaulttag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('default' type=static), + value: "default", }, tag: Default( DefaultTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -92,7 +92,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -115,7 +115,7 @@ ), ctxt: #0, }, - value: Atom('default' type=static), + value: "default", }, tag: Default( DefaultTag { @@ -138,7 +138,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -165,7 +165,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -188,7 +188,7 @@ ), ctxt: #0, }, - value: Atom('default' type=static), + value: "default", }, tag: Default( DefaultTag { @@ -211,7 +211,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -238,7 +238,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -261,7 +261,7 @@ ), ctxt: #0, }, - value: Atom('default' type=static), + value: "default", }, tag: Default( DefaultTag { @@ -284,7 +284,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -311,7 +311,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -334,7 +334,7 @@ ), ctxt: #0, }, - value: Atom('default' type=static), + value: "default", }, tag: Default( DefaultTag { @@ -357,7 +357,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -384,7 +384,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -407,7 +407,7 @@ ), ctxt: #0, }, - value: Atom('default' type=static), + value: "default", }, tag: Default( DefaultTag { @@ -430,7 +430,7 @@ ), ctxt: #0, }, - value: Atom('the parent window' type=dynamic), + value: "the parent window", }, }, ), @@ -457,7 +457,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -480,7 +480,7 @@ ), ctxt: #0, }, - value: Atom('default' type=static), + value: "default", }, tag: Default( DefaultTag { @@ -503,7 +503,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -530,7 +530,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -553,7 +553,7 @@ ), ctxt: #0, }, - value: Atom('default' type=static), + value: "default", }, tag: Default( DefaultTag { @@ -576,7 +576,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -603,7 +603,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -626,7 +626,7 @@ ), ctxt: #0, }, - value: Atom('default' type=static), + value: "default", }, tag: Default( DefaultTag { @@ -649,7 +649,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -676,7 +676,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -699,7 +699,7 @@ ), ctxt: #0, }, - value: Atom('default' type=static), + value: "default", }, tag: Default( DefaultTag { @@ -722,7 +722,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -749,7 +749,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -772,7 +772,7 @@ ), ctxt: #0, }, - value: Atom('default' type=static), + value: "default", }, tag: Default( DefaultTag { @@ -795,7 +795,7 @@ ), ctxt: #0, }, - value: Atom('* @type {string}' type=dynamic), + value: "* @type {string}", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/definetag.debug b/crates/jsdoc/tests/fixtures/definetag.debug index 189854c54ece..f57f368b5742 100644 --- a/crates/jsdoc/tests/fixtures/definetag.debug +++ b/crates/jsdoc/tests/fixtures/definetag.debug @@ -19,9 +19,7 @@ ), ctxt: #0, }, - value: Atom('Controls whether debugging is enabled. - * - *' type=dynamic), + value: "Controls whether debugging is enabled.\n *\n *", }, tags: [ TagItem { @@ -44,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('define' type=inline), + value: "define", }, tag: Unknown( UnknownTag { @@ -67,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('{boolean} `true` if enabled, `false` otherwise' type=dynamic), + value: "{boolean} `true` if enabled, `false` otherwise", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/deprecatedtag.debug b/crates/jsdoc/tests/fixtures/deprecatedtag.debug index a148597c4314..5061da0814f4 100644 --- a/crates/jsdoc/tests/fixtures/deprecatedtag.debug +++ b/crates/jsdoc/tests/fixtures/deprecatedtag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('deprecated' type=dynamic), + value: "deprecated", }, tag: Deprecated( DeprecatedTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -92,7 +92,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -115,7 +115,7 @@ ), ctxt: #0, }, - value: Atom('deprecated' type=dynamic), + value: "deprecated", }, tag: Deprecated( DeprecatedTag { @@ -138,7 +138,7 @@ ), ctxt: #0, }, - value: Atom('since version 2.0' type=dynamic), + value: "since version 2.0", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/descriptiontag.debug b/crates/jsdoc/tests/fixtures/descriptiontag.debug index 29f865bf6be1..f8b8f218086b 100644 --- a/crates/jsdoc/tests/fixtures/descriptiontag.debug +++ b/crates/jsdoc/tests/fixtures/descriptiontag.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('Blah Blah Blah - *' type=dynamic), + value: "Blah Blah Blah\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('desc' type=static), + value: "desc", }, tag: Description( DescriptionTag { @@ -66,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('halb halb halb' type=dynamic), + value: "halb halb halb", }, }, ), @@ -93,7 +92,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -116,7 +115,7 @@ ), ctxt: #0, }, - value: Atom('description' type=dynamic), + value: "description", }, tag: Description( DescriptionTag { @@ -139,7 +138,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/destructuring.debug b/crates/jsdoc/tests/fixtures/destructuring.debug index c7bfe2e9c4f5..1481e90a14f8 100644 --- a/crates/jsdoc/tests/fixtures/destructuring.debug +++ b/crates/jsdoc/tests/fixtures/destructuring.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('A builder function for the Stick application;' type=dynamic), + value: "A builder function for the Stick application;", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('var' type=static), + value: "var", }, tag: Member( MemberTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, name: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('function' type=static), + value: "function", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/dicttag.debug b/crates/jsdoc/tests/fixtures/dicttag.debug index de162ca955f7..8fd92f0e6f33 100644 --- a/crates/jsdoc/tests/fixtures/dicttag.debug +++ b/crates/jsdoc/tests/fixtures/dicttag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -66,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('* @dict' type=inline), + value: "* @dict", }, ), name: None, diff --git a/crates/jsdoc/tests/fixtures/doclet.debug b/crates/jsdoc/tests/fixtures/doclet.debug index b4bcf6a57193..4a3238c3e197 100644 --- a/crates/jsdoc/tests/fixtures/doclet.debug +++ b/crates/jsdoc/tests/fixtures/doclet.debug @@ -19,11 +19,7 @@ ), ctxt: #0, }, - value: Atom('Markdown asterisks in a doclet that does not use leading asterisks. - **Strong** is strong. - - * List item 1. - * List item 2.' type=dynamic), + value: "Markdown asterisks in a doclet that does not use leading asterisks.\n **Strong** is strong.\n\n * List item 1.\n * List item 2.", }, tags: [ TagItem { @@ -46,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -71,7 +67,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -84,7 +80,7 @@ ), ctxt: #0, }, - value: Atom('thingy - The thingy.' type=dynamic), + value: "thingy - The thingy.", }, }, ), @@ -111,12 +107,7 @@ ), ctxt: #0, }, - value: Atom('Markdown asterisks in a doclet that uses leading asterisks. - * **Strong** is strong. - * - * * List item 1. - * * List item 2. - *' type=dynamic), + value: "Markdown asterisks in a doclet that uses leading asterisks.\n * **Strong** is strong.\n *\n * * List item 1.\n * * List item 2.\n *", }, tags: [ TagItem { @@ -139,7 +130,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -164,7 +155,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -177,7 +168,7 @@ ), ctxt: #0, }, - value: Atom('thingy - The thingy.' type=dynamic), + value: "thingy - The thingy.", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/emptycomments.debug b/crates/jsdoc/tests/fixtures/emptycomments.debug index 4891010960dd..ff9e22132f0f 100644 --- a/crates/jsdoc/tests/fixtures/emptycomments.debug +++ b/crates/jsdoc/tests/fixtures/emptycomments.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [], }, @@ -43,7 +43,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [], }, @@ -67,7 +67,7 @@ ), ctxt: #0, }, - value: Atom(' ' type=inline), + value: "\t ", }, tags: [], }, @@ -91,7 +91,7 @@ ), ctxt: #0, }, - value: Atom(' ' type=inline), + value: "\t\t\t ", }, tags: [], }, @@ -115,7 +115,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [], }, @@ -139,7 +139,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/enumtag.debug b/crates/jsdoc/tests/fixtures/enumtag.debug index f84115d5e9c4..d73f1764a1af 100644 --- a/crates/jsdoc/tests/fixtures/enumtag.debug +++ b/crates/jsdoc/tests/fixtures/enumtag.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('Enum for tri-state values. - *' type=dynamic), + value: "Enum for tri-state values.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('enum' type=static), + value: "enum", }, tag: Enum( EnumTag { @@ -66,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('{number}' type=dynamic), + value: "{number}", }, }, ), @@ -93,7 +92,7 @@ ), ctxt: #0, }, - value: Atom('true' type=static), + value: "true", }, tags: [], }, @@ -117,7 +116,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -140,7 +139,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -163,7 +162,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -190,8 +189,7 @@ ), ctxt: #0, }, - value: Atom('Numeric enum for true/false values. - *' type=dynamic), + value: "Numeric enum for true/false values.\n *", }, tags: [ TagItem { @@ -214,7 +212,7 @@ ), ctxt: #0, }, - value: Atom('enum' type=static), + value: "enum", }, tag: Enum( EnumTag { @@ -237,7 +235,7 @@ ), ctxt: #0, }, - value: Atom('{boolean}' type=dynamic), + value: "{boolean}", }, }, ), @@ -264,7 +262,7 @@ ), ctxt: #0, }, - value: Atom('false' type=static), + value: "false", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/enumtag2.debug b/crates/jsdoc/tests/fixtures/enumtag2.debug index 27f72124eb7c..71fc56d92115 100644 --- a/crates/jsdoc/tests/fixtures/enumtag2.debug +++ b/crates/jsdoc/tests/fixtures/enumtag2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('my' type=inline), + value: "my", }, }, ), @@ -104,8 +104,7 @@ ), ctxt: #0, }, - value: Atom('Enum for quad-state values. - *' type=dynamic), + value: "Enum for quad-state values.\n *", }, tags: [ TagItem { @@ -128,7 +127,7 @@ ), ctxt: #0, }, - value: Atom('enum' type=static), + value: "enum", }, tag: Enum( EnumTag { @@ -151,7 +150,7 @@ ), ctxt: #0, }, - value: Atom('{number}' type=dynamic), + value: "{number}", }, }, ), @@ -176,7 +175,7 @@ ), ctxt: #0, }, - value: Atom('memberof' type=dynamic), + value: "memberof", }, tag: MemberOf( MemberOfTag { @@ -210,7 +209,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, ], }, @@ -239,7 +238,7 @@ ), ctxt: #0, }, - value: Atom('true' type=static), + value: "true", }, tags: [], }, @@ -263,8 +262,7 @@ ), ctxt: #0, }, - value: Atom('Enum for penta-state values. - *' type=dynamic), + value: "Enum for penta-state values.\n *", }, tags: [ TagItem { @@ -287,7 +285,7 @@ ), ctxt: #0, }, - value: Atom('enum' type=static), + value: "enum", }, tag: Enum( EnumTag { @@ -310,7 +308,7 @@ ), ctxt: #0, }, - value: Atom('{number}' type=dynamic), + value: "{number}", }, }, ), @@ -337,8 +335,7 @@ ), ctxt: #0, }, - value: Atom('Enum for penta-state values, BUT SHOUTIER. - *' type=dynamic), + value: "Enum for penta-state values, BUT SHOUTIER.\n *", }, tags: [ TagItem { @@ -361,7 +358,7 @@ ), ctxt: #0, }, - value: Atom('enum' type=static), + value: "enum", }, tag: Enum( EnumTag { @@ -384,7 +381,7 @@ ), ctxt: #0, }, - value: Atom('{number}' type=dynamic), + value: "{number}", }, }, ), @@ -411,7 +408,7 @@ ), ctxt: #0, }, - value: Atom('true' type=static), + value: "true", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/enumtag3.debug b/crates/jsdoc/tests/fixtures/enumtag3.debug index 884f662e2ddb..f808eb95a0be 100644 --- a/crates/jsdoc/tests/fixtures/enumtag3.debug +++ b/crates/jsdoc/tests/fixtures/enumtag3.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('exports' type=inline), + value: "exports", }, tag: Exports( ExportsTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('mymodule' type=dynamic), + value: "mymodule", }, }, ), @@ -90,7 +90,7 @@ ), ctxt: #0, }, - value: Atom('enum' type=static), + value: "enum", }, tag: Enum( EnumTag { @@ -113,7 +113,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/eventfirestag.debug b/crates/jsdoc/tests/fixtures/eventfirestag.debug index 31a5c6d8c6f7..5226ac66d5aa 100644 --- a/crates/jsdoc/tests/fixtures/eventfirestag.debug +++ b/crates/jsdoc/tests/fixtures/eventfirestag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -82,9 +82,7 @@ ), ctxt: #0, }, - value: Atom('Throw a snowball. - * - *' type=dynamic), + value: "Throw a snowball.\n *\n *", }, tags: [ TagItem { @@ -107,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('fires' type=inline), + value: "fires", }, tag: Unknown( UnknownTag { @@ -130,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('Hurl#snowball' type=dynamic), + value: "Hurl#snowball", }, }, ), @@ -155,7 +153,7 @@ ), ctxt: #0, }, - value: Atom('fires' type=inline), + value: "fires", }, tag: Unknown( UnknownTag { @@ -178,7 +176,7 @@ ), ctxt: #0, }, - value: Atom('Hurl#event:brick' type=dynamic), + value: "Hurl#event:brick", }, }, ), @@ -205,7 +203,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -228,7 +226,7 @@ ), ctxt: #0, }, - value: Atom('event' type=inline), + value: "event", }, tag: Unknown( UnknownTag { @@ -251,7 +249,7 @@ ), ctxt: #0, }, - value: Atom('Hurl#snowball' type=dynamic), + value: "Hurl#snowball", }, }, ), @@ -278,9 +276,7 @@ ), ctxt: #0, }, - value: Atom('Throw a football match. - * - *' type=dynamic), + value: "Throw a football match.\n *\n *", }, tags: [ TagItem { @@ -303,7 +299,7 @@ ), ctxt: #0, }, - value: Atom('emits' type=inline), + value: "emits", }, tag: Unknown( UnknownTag { @@ -326,7 +322,7 @@ ), ctxt: #0, }, - value: Atom('Hurl#footballMatch' type=dynamic), + value: "Hurl#footballMatch", }, }, ), @@ -353,7 +349,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -376,7 +372,7 @@ ), ctxt: #0, }, - value: Atom('event' type=inline), + value: "event", }, tag: Unknown( UnknownTag { @@ -399,7 +395,7 @@ ), ctxt: #0, }, - value: Atom('Hurl#footballMatch' type=dynamic), + value: "Hurl#footballMatch", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/eventorder.debug b/crates/jsdoc/tests/fixtures/eventorder.debug index 05dff2311205..ad551f9f579a 100644 --- a/crates/jsdoc/tests/fixtures/eventorder.debug +++ b/crates/jsdoc/tests/fixtures/eventorder.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('Socket class. - *' type=dynamic), + value: "Socket class.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -83,8 +82,7 @@ ), ctxt: #0, }, - value: Atom('Send a packet. - *' type=dynamic), + value: "Send a packet.\n *", }, tags: [ TagItem { @@ -107,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -132,7 +130,7 @@ ), ctxt: #0, }, - value: Atom('{Packet}' type=dynamic), + value: "{Packet}", }, ), desc: Text { @@ -145,7 +143,7 @@ ), ctxt: #0, }, - value: Atom('packet - The packet to send.' type=dynamic), + value: "packet - The packet to send.", }, }, ), @@ -170,7 +168,7 @@ ), ctxt: #0, }, - value: Atom('return' type=static), + value: "return", }, tag: Return( ReturnTag { @@ -194,7 +192,7 @@ ), ctxt: #0, }, - value: Atom('{boolean}' type=dynamic), + value: "{boolean}", }, ), description: Text { @@ -207,7 +205,7 @@ ), ctxt: #0, }, - value: Atom('`true` on success, `false` on failure.' type=dynamic), + value: "`true` on success, `false` on failure.", }, }, ), @@ -234,8 +232,7 @@ ), ctxt: #0, }, - value: Atom('Virtual doclet for `Packet` class. - *' type=dynamic), + value: "Virtual doclet for `Packet` class.\n *", }, tags: [ TagItem { @@ -258,7 +255,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -282,7 +279,7 @@ ), ctxt: #0, }, - value: Atom('Packet' type=inline), + value: "Packet", }, ), name: None, @@ -311,7 +308,7 @@ ), ctxt: #0, }, - value: Atom('Close the socket.' type=dynamic), + value: "Close the socket.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/exampletag.debug b/crates/jsdoc/tests/fixtures/exampletag.debug index dc5a960b5f82..e9439ebf1627 100644 --- a/crates/jsdoc/tests/fixtures/exampletag.debug +++ b/crates/jsdoc/tests/fixtures/exampletag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('example' type=inline), + value: "example", }, tag: Example( ExampleTag { @@ -65,9 +65,7 @@ ), ctxt: #0, }, - value: Atom('* console.log("foo"); - * console.log("bar"); - ' type=dynamic), + value: "* console.log(\"foo\");\n * console.log(\"bar\");\n ", }, }, ), @@ -94,7 +92,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -117,7 +115,7 @@ ), ctxt: #0, }, - value: Atom('example' type=inline), + value: "example", }, tag: Example( ExampleTag { @@ -140,9 +138,7 @@ ), ctxt: #0, }, - value: Atom('* console.log("foo"); - * console.log("bar"); - * ' type=dynamic), + value: "* console.log(\"foo\");\n * console.log(\"bar\");\n * ", }, }, ), @@ -167,7 +163,7 @@ ), ctxt: #0, }, - value: Atom('example' type=inline), + value: "example", }, tag: Example( ExampleTag { @@ -190,9 +186,7 @@ ), ctxt: #0, }, - value: Atom('* Example 2 - * 1 + 2; - ' type=dynamic), + value: "* Example 2\n * 1 + 2;\n ", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/exceptiontag.debug b/crates/jsdoc/tests/fixtures/exceptiontag.debug index b5e0cb6ff67b..9eaab3cc51dc 100644 --- a/crates/jsdoc/tests/fixtures/exceptiontag.debug +++ b/crates/jsdoc/tests/fixtures/exceptiontag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('throws' type=inline), + value: "throws", }, tag: Throw( ThrowTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('{InvalidArgumentException}' type=dynamic), + value: "{InvalidArgumentException}", }, }, ), @@ -92,7 +92,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -115,7 +115,7 @@ ), ctxt: #0, }, - value: Atom('exception' type=dynamic), + value: "exception", }, tag: Unknown( UnknownTag { @@ -138,7 +138,7 @@ ), ctxt: #0, }, - value: Atom('Will throw an error if argument is null.' type=dynamic), + value: "Will throw an error if argument is null.", }, }, ), @@ -165,7 +165,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -188,7 +188,7 @@ ), ctxt: #0, }, - value: Atom('exception' type=dynamic), + value: "exception", }, tag: Unknown( UnknownTag { @@ -211,7 +211,7 @@ ), ctxt: #0, }, - value: Atom('{DivideByZero} Argument x must be non-zero.' type=dynamic), + value: "{DivideByZero} Argument x must be non-zero.", }, }, ), @@ -238,9 +238,7 @@ ), ctxt: #0, }, - value: Atom('A description of the function. - * - *' type=dynamic), + value: "A description of the function.\n *\n *", }, tags: [ TagItem { @@ -263,7 +261,7 @@ ), ctxt: #0, }, - value: Atom('exception' type=dynamic), + value: "exception", }, tag: Unknown( UnknownTag { @@ -286,7 +284,7 @@ ), ctxt: #0, }, - value: Atom('{Object} A description of the exception.' type=dynamic), + value: "{Object} A description of the exception.", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/exportclass.debug b/crates/jsdoc/tests/fixtures/exportclass.debug index 7d906a1c1bd9..ffbedb79f201 100644 --- a/crates/jsdoc/tests/fixtures/exportclass.debug +++ b/crates/jsdoc/tests/fixtures/exportclass.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('Foo module - *' type=dynamic), + value: "Foo module\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -66,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -78,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('foo' type=inline), + value: "foo", }, }, ), @@ -105,7 +104,7 @@ ), ctxt: #0, }, - value: Atom('Class description' type=dynamic), + value: "Class description", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/exportdefault.debug b/crates/jsdoc/tests/fixtures/exportdefault.debug index fe1cc964a033..0a3d32a244c6 100644 --- a/crates/jsdoc/tests/fixtures/exportdefault.debug +++ b/crates/jsdoc/tests/fixtures/exportdefault.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('test' type=inline), + value: "test", }, }, ), @@ -104,7 +104,7 @@ ), ctxt: #0, }, - value: Atom('Test value' type=dynamic), + value: "Test value", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/exportdefaultclass.debug b/crates/jsdoc/tests/fixtures/exportdefaultclass.debug index 59755bdf9f83..7b0027baf2bf 100644 --- a/crates/jsdoc/tests/fixtures/exportdefaultclass.debug +++ b/crates/jsdoc/tests/fixtures/exportdefaultclass.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('test' type=inline), + value: "test", }, }, ), @@ -104,7 +104,7 @@ ), ctxt: #0, }, - value: Atom('Test class' type=dynamic), + value: "Test class", }, tags: [], }, @@ -128,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('Test constructor' type=dynamic), + value: "Test constructor", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/exports.debug b/crates/jsdoc/tests/fixtures/exports.debug index f0a62d7679a4..611c9c6d2716 100644 --- a/crates/jsdoc/tests/fixtures/exports.debug +++ b/crates/jsdoc/tests/fixtures/exports.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('An example of a server-side JavaScript module. - *' type=dynamic), + value: "An example of a server-side JavaScript module.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -66,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('world' type=inline), + value: "world", }, ty: Text { span: Span { @@ -78,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('hello' type=inline), + value: "hello", }, }, ), @@ -103,7 +102,7 @@ ), ctxt: #0, }, - value: Atom('example' type=inline), + value: "example", }, tag: Example( ExampleTag { @@ -126,8 +125,7 @@ ), ctxt: #0, }, - value: Atom('* var g = require('hello/world').sayHello('Gracie'); - ' type=dynamic), + value: "* var g = require('hello/world').sayHello('Gracie');\n ", }, }, ), @@ -154,8 +152,7 @@ ), ctxt: #0, }, - value: Atom('Generate a greeting. - *' type=dynamic), + value: "Generate a greeting.\n *", }, tags: [ TagItem { @@ -178,7 +175,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -203,7 +200,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -216,7 +213,7 @@ ), ctxt: #0, }, - value: Atom('[subject="world"] To whom we say hello.' type=dynamic), + value: "[subject=\"world\"] To whom we say hello.", }, }, ), @@ -241,7 +238,7 @@ ), ctxt: #0, }, - value: Atom('returns' type=inline), + value: "returns", }, tag: Return( ReturnTag { @@ -265,7 +262,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), description: Text { @@ -278,7 +275,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -305,8 +302,7 @@ ), ctxt: #0, }, - value: Atom('Generate a morose farewell. - *' type=dynamic), + value: "Generate a morose farewell.\n *", }, tags: [ TagItem { @@ -329,7 +325,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -354,7 +350,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -367,7 +363,7 @@ ), ctxt: #0, }, - value: Atom('[subject="world"] To whom we say goodbye.' type=dynamic), + value: "[subject=\"world\"] To whom we say goodbye.", }, }, ), @@ -392,7 +388,7 @@ ), ctxt: #0, }, - value: Atom('returns' type=inline), + value: "returns", }, tag: Return( ReturnTag { @@ -416,7 +412,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), description: Text { @@ -429,7 +425,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/exportstag.debug b/crates/jsdoc/tests/fixtures/exportstag.debug index f001a48810e7..b6f1cf99d012 100644 --- a/crates/jsdoc/tests/fixtures/exportstag.debug +++ b/crates/jsdoc/tests/fixtures/exportstag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('A module representing a shirt.' type=dynamic), + value: "A module representing a shirt.", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('exports' type=inline), + value: "exports", }, tag: Exports( ExportsTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('my/shirt' type=dynamic), + value: "my/shirt", }, }, ), @@ -90,7 +90,7 @@ ), ctxt: #0, }, - value: Atom('version' type=inline), + value: "version", }, tag: Version( VersionTag { @@ -113,7 +113,7 @@ ), ctxt: #0, }, - value: Atom('1.0' type=inline), + value: "1.0", }, }, ), @@ -140,7 +140,7 @@ ), ctxt: #0, }, - value: Atom('A property of the module.' type=dynamic), + value: "A property of the module.", }, tags: [], }, @@ -164,7 +164,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -187,7 +187,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -227,7 +227,7 @@ ), ctxt: #0, }, - value: Atom('A property of the class.' type=dynamic), + value: "A property of the class.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/exportstag2.debug b/crates/jsdoc/tests/fixtures/exportstag2.debug index 2902aeb7ccda..a48ab8ddbcf5 100644 --- a/crates/jsdoc/tests/fixtures/exportstag2.debug +++ b/crates/jsdoc/tests/fixtures/exportstag2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('A module representing a coat.' type=dynamic), + value: "A module representing a coat.", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('exports' type=inline), + value: "exports", }, tag: Exports( ExportsTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('my/coat' type=inline), + value: "my/coat", }, }, ), @@ -90,7 +90,7 @@ ), ctxt: #0, }, - value: Atom('requires' type=dynamic), + value: "requires", }, tag: Requires( RequiresTag { @@ -124,7 +124,7 @@ ), ctxt: #0, }, - value: Atom('my' type=inline), + value: "my", }, ], }, @@ -153,7 +153,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/exportstag3.debug b/crates/jsdoc/tests/fixtures/exportstag3.debug index f924d1ab34da..6f9f580f4e79 100644 --- a/crates/jsdoc/tests/fixtures/exportstag3.debug +++ b/crates/jsdoc/tests/fixtures/exportstag3.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('Utility functions to ease working with DOM elements.' type=dynamic), + value: "Utility functions to ease working with DOM elements.", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('exports' type=inline), + value: "exports", }, tag: Exports( ExportsTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('html/utils' type=dynamic), + value: "html/utils", }, }, ), @@ -92,7 +92,7 @@ ), ctxt: #0, }, - value: Atom('Get the value of a property on an element.' type=dynamic), + value: "Get the value of a property on an element.", }, tags: [], }, @@ -116,7 +116,7 @@ ), ctxt: #0, }, - value: Atom('Determine if an element is in the document head.' type=dynamic), + value: "Determine if an element is in the document head.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/exportstag4.debug b/crates/jsdoc/tests/fixtures/exportstag4.debug index 0c8542880a50..2d3f0d091ad9 100644 --- a/crates/jsdoc/tests/fixtures/exportstag4.debug +++ b/crates/jsdoc/tests/fixtures/exportstag4.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('exports' type=inline), + value: "exports", }, tag: Exports( ExportsTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -92,7 +92,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -115,7 +115,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -155,7 +155,7 @@ ), ctxt: #0, }, - value: Atom('Some method' type=dynamic), + value: "Some method", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/exportstag5.debug b/crates/jsdoc/tests/fixtures/exportstag5.debug index cdc0988bbbdc..661b80215c33 100644 --- a/crates/jsdoc/tests/fixtures/exportstag5.debug +++ b/crates/jsdoc/tests/fixtures/exportstag5.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('exports' type=inline), + value: "exports", }, tag: Exports( ExportsTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -92,7 +92,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -115,7 +115,7 @@ ), ctxt: #0, }, - value: Atom('lends' type=inline), + value: "lends", }, tag: Lends( LendsTag { @@ -149,7 +149,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, ], }, @@ -178,7 +178,7 @@ ), ctxt: #0, }, - value: Atom('This should be in the Foo module doc.' type=dynamic), + value: "This should be in the Foo module doc.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/exportstag6.debug b/crates/jsdoc/tests/fixtures/exportstag6.debug index de479b2e32be..f6f99f539ee7 100644 --- a/crates/jsdoc/tests/fixtures/exportstag6.debug +++ b/crates/jsdoc/tests/fixtures/exportstag6.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('A module representing a shirt. - *' type=dynamic), + value: "A module representing a shirt.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('exports' type=inline), + value: "exports", }, tag: Exports( ExportsTag { @@ -66,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('my/shirt' type=dynamic), + value: "my/shirt", }, }, ), @@ -91,7 +90,7 @@ ), ctxt: #0, }, - value: Atom('version' type=inline), + value: "version", }, tag: Version( VersionTag { @@ -114,7 +113,7 @@ ), ctxt: #0, }, - value: Atom('1.0' type=inline), + value: "1.0", }, }, ), @@ -141,7 +140,7 @@ ), ctxt: #0, }, - value: Atom('A property of the module.' type=dynamic), + value: "A property of the module.", }, tags: [], }, @@ -165,7 +164,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -188,7 +187,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -228,7 +227,7 @@ ), ctxt: #0, }, - value: Atom('A property of the class.' type=dynamic), + value: "A property of the class.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/exportstag7.debug b/crates/jsdoc/tests/fixtures/exportstag7.debug index cea94dc747dd..b5715433ffac 100644 --- a/crates/jsdoc/tests/fixtures/exportstag7.debug +++ b/crates/jsdoc/tests/fixtures/exportstag7.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('exports' type=inline), + value: "exports", }, tag: Exports( ExportsTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -92,7 +92,7 @@ ), ctxt: #0, }, - value: Atom('A property of the module.' type=dynamic), + value: "A property of the module.", }, tags: [], }, @@ -116,7 +116,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -139,7 +139,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -179,7 +179,7 @@ ), ctxt: #0, }, - value: Atom('A property of the class.' type=dynamic), + value: "A property of the class.", }, tags: [], }, @@ -203,7 +203,7 @@ ), ctxt: #0, }, - value: Atom('Iron the turtleneck.' type=dynamic), + value: "Iron the turtleneck.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/exportstag8.debug b/crates/jsdoc/tests/fixtures/exportstag8.debug index 981e34df8a5e..25afc8a88982 100644 --- a/crates/jsdoc/tests/fixtures/exportstag8.debug +++ b/crates/jsdoc/tests/fixtures/exportstag8.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('exports' type=inline), + value: "exports", }, tag: Exports( ExportsTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/exporttag.debug b/crates/jsdoc/tests/fixtures/exporttag.debug index 6933dc6a8949..4d67356bc5ea 100644 --- a/crates/jsdoc/tests/fixtures/exporttag.debug +++ b/crates/jsdoc/tests/fixtures/exporttag.debug @@ -19,9 +19,7 @@ ), ctxt: #0, }, - value: Atom('My class. - * - *' type=dynamic), + value: "My class.\n *\n *", }, tags: [ TagItem { @@ -44,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -68,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('* @export' type=dynamic), + value: "* @export", }, ), name: None, @@ -97,9 +95,7 @@ ), ctxt: #0, }, - value: Atom('My public method. - * - *' type=dynamic), + value: "My public method.\n *\n *", }, tags: [ TagItem { @@ -122,7 +118,7 @@ ), ctxt: #0, }, - value: Atom('export' type=static), + value: "export", }, tag: Unknown( UnknownTag { @@ -145,7 +141,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/externaltag.debug b/crates/jsdoc/tests/fixtures/externaltag.debug index d283783ee926..b757d1e4b934 100644 --- a/crates/jsdoc/tests/fixtures/externaltag.debug +++ b/crates/jsdoc/tests/fixtures/externaltag.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('The built in string object. - *' type=dynamic), + value: "The built in string object.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('external' type=dynamic), + value: "external", }, tag: External( ExternalTag { @@ -66,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('String' type=static), + value: "String", }, }, ), @@ -91,7 +90,7 @@ ), ctxt: #0, }, - value: Atom('see' type=inline), + value: "see", }, tag: See( SeeTag { @@ -114,7 +113,7 @@ ), ctxt: #0, }, - value: Atom('{@link https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/String String}' type=dynamic), + value: "{@link https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/String String}", }, }, ), @@ -141,8 +140,7 @@ ), ctxt: #0, }, - value: Atom('Adds a new method to the built-in string. - *' type=dynamic), + value: "Adds a new method to the built-in string.\n *", }, tags: [ TagItem { @@ -165,7 +163,7 @@ ), ctxt: #0, }, - value: Atom('function' type=static), + value: "function", }, tag: Function( FunctionTag { @@ -189,7 +187,7 @@ ), ctxt: #0, }, - value: Atom('external:String#rot13' type=dynamic), + value: "external:String#rot13", }, ), }, @@ -215,7 +213,7 @@ ), ctxt: #0, }, - value: Atom('example' type=inline), + value: "example", }, tag: Example( ExampleTag { @@ -238,9 +236,7 @@ ), ctxt: #0, }, - value: Atom('* var greeting = new String('hello world'); - * console.log( greeting.rot13() ); // uryyb jbeyq - ' type=dynamic), + value: "* var greeting = new String('hello world');\n * console.log( greeting.rot13() ); // uryyb jbeyq\n ", }, }, ), @@ -267,8 +263,7 @@ ), ctxt: #0, }, - value: Atom('The jQuery plugin namespace. - *' type=dynamic), + value: "The jQuery plugin namespace.\n *", }, tags: [ TagItem { @@ -291,7 +286,7 @@ ), ctxt: #0, }, - value: Atom('external' type=dynamic), + value: "external", }, tag: External( ExternalTag { @@ -314,7 +309,7 @@ ), ctxt: #0, }, - value: Atom('"jQuery.fn"' type=dynamic), + value: "\"jQuery.fn\"", }, }, ), @@ -339,7 +334,7 @@ ), ctxt: #0, }, - value: Atom('see' type=inline), + value: "see", }, tag: See( SeeTag { @@ -362,7 +357,7 @@ ), ctxt: #0, }, - value: Atom('{@link http://docs.jquery.com/Plugins/Authoring The jQuery Plugin Guide}' type=dynamic), + value: "{@link http://docs.jquery.com/Plugins/Authoring The jQuery Plugin Guide}", }, }, ), @@ -389,8 +384,7 @@ ), ctxt: #0, }, - value: Atom('A jQuery plugin to make stars fly around your home page. - *' type=dynamic), + value: "A jQuery plugin to make stars fly around your home page.\n *", }, tags: [ TagItem { @@ -413,7 +407,7 @@ ), ctxt: #0, }, - value: Atom('function' type=static), + value: "function", }, tag: Function( FunctionTag { @@ -437,7 +431,7 @@ ), ctxt: #0, }, - value: Atom('external:"jQuery.fn".starfairy' type=dynamic), + value: "external:\"jQuery.fn\".starfairy", }, ), }, diff --git a/crates/jsdoc/tests/fixtures/externaltag2.debug b/crates/jsdoc/tests/fixtures/externaltag2.debug index 7f7815ca4059..1341eda28bad 100644 --- a/crates/jsdoc/tests/fixtures/externaltag2.debug +++ b/crates/jsdoc/tests/fixtures/externaltag2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('Namespace provided by the browser.' type=dynamic), + value: "Namespace provided by the browser.", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('external' type=dynamic), + value: "external", }, tag: External( ExternalTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('XMLHttpRequest' type=static), + value: "XMLHttpRequest", }, }, ), @@ -90,7 +90,7 @@ ), ctxt: #0, }, - value: Atom('see' type=inline), + value: "see", }, tag: See( SeeTag { @@ -113,7 +113,7 @@ ), ctxt: #0, }, - value: Atom('https://developer.mozilla.org/en/xmlhttprequest' type=dynamic), + value: "https://developer.mozilla.org/en/xmlhttprequest", }, }, ), @@ -140,7 +140,7 @@ ), ctxt: #0, }, - value: Atom('Extends the built in XMLHttpRequest to send data encoded with a secret key.' type=dynamic), + value: "Extends the built in XMLHttpRequest to send data encoded with a secret key.", }, tags: [ TagItem { @@ -163,7 +163,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -187,7 +187,7 @@ ), ctxt: #0, }, - value: Atom('EncryptedRequest' type=dynamic), + value: "EncryptedRequest", }, ), name: Some( @@ -201,7 +201,7 @@ ), ctxt: #0, }, - value: Atom('@extends external:XMLHttpRequest' type=dynamic), + value: "@extends external:XMLHttpRequest", }, ), }, diff --git a/crates/jsdoc/tests/fixtures/externaltag3.debug b/crates/jsdoc/tests/fixtures/externaltag3.debug index 030a755405ae..99a5a9b254bb 100644 --- a/crates/jsdoc/tests/fixtures/externaltag3.debug +++ b/crates/jsdoc/tests/fixtures/externaltag3.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('The built in string object. - *' type=dynamic), + value: "The built in string object.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('external' type=dynamic), + value: "external", }, tag: External( ExternalTag { @@ -66,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('{String}' type=dynamic), + value: "{String}", }, }, ), @@ -91,7 +90,7 @@ ), ctxt: #0, }, - value: Atom('see' type=inline), + value: "see", }, tag: See( SeeTag { @@ -114,7 +113,7 @@ ), ctxt: #0, }, - value: Atom('{@link https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/String String}' type=dynamic), + value: "{@link https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/String String}", }, }, ), @@ -141,8 +140,7 @@ ), ctxt: #0, }, - value: Atom('Adds a new method to the built-in string. - *' type=dynamic), + value: "Adds a new method to the built-in string.\n *", }, tags: [ TagItem { @@ -165,7 +163,7 @@ ), ctxt: #0, }, - value: Atom('function' type=static), + value: "function", }, tag: Function( FunctionTag { @@ -189,7 +187,7 @@ ), ctxt: #0, }, - value: Atom('external:String#rot13' type=dynamic), + value: "external:String#rot13", }, ), }, @@ -215,7 +213,7 @@ ), ctxt: #0, }, - value: Atom('example' type=inline), + value: "example", }, tag: Example( ExampleTag { @@ -238,9 +236,7 @@ ), ctxt: #0, }, - value: Atom('* var greeting = new String('hello world'); - * console.log( greeting.rot13() ); // uryyb jbeyq - ' type=dynamic), + value: "* var greeting = new String('hello world');\n * console.log( greeting.rot13() ); // uryyb jbeyq\n ", }, }, ), @@ -267,7 +263,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -290,7 +286,7 @@ ), ctxt: #0, }, - value: Atom('external' type=dynamic), + value: "external", }, tag: External( ExternalTag { @@ -313,7 +309,7 @@ ), ctxt: #0, }, - value: Atom('{"foo.bar.baz"}' type=dynamic), + value: "{\"foo.bar.baz\"}", }, }, ), @@ -340,8 +336,7 @@ ), ctxt: #0, }, - value: Atom('Blah blah - *' type=dynamic), + value: "Blah blah\n *", }, tags: [ TagItem { @@ -364,7 +359,7 @@ ), ctxt: #0, }, - value: Atom('function' type=static), + value: "function", }, tag: Function( FunctionTag { @@ -388,7 +383,7 @@ ), ctxt: #0, }, - value: Atom('external:"foo.bar.baz"#blah' type=dynamic), + value: "external:\"foo.bar.baz\"#blah", }, ), }, diff --git a/crates/jsdoc/tests/fixtures/externstag.debug b/crates/jsdoc/tests/fixtures/externstag.debug index 7ded499e8fb4..51d4594c86a2 100644 --- a/crates/jsdoc/tests/fixtures/externstag.debug +++ b/crates/jsdoc/tests/fixtures/externstag.debug @@ -19,9 +19,7 @@ ), ctxt: #0, }, - value: Atom('This is an externs file. - * - *' type=dynamic), + value: "This is an externs file.\n *\n *", }, tags: [ TagItem { @@ -44,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('externs' type=inline), + value: "externs", }, tag: Unknown( UnknownTag { @@ -67,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/file.debug b/crates/jsdoc/tests/fixtures/file.debug index 7ee8413c8de2..55b62b60c1cc 100644 --- a/crates/jsdoc/tests/fixtures/file.debug +++ b/crates/jsdoc/tests/fixtures/file.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('overview' type=dynamic), + value: "overview", }, tag: File( FileTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('This is a file doclet.' type=dynamic), + value: "This is a file doclet.", }, }, ), @@ -90,7 +90,7 @@ ), ctxt: #0, }, - value: Atom('copyright' type=dynamic), + value: "copyright", }, tag: Copyright( CopyrightTag { @@ -113,7 +113,7 @@ ), ctxt: #0, }, - value: Atom('Michael Mathews 2011' type=dynamic), + value: "Michael Mathews 2011", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/fileoverviewtag.debug b/crates/jsdoc/tests/fixtures/fileoverviewtag.debug index f71aef1f932b..d878da5b98d3 100644 --- a/crates/jsdoc/tests/fixtures/fileoverviewtag.debug +++ b/crates/jsdoc/tests/fixtures/fileoverviewtag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('fileoverview' type=dynamic), + value: "fileoverview", }, tag: File( FileTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('Overview of this file.' type=dynamic), + value: "Overview of this file.", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/funcExpression.debug b/crates/jsdoc/tests/fixtures/funcExpression.debug index 57a7118db422..fa1165a1c5c8 100644 --- a/crates/jsdoc/tests/fixtures/funcExpression.debug +++ b/crates/jsdoc/tests/fixtures/funcExpression.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, @@ -106,7 +106,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/funcExpression2.debug b/crates/jsdoc/tests/fixtures/funcExpression2.debug index f3a2f6a86065..a1875c138729 100644 --- a/crates/jsdoc/tests/fixtures/funcExpression2.debug +++ b/crates/jsdoc/tests/fixtures/funcExpression2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, @@ -106,7 +106,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/funcExpression3.debug b/crates/jsdoc/tests/fixtures/funcExpression3.debug index 66a42fa8f337..e4a7528baec4 100644 --- a/crates/jsdoc/tests/fixtures/funcExpression3.debug +++ b/crates/jsdoc/tests/fixtures/funcExpression3.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, @@ -106,7 +106,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/functiontag.debug b/crates/jsdoc/tests/fixtures/functiontag.debug index d150a1285a28..0052e8d6e130 100644 --- a/crates/jsdoc/tests/fixtures/functiontag.debug +++ b/crates/jsdoc/tests/fixtures/functiontag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('func' type=inline), + value: "func", }, tag: Function( FunctionTag { @@ -81,7 +81,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -104,7 +104,7 @@ ), ctxt: #0, }, - value: Atom('method' type=inline), + value: "method", }, tag: Function( FunctionTag { diff --git a/crates/jsdoc/tests/fixtures/generators.debug b/crates/jsdoc/tests/fixtures/generators.debug index ddac3ce2d0f3..d006e35dd93a 100644 --- a/crates/jsdoc/tests/fixtures/generators.debug +++ b/crates/jsdoc/tests/fixtures/generators.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('Generate unique IDs starting at 0.' type=dynamic), + value: "Generate unique IDs starting at 0.", }, tags: [], }, @@ -43,7 +43,7 @@ ), ctxt: #0, }, - value: Atom('Generate unique IDs starting at 1.' type=dynamic), + value: "Generate unique IDs starting at 1.", }, tags: [], }, @@ -67,7 +67,7 @@ ), ctxt: #0, }, - value: Atom('Generator class.' type=dynamic), + value: "Generator class.", }, tags: [], }, @@ -91,7 +91,7 @@ ), ctxt: #0, }, - value: Atom('Generate unique IDs starting at 2.' type=dynamic), + value: "Generate unique IDs starting at 2.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/getset.debug b/crates/jsdoc/tests/fixtures/getset.debug index 6512084eb102..05609290196a 100644 --- a/crates/jsdoc/tests/fixtures/getset.debug +++ b/crates/jsdoc/tests/fixtures/getset.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('lends' type=inline), + value: "lends", }, tag: Lends( LendsTag { @@ -139,7 +139,7 @@ ), ctxt: #0, }, - value: Atom('Person' type=inline), + value: "Person", }, ], }, @@ -168,7 +168,7 @@ ), ctxt: #0, }, - value: Atom('Set up initial values.' type=dynamic), + value: "Set up initial values.", }, tags: [], }, @@ -192,7 +192,7 @@ ), ctxt: #0, }, - value: Atom('Speak a message.' type=dynamic), + value: "Speak a message.", }, tags: [], }, @@ -216,8 +216,7 @@ ), ctxt: #0, }, - value: Atom('The name of the person. - *' type=dynamic), + value: "The name of the person.\n *", }, tags: [ TagItem { @@ -240,7 +239,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -263,7 +262,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, }, ), @@ -290,7 +289,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -313,7 +312,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -336,7 +335,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, }, ), @@ -361,7 +360,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -386,7 +385,7 @@ ), ctxt: #0, }, - value: Atom('val' type=inline), + value: "val", }, ), desc: Text { @@ -399,7 +398,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -426,7 +425,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -449,7 +448,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -472,7 +471,7 @@ ), ctxt: #0, }, - value: Atom('{number}' type=dynamic), + value: "{number}", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/getset2.debug b/crates/jsdoc/tests/fixtures/getset2.debug index 0b38ea64a585..c727d64a81c3 100644 --- a/crates/jsdoc/tests/fixtures/getset2.debug +++ b/crates/jsdoc/tests/fixtures/getset2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('Employee class.' type=dynamic), + value: "Employee class.", }, tags: [], }, @@ -43,8 +43,7 @@ ), ctxt: #0, }, - value: Atom('Location. - *' type=dynamic), + value: "Location.\n *", }, tags: [ TagItem { @@ -67,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -90,7 +89,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, }, ), @@ -117,7 +116,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -140,7 +139,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -163,7 +162,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/globaltag.debug b/crates/jsdoc/tests/fixtures/globaltag.debug index e97ced4de487..39c24658c05d 100644 --- a/crates/jsdoc/tests/fixtures/globaltag.debug +++ b/crates/jsdoc/tests/fixtures/globaltag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('global' type=static), + value: "global", }, tag: Unknown( UnknownTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('@constructor' type=dynamic), + value: "@constructor", }, }, ), @@ -92,7 +92,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -115,7 +115,7 @@ ), ctxt: #0, }, - value: Atom('global' type=static), + value: "global", }, tag: Unknown( UnknownTag { @@ -138,7 +138,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/hideconstructortag.debug b/crates/jsdoc/tests/fixtures/hideconstructortag.debug index 66797ce7959f..8778a79a945d 100644 --- a/crates/jsdoc/tests/fixtures/hideconstructortag.debug +++ b/crates/jsdoc/tests/fixtures/hideconstructortag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('classdesc' type=dynamic), + value: "classdesc", }, tag: ClassDesc( JSDocClassDescTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('Toaster singleton.' type=dynamic), + value: "Toaster singleton.", }, }, ), @@ -90,7 +90,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -114,7 +114,7 @@ ), ctxt: #0, }, - value: Atom('* @hideconstructor' type=dynamic), + value: "* @hideconstructor", }, ), name: None, @@ -143,9 +143,7 @@ ), ctxt: #0, }, - value: Atom('Toast an item. - * - *' type=dynamic), + value: "Toast an item.\n *\n *", }, tags: [ TagItem { @@ -168,7 +166,7 @@ ), ctxt: #0, }, - value: Atom('alias' type=inline), + value: "alias", }, tag: Alias( AliasTag { @@ -202,7 +200,7 @@ ), ctxt: #0, }, - value: Atom('toast' type=inline), + value: "toast", }, ], }, @@ -229,7 +227,7 @@ ), ctxt: #0, }, - value: Atom('memberof' type=dynamic), + value: "memberof", }, tag: MemberOf( MemberOfTag { @@ -263,7 +261,7 @@ ), ctxt: #0, }, - value: Atom('Toaster' type=inline), + value: "Toaster", }, ], }, @@ -290,7 +288,7 @@ ), ctxt: #0, }, - value: Atom('instance' type=dynamic), + value: "instance", }, tag: Instance( InstanceTag { @@ -326,7 +324,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -351,7 +349,7 @@ ), ctxt: #0, }, - value: Atom('{BreadyThing}' type=dynamic), + value: "{BreadyThing}", }, ), desc: Text { @@ -364,7 +362,7 @@ ), ctxt: #0, }, - value: Atom('item - The item to toast.' type=dynamic), + value: "item - The item to toast.", }, }, ), @@ -389,7 +387,7 @@ ), ctxt: #0, }, - value: Atom('return' type=static), + value: "return", }, tag: Return( ReturnTag { @@ -413,7 +411,7 @@ ), ctxt: #0, }, - value: Atom('{Toast}' type=inline), + value: "{Toast}", }, ), description: Text { @@ -426,7 +424,7 @@ ), ctxt: #0, }, - value: Atom('A toasted bready thing.' type=dynamic), + value: "A toasted bready thing.", }, }, ), @@ -453,9 +451,7 @@ ), ctxt: #0, }, - value: Atom('Get the Toaster instance. - * - *' type=dynamic), + value: "Get the Toaster instance.\n *\n *", }, tags: [ TagItem { @@ -478,7 +474,7 @@ ), ctxt: #0, }, - value: Atom('alias' type=inline), + value: "alias", }, tag: Alias( AliasTag { @@ -512,7 +508,7 @@ ), ctxt: #0, }, - value: Atom('Toaster' type=inline), + value: "Toaster", }, ], }, @@ -541,7 +537,7 @@ ), ctxt: #0, }, - value: Atom('Waffle iron singleton.' type=dynamic), + value: "Waffle iron singleton.", }, tags: [], }, @@ -565,9 +561,7 @@ ), ctxt: #0, }, - value: Atom('Create the waffle iron. - * - *' type=dynamic), + value: "Create the waffle iron.\n *\n *", }, tags: [ TagItem { @@ -590,7 +584,7 @@ ), ctxt: #0, }, - value: Atom('hideconstructor' type=dynamic), + value: "hideconstructor", }, tag: HideConstructor( HideConstructorTag { @@ -628,9 +622,7 @@ ), ctxt: #0, }, - value: Atom('Cook a waffle. - * - *' type=dynamic), + value: "Cook a waffle.\n *\n *", }, tags: [ TagItem { @@ -653,7 +645,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -678,7 +670,7 @@ ), ctxt: #0, }, - value: Atom('{Batter}' type=dynamic), + value: "{Batter}", }, ), desc: Text { @@ -691,7 +683,7 @@ ), ctxt: #0, }, - value: Atom('batter - The waffle batter.' type=dynamic), + value: "batter - The waffle batter.", }, }, ), @@ -716,7 +708,7 @@ ), ctxt: #0, }, - value: Atom('return' type=static), + value: "return", }, tag: Return( ReturnTag { @@ -740,7 +732,7 @@ ), ctxt: #0, }, - value: Atom('{Waffle}' type=dynamic), + value: "{Waffle}", }, ), description: Text { @@ -753,7 +745,7 @@ ), ctxt: #0, }, - value: Atom('The cooked waffle.' type=dynamic), + value: "The cooked waffle.", }, }, ), @@ -780,9 +772,7 @@ ), ctxt: #0, }, - value: Atom('Get the WaffleIron instance. - * - *' type=dynamic), + value: "Get the WaffleIron instance.\n *\n *", }, tags: [ TagItem { @@ -805,7 +795,7 @@ ), ctxt: #0, }, - value: Atom('return' type=static), + value: "return", }, tag: Return( ReturnTag { @@ -829,7 +819,7 @@ ), ctxt: #0, }, - value: Atom('{WaffleIron}' type=dynamic), + value: "{WaffleIron}", }, ), description: Text { @@ -842,7 +832,7 @@ ), ctxt: #0, }, - value: Atom('The WaffleIron instance.' type=dynamic), + value: "The WaffleIron instance.", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/ignoretag.debug b/crates/jsdoc/tests/fixtures/ignoretag.debug index 251e6e5ff946..29de0aadfb71 100644 --- a/crates/jsdoc/tests/fixtures/ignoretag.debug +++ b/crates/jsdoc/tests/fixtures/ignoretag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('ignore' type=inline), + value: "ignore", }, tag: Ignore( IgnoreTag { diff --git a/crates/jsdoc/tests/fixtures/ignoretag2.debug b/crates/jsdoc/tests/fixtures/ignoretag2.debug index 8d711b3dd13f..c0a697b888b4 100644 --- a/crates/jsdoc/tests/fixtures/ignoretag2.debug +++ b/crates/jsdoc/tests/fixtures/ignoretag2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('ignore' type=inline), + value: "ignore", }, tag: Ignore( IgnoreTag { diff --git a/crates/jsdoc/tests/fixtures/implicitcasttag.debug b/crates/jsdoc/tests/fixtures/implicitcasttag.debug index ea27c740c376..38fce037e4e8 100644 --- a/crates/jsdoc/tests/fixtures/implicitcasttag.debug +++ b/crates/jsdoc/tests/fixtures/implicitcasttag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, }, ), @@ -90,7 +90,7 @@ ), ctxt: #0, }, - value: Atom('implicitCast' type=dynamic), + value: "implicitCast", }, tag: Unknown( UnknownTag { @@ -113,7 +113,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/inheritdoctag.debug b/crates/jsdoc/tests/fixtures/inheritdoctag.debug index 5afaa4b49862..7970b53eeb1c 100644 --- a/crates/jsdoc/tests/fixtures/inheritdoctag.debug +++ b/crates/jsdoc/tests/fixtures/inheritdoctag.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('Parent class. - *' type=dynamic), + value: "Parent class.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -83,8 +82,7 @@ ), ctxt: #0, }, - value: Atom('Open the connection. - *' type=dynamic), + value: "Open the connection.\n *", }, tags: [ TagItem { @@ -107,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('virtual' type=inline), + value: "virtual", }, tag: Abstract( AbstractTag { @@ -145,7 +143,7 @@ ), ctxt: #0, }, - value: Atom('Close the connection.' type=dynamic), + value: "Close the connection.", }, tags: [], }, @@ -169,9 +167,7 @@ ), ctxt: #0, }, - value: Atom('Read the specified number of bytes from the connection. - * - *' type=dynamic), + value: "Read the specified number of bytes from the connection.\n *\n *", }, tags: [ TagItem { @@ -194,7 +190,7 @@ ), ctxt: #0, }, - value: Atom('function' type=static), + value: "function", }, tag: Function( FunctionTag { @@ -218,7 +214,7 @@ ), ctxt: #0, }, - value: Atom('Connection#read' type=dynamic), + value: "Connection#read", }, ), }, @@ -244,7 +240,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -269,7 +265,7 @@ ), ctxt: #0, }, - value: Atom('{number}' type=dynamic), + value: "{number}", }, ), desc: Text { @@ -282,7 +278,7 @@ ), ctxt: #0, }, - value: Atom('bytes - The number of bytes to read.' type=dynamic), + value: "bytes - The number of bytes to read.", }, }, ), @@ -307,7 +303,7 @@ ), ctxt: #0, }, - value: Atom('return' type=static), + value: "return", }, tag: Return( ReturnTag { @@ -331,7 +327,7 @@ ), ctxt: #0, }, - value: Atom('{Buffer}' type=dynamic), + value: "{Buffer}", }, ), description: Text { @@ -344,7 +340,7 @@ ), ctxt: #0, }, - value: Atom('The bytes that were read.' type=dynamic), + value: "The bytes that were read.", }, }, ), @@ -371,8 +367,7 @@ ), ctxt: #0, }, - value: Atom('Child class. - *' type=dynamic), + value: "Child class.\n *", }, tags: [ TagItem { @@ -395,7 +390,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -419,7 +414,7 @@ ), ctxt: #0, }, - value: Atom('* @extends Connection' type=dynamic), + value: "* @extends Connection", }, ), name: None, @@ -448,7 +443,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -471,7 +466,7 @@ ), ctxt: #0, }, - value: Atom('inheritdoc' type=dynamic), + value: "inheritdoc", }, tag: InheritDoc( InheritDocTag { @@ -509,8 +504,7 @@ ), ctxt: #0, }, - value: Atom('Close the socket. - *' type=dynamic), + value: "Close the socket.\n *", }, tags: [ TagItem { @@ -533,7 +527,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -558,7 +552,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -571,7 +565,7 @@ ), ctxt: #0, }, - value: Atom('message - A message explaining why the socket is being closed.' type=dynamic), + value: "message - A message explaining why the socket is being closed.", }, }, ), @@ -596,7 +590,7 @@ ), ctxt: #0, }, - value: Atom('inheritdoc' type=dynamic), + value: "inheritdoc", }, tag: InheritDoc( InheritDocTag { @@ -634,7 +628,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -657,7 +651,7 @@ ), ctxt: #0, }, - value: Atom('inheritdoc' type=dynamic), + value: "inheritdoc", }, tag: InheritDoc( InheritDocTag { diff --git a/crates/jsdoc/tests/fixtures/inlinecomment.debug b/crates/jsdoc/tests/fixtures/inlinecomment.debug index 1c95d0cf264c..4da57bbdab2e 100644 --- a/crates/jsdoc/tests/fixtures/inlinecomment.debug +++ b/crates/jsdoc/tests/fixtures/inlinecomment.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('Inline Comment 1' type=dynamic), + value: "Inline Comment 1", }, tags: [], }, @@ -43,7 +43,7 @@ ), ctxt: #0, }, - value: Atom('Inline Comment 2' type=dynamic), + value: "Inline Comment 2", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/inlineparamcomment.debug b/crates/jsdoc/tests/fixtures/inlineparamcomment.debug index c21fddb165f8..a78babe92dc3 100644 --- a/crates/jsdoc/tests/fixtures/inlineparamcomment.debug +++ b/crates/jsdoc/tests/fixtures/inlineparamcomment.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('Number' type=static), + value: "Number", }, tags: [], }, @@ -43,7 +43,7 @@ ), ctxt: #0, }, - value: Atom('Number' type=static), + value: "Number", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/inlineparamcomment2.debug b/crates/jsdoc/tests/fixtures/inlineparamcomment2.debug index b4757ac65885..661f5ef63491 100644 --- a/crates/jsdoc/tests/fixtures/inlineparamcomment2.debug +++ b/crates/jsdoc/tests/fixtures/inlineparamcomment2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -92,7 +92,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -115,7 +115,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -138,7 +138,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/inner.debug b/crates/jsdoc/tests/fixtures/inner.debug index 5b8dd9f7f66d..57207ae09efe 100644 --- a/crates/jsdoc/tests/fixtures/inner.debug +++ b/crates/jsdoc/tests/fixtures/inner.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, @@ -43,7 +43,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/innerscope.debug b/crates/jsdoc/tests/fixtures/innerscope.debug index c01efc5846d2..74fbf2a8528a 100644 --- a/crates/jsdoc/tests/fixtures/innerscope.debug +++ b/crates/jsdoc/tests/fixtures/innerscope.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, @@ -106,7 +106,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, @@ -130,7 +130,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/innerscope2.debug b/crates/jsdoc/tests/fixtures/innerscope2.debug index 611970551f46..cb4b1f22da01 100644 --- a/crates/jsdoc/tests/fixtures/innerscope2.debug +++ b/crates/jsdoc/tests/fixtures/innerscope2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, @@ -106,7 +106,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, @@ -130,7 +130,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/instanceproperty.debug b/crates/jsdoc/tests/fixtures/instanceproperty.debug index aa6370b044aa..5465dc23068e 100644 --- a/crates/jsdoc/tests/fixtures/instanceproperty.debug +++ b/crates/jsdoc/tests/fixtures/instanceproperty.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('Set the bar.' type=dynamic), + value: "Set the bar.", }, tags: [], }, @@ -106,7 +106,7 @@ ), ctxt: #0, }, - value: Atom('The bar.' type=dynamic), + value: "The bar.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/interface-implements.debug b/crates/jsdoc/tests/fixtures/interface-implements.debug index dbe142f66633..6a721f14a8f9 100644 --- a/crates/jsdoc/tests/fixtures/interface-implements.debug +++ b/crates/jsdoc/tests/fixtures/interface-implements.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('interface' type=static), + value: "interface", }, tag: Interface( InterfaceTag { @@ -81,7 +81,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -104,7 +104,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -127,7 +127,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, }, ), @@ -154,7 +154,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -177,7 +177,7 @@ ), ctxt: #0, }, - value: Atom('enum' type=static), + value: "enum", }, tag: Enum( EnumTag { @@ -200,7 +200,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -227,7 +227,7 @@ ), ctxt: #0, }, - value: Atom('before each method' type=dynamic), + value: "before each method", }, tags: [], }, @@ -251,7 +251,7 @@ ), ctxt: #0, }, - value: Atom('it method.' type=dynamic), + value: "it method.", }, tags: [], }, @@ -275,7 +275,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -298,7 +298,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -322,7 +322,7 @@ ), ctxt: #0, }, - value: Atom('* @implements {ITester}' type=dynamic), + value: "* @implements {ITester}", }, ), name: None, @@ -351,7 +351,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -374,7 +374,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -397,7 +397,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -424,7 +424,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -447,7 +447,7 @@ ), ctxt: #0, }, - value: Atom('enum' type=static), + value: "enum", }, tag: Enum( EnumTag { @@ -470,7 +470,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -497,7 +497,7 @@ ), ctxt: #0, }, - value: Atom('keyboard up' type=dynamic), + value: "keyboard up", }, tags: [], }, @@ -521,7 +521,7 @@ ), ctxt: #0, }, - value: Atom('my tester's beforeEach method.' type=dynamic), + value: "my tester's beforeEach method.", }, tags: [], }, @@ -545,7 +545,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -568,7 +568,7 @@ ), ctxt: #0, }, - value: Atom('interface' type=static), + value: "interface", }, tag: Interface( InterfaceTag { @@ -607,7 +607,7 @@ ), ctxt: #0, }, - value: Atom('Interface for doing some work.' type=dynamic), + value: "Interface for doing some work.", }, tags: [], }, @@ -631,7 +631,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -654,7 +654,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -678,7 +678,7 @@ ), ctxt: #0, }, - value: Atom('* @implements {IWorker}' type=dynamic), + value: "* @implements {IWorker}", }, ), name: None, @@ -707,7 +707,7 @@ ), ctxt: #0, }, - value: Atom('Do some work.' type=dynamic), + value: "Do some work.", }, tags: [], }, @@ -731,7 +731,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -754,7 +754,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -778,7 +778,7 @@ ), ctxt: #0, }, - value: Atom('* @implements {IWorker}' type=dynamic), + value: "* @implements {IWorker}", }, ), name: None, diff --git a/crates/jsdoc/tests/fixtures/interfacetag2.debug b/crates/jsdoc/tests/fixtures/interfacetag2.debug index 057eef895041..16146868b46b 100644 --- a/crates/jsdoc/tests/fixtures/interfacetag2.debug +++ b/crates/jsdoc/tests/fixtures/interfacetag2.debug @@ -19,9 +19,7 @@ ), ctxt: #0, }, - value: Atom('Virtual doclet for an interface. - * - *' type=dynamic), + value: "Virtual doclet for an interface.\n *\n *", }, tags: [ TagItem { @@ -44,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('interface' type=static), + value: "interface", }, tag: Interface( InterfaceTag { @@ -68,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('VirtualInterface' type=dynamic), + value: "VirtualInterface", }, ), }, diff --git a/crates/jsdoc/tests/fixtures/interfacetag3.debug b/crates/jsdoc/tests/fixtures/interfacetag3.debug index 26551e51f1ee..234c7928463d 100644 --- a/crates/jsdoc/tests/fixtures/interfacetag3.debug +++ b/crates/jsdoc/tests/fixtures/interfacetag3.debug @@ -19,9 +19,7 @@ ), ctxt: #0, }, - value: Atom('My structural interface. - * - *' type=dynamic), + value: "My structural interface.\n *\n *", }, tags: [ TagItem { @@ -44,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('record' type=inline), + value: "record", }, tag: Unknown( UnknownTag { @@ -67,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/kindtag.debug b/crates/jsdoc/tests/fixtures/kindtag.debug index 68c7c01dfaca..1bc79afeeb6e 100644 --- a/crates/jsdoc/tests/fixtures/kindtag.debug +++ b/crates/jsdoc/tests/fixtures/kindtag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('kind' type=inline), + value: "kind", }, tag: Kind( KindTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('function' type=static), + value: "function", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/lends.debug b/crates/jsdoc/tests/fixtures/lends.debug index a9fd84e54f53..8791d364bed6 100644 --- a/crates/jsdoc/tests/fixtures/lends.debug +++ b/crates/jsdoc/tests/fixtures/lends.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('lends' type=inline), + value: "lends", }, tag: Lends( LendsTag { @@ -139,7 +139,7 @@ ), ctxt: #0, }, - value: Atom('Person' type=inline), + value: "Person", }, ], }, @@ -168,7 +168,7 @@ ), ctxt: #0, }, - value: Atom('Set up initial values.' type=dynamic), + value: "Set up initial values.", }, tags: [], }, @@ -192,7 +192,7 @@ ), ctxt: #0, }, - value: Atom('The name of the person.' type=dynamic), + value: "The name of the person.", }, tags: [], }, @@ -216,7 +216,7 @@ ), ctxt: #0, }, - value: Atom('Speak a message.' type=dynamic), + value: "Speak a message.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/lends2.debug b/crates/jsdoc/tests/fixtures/lends2.debug index a0451ec9b9a1..69d1b8978071 100644 --- a/crates/jsdoc/tests/fixtures/lends2.debug +++ b/crates/jsdoc/tests/fixtures/lends2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('lends' type=inline), + value: "lends", }, tag: Lends( LendsTag { @@ -76,7 +76,7 @@ ), ctxt: #0, }, - value: Atom('Person' type=inline), + value: "Person", }, ], }, @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('Construct a Person.' type=dynamic), + value: "Construct a Person.", }, tags: [ TagItem { @@ -128,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('constructs' type=dynamic), + value: "constructs", }, tag: Constructs( ConstructsTag { @@ -151,7 +151,7 @@ ), ctxt: #0, }, - value: Atom('Person' type=inline), + value: "Person", }, }, ), @@ -178,7 +178,7 @@ ), ctxt: #0, }, - value: Atom('The name of the person.' type=dynamic), + value: "The name of the person.", }, tags: [], }, @@ -202,7 +202,7 @@ ), ctxt: #0, }, - value: Atom('Speak a message.' type=dynamic), + value: "Speak a message.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/lends3.debug b/crates/jsdoc/tests/fixtures/lends3.debug index 056b5a76fbf0..8ee5db84decf 100644 --- a/crates/jsdoc/tests/fixtures/lends3.debug +++ b/crates/jsdoc/tests/fixtures/lends3.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('lends' type=inline), + value: "lends", }, tag: Lends( LendsTag { @@ -139,7 +139,7 @@ ), ctxt: #0, }, - value: Atom('Person' type=inline), + value: "Person", }, ], }, @@ -168,7 +168,7 @@ ), ctxt: #0, }, - value: Atom('Set up initial values.' type=dynamic), + value: "Set up initial values.", }, tags: [], }, @@ -192,7 +192,7 @@ ), ctxt: #0, }, - value: Atom('The name of the person.' type=dynamic), + value: "The name of the person.", }, tags: [], }, @@ -216,7 +216,7 @@ ), ctxt: #0, }, - value: Atom('Speak a message.' type=dynamic), + value: "Speak a message.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/lends4.debug b/crates/jsdoc/tests/fixtures/lends4.debug index 463911431f76..e7b24c28cc6c 100644 --- a/crates/jsdoc/tests/fixtures/lends4.debug +++ b/crates/jsdoc/tests/fixtures/lends4.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('lends' type=inline), + value: "lends", }, tag: Lends( LendsTag { @@ -76,7 +76,7 @@ ), ctxt: #0, }, - value: Atom('Person' type=inline), + value: "Person", }, ], }, @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -128,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('constructs' type=dynamic), + value: "constructs", }, tag: Constructs( ConstructsTag { @@ -151,7 +151,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -178,7 +178,7 @@ ), ctxt: #0, }, - value: Atom('Speak a message.' type=dynamic), + value: "Speak a message.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/lends5.debug b/crates/jsdoc/tests/fixtures/lends5.debug index 345b40aff5fe..f8f494aeba9d 100644 --- a/crates/jsdoc/tests/fixtures/lends5.debug +++ b/crates/jsdoc/tests/fixtures/lends5.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -66,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('Person' type=inline), + value: "Person", }, ), name: None, @@ -95,7 +95,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -118,7 +118,7 @@ ), ctxt: #0, }, - value: Atom('lends' type=inline), + value: "lends", }, tag: Lends( LendsTag { @@ -152,7 +152,7 @@ ), ctxt: #0, }, - value: Atom('Person' type=inline), + value: "Person", }, ], }, @@ -181,7 +181,7 @@ ), ctxt: #0, }, - value: Atom('Speak a message.' type=dynamic), + value: "Speak a message.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/lends6.debug b/crates/jsdoc/tests/fixtures/lends6.debug index 8e20765222f6..5bc7c3f16b91 100644 --- a/crates/jsdoc/tests/fixtures/lends6.debug +++ b/crates/jsdoc/tests/fixtures/lends6.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('lends' type=inline), + value: "lends", }, tag: Lends( LendsTag { @@ -76,7 +76,7 @@ ), ctxt: #0, }, - value: Atom('Person' type=inline), + value: "Person", }, ], }, @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -128,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('constructs' type=dynamic), + value: "constructs", }, tag: Constructs( ConstructsTag { @@ -151,7 +151,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -178,7 +178,7 @@ ), ctxt: #0, }, - value: Atom('Speak a message.' type=dynamic), + value: "Speak a message.", }, tags: [], }, @@ -202,7 +202,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -225,7 +225,7 @@ ), ctxt: #0, }, - value: Atom('lends' type=inline), + value: "lends", }, tag: Lends( LendsTag { @@ -259,7 +259,7 @@ ), ctxt: #0, }, - value: Atom('Robot' type=inline), + value: "Robot", }, ], }, @@ -288,7 +288,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -311,7 +311,7 @@ ), ctxt: #0, }, - value: Atom('constructs' type=dynamic), + value: "constructs", }, tag: Constructs( ConstructsTag { @@ -334,7 +334,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -361,7 +361,7 @@ ), ctxt: #0, }, - value: Atom('Feign emotion.' type=dynamic), + value: "Feign emotion.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/lendsglobal.debug b/crates/jsdoc/tests/fixtures/lendsglobal.debug index 12dd957608d1..ba1c1f6bd3f1 100644 --- a/crates/jsdoc/tests/fixtures/lendsglobal.debug +++ b/crates/jsdoc/tests/fixtures/lendsglobal.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('lends' type=inline), + value: "lends", }, tag: Lends( LendsTag { @@ -76,7 +76,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ], }, @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, @@ -129,7 +129,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -152,7 +152,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { @@ -192,7 +192,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/letkeyword.debug b/crates/jsdoc/tests/fixtures/letkeyword.debug index 26365cd8285d..0e70e03793ff 100644 --- a/crates/jsdoc/tests/fixtures/letkeyword.debug +++ b/crates/jsdoc/tests/fixtures/letkeyword.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('My example module. - *' type=dynamic), + value: "My example module.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('exports' type=inline), + value: "exports", }, tag: Exports( ExportsTag { @@ -66,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('exampleModule' type=dynamic), + value: "exampleModule", }, }, ), @@ -93,7 +92,7 @@ ), ctxt: #0, }, - value: Atom('My example method.' type=dynamic), + value: "My example method.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/licensetag.debug b/crates/jsdoc/tests/fixtures/licensetag.debug index d1648612a1e7..be2c1d764e45 100644 --- a/crates/jsdoc/tests/fixtures/licensetag.debug +++ b/crates/jsdoc/tests/fixtures/licensetag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('license' type=inline), + value: "license", }, tag: License( LicenseTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/linktag.debug b/crates/jsdoc/tests/fixtures/linktag.debug index 76f3bad80150..9ae75c113f48 100644 --- a/crates/jsdoc/tests/fixtures/linktag.debug +++ b/crates/jsdoc/tests/fixtures/linktag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { @@ -66,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('ns' type=inline), + value: "ns", }, ), name: None, @@ -95,7 +95,7 @@ ), ctxt: #0, }, - value: Atom('Similar to [the bar function]{' type=dynamic), + value: "Similar to [the bar function]{", }, tags: [ TagItem { @@ -118,7 +118,7 @@ ), ctxt: #0, }, - value: Atom('link' type=static), + value: "link", }, tag: Unknown( UnknownTag { @@ -141,7 +141,7 @@ ), ctxt: #0, }, - value: Atom('bar}.' type=inline), + value: "bar}.", }, }, ), @@ -166,7 +166,7 @@ ), ctxt: #0, }, - value: Atom('see' type=inline), + value: "see", }, tag: See( SeeTag { @@ -189,7 +189,7 @@ ), ctxt: #0, }, - value: Atom('{@link bar}' type=dynamic), + value: "{@link bar}", }, }, ), @@ -216,7 +216,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -239,7 +239,7 @@ ), ctxt: #0, }, - value: Atom('see' type=inline), + value: "see", }, tag: See( SeeTag { @@ -262,7 +262,7 @@ ), ctxt: #0, }, - value: Atom('{@link ns.foo}' type=dynamic), + value: "{@link ns.foo}", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/listenstag.debug b/crates/jsdoc/tests/fixtures/listenstag.debug index 324feeeafe73..9e2e3e2cf909 100644 --- a/crates/jsdoc/tests/fixtures/listenstag.debug +++ b/crates/jsdoc/tests/fixtures/listenstag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('myModule' type=dynamic), + value: "myModule", }, }, ), @@ -104,8 +104,7 @@ ), ctxt: #0, }, - value: Atom('An event (has listeners). - *' type=dynamic), + value: "An event (has listeners).\n *", }, tags: [ TagItem { @@ -128,7 +127,7 @@ ), ctxt: #0, }, - value: Atom('event' type=inline), + value: "event", }, tag: Unknown( UnknownTag { @@ -151,7 +150,7 @@ ), ctxt: #0, }, - value: Atom('MyEvent' type=inline), + value: "MyEvent", }, }, ), @@ -176,7 +175,7 @@ ), ctxt: #0, }, - value: Atom('memberof' type=dynamic), + value: "memberof", }, tag: MemberOf( MemberOfTag { @@ -210,7 +209,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, ], }, @@ -239,8 +238,7 @@ ), ctxt: #0, }, - value: Atom('A handler. - *' type=dynamic), + value: "A handler.\n *", }, tags: [ TagItem { @@ -263,7 +261,7 @@ ), ctxt: #0, }, - value: Atom('listens' type=inline), + value: "listens", }, tag: Listens( ListensTag { @@ -286,7 +284,7 @@ ), ctxt: #0, }, - value: Atom('module:myModule.MyEvent' type=dynamic), + value: "module:myModule.MyEvent", }, }, ), @@ -311,7 +309,7 @@ ), ctxt: #0, }, - value: Atom('listens' type=inline), + value: "listens", }, tag: Listens( ListensTag { @@ -334,7 +332,7 @@ ), ctxt: #0, }, - value: Atom('module:myModule~Events.event:Event2' type=dynamic), + value: "module:myModule~Events.event:Event2", }, }, ), @@ -359,7 +357,7 @@ ), ctxt: #0, }, - value: Atom('listens' type=inline), + value: "listens", }, tag: Listens( ListensTag { @@ -382,7 +380,7 @@ ), ctxt: #0, }, - value: Atom('fakeEvent' type=dynamic), + value: "fakeEvent", }, }, ), @@ -409,8 +407,7 @@ ), ctxt: #0, }, - value: Atom('Another handler. - *' type=dynamic), + value: "Another handler.\n *", }, tags: [ TagItem { @@ -433,7 +430,7 @@ ), ctxt: #0, }, - value: Atom('listens' type=inline), + value: "listens", }, tag: Listens( ListensTag { @@ -456,7 +453,7 @@ ), ctxt: #0, }, - value: Atom('module:myModule.MyEvent' type=dynamic), + value: "module:myModule.MyEvent", }, }, ), @@ -483,8 +480,7 @@ ), ctxt: #0, }, - value: Atom('a namespace. - *' type=dynamic), + value: "a namespace.\n *", }, tags: [ TagItem { @@ -507,7 +503,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { diff --git a/crates/jsdoc/tests/fixtures/memberoftag.debug b/crates/jsdoc/tests/fixtures/memberoftag.debug index 23614ad4097d..af81a4314907 100644 --- a/crates/jsdoc/tests/fixtures/memberoftag.debug +++ b/crates/jsdoc/tests/fixtures/memberoftag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -66,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('@memberof mathlib' type=dynamic), + value: "@memberof mathlib", }, ), name: None, @@ -95,7 +95,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -118,7 +118,7 @@ ), ctxt: #0, }, - value: Atom('member' type=inline), + value: "member", }, tag: Member( MemberTag { @@ -141,7 +141,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, name: Text { span: Span { @@ -153,7 +153,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -180,7 +180,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -203,7 +203,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { diff --git a/crates/jsdoc/tests/fixtures/memberoftag2.debug b/crates/jsdoc/tests/fixtures/memberoftag2.debug index a08ead262e29..0ed61012b990 100644 --- a/crates/jsdoc/tests/fixtures/memberoftag2.debug +++ b/crates/jsdoc/tests/fixtures/memberoftag2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('memberof' type=dynamic), + value: "memberof", }, tag: MemberOf( MemberOfTag { @@ -76,7 +76,7 @@ ), ctxt: #0, }, - value: Atom('Observable' type=dynamic), + value: "Observable", }, ], }, @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -128,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('memberof' type=dynamic), + value: "memberof", }, tag: MemberOf( MemberOfTag { @@ -162,7 +162,7 @@ ), ctxt: #0, }, - value: Atom('Observable' type=dynamic), + value: "Observable", }, ], }, diff --git a/crates/jsdoc/tests/fixtures/memberoftag3.debug b/crates/jsdoc/tests/fixtures/memberoftag3.debug index 018d3c7c83f4..660e9535636b 100644 --- a/crates/jsdoc/tests/fixtures/memberoftag3.debug +++ b/crates/jsdoc/tests/fixtures/memberoftag3.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('@example' type=dynamic), + value: "@example", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('terrain' type=inline), + value: "terrain", }, }, ), @@ -104,7 +104,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -127,7 +127,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -167,7 +167,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -190,7 +190,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -214,7 +214,7 @@ ), ctxt: #0, }, - value: Atom('@memberof module:terrain' type=dynamic), + value: "@memberof module:terrain", }, ), name: None, @@ -243,7 +243,7 @@ ), ctxt: #0, }, - value: Atom('A leaf' type=inline), + value: "A leaf", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/memberoftag4.debug b/crates/jsdoc/tests/fixtures/memberoftag4.debug index 7da42cfd667b..efda5b5d44c8 100644 --- a/crates/jsdoc/tests/fixtures/memberoftag4.debug +++ b/crates/jsdoc/tests/fixtures/memberoftag4.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('Namespace doStuff. - *' type=dynamic), + value: "Namespace doStuff.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { @@ -67,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('doStuff' type=inline), + value: "doStuff", }, ), name: None, @@ -96,8 +95,7 @@ ), ctxt: #0, }, - value: Atom('Function with the same name as its namespace. - *' type=dynamic), + value: "Function with the same name as its namespace.\n *", }, tags: [ TagItem { @@ -120,7 +118,7 @@ ), ctxt: #0, }, - value: Atom('memberof' type=dynamic), + value: "memberof", }, tag: MemberOf( MemberOfTag { @@ -154,7 +152,7 @@ ), ctxt: #0, }, - value: Atom('doStuff' type=inline), + value: "doStuff", }, ], }, @@ -183,8 +181,7 @@ ), ctxt: #0, }, - value: Atom('Function with a different name than the namespace. - *' type=dynamic), + value: "Function with a different name than the namespace.\n *", }, tags: [ TagItem { @@ -207,7 +204,7 @@ ), ctxt: #0, }, - value: Atom('memberof' type=dynamic), + value: "memberof", }, tag: MemberOf( MemberOfTag { @@ -241,7 +238,7 @@ ), ctxt: #0, }, - value: Atom('doStuff' type=inline), + value: "doStuff", }, ], }, diff --git a/crates/jsdoc/tests/fixtures/memberoftag5.debug b/crates/jsdoc/tests/fixtures/memberoftag5.debug index 29506c2555fb..6bca1f5462c7 100644 --- a/crates/jsdoc/tests/fixtures/memberoftag5.debug +++ b/crates/jsdoc/tests/fixtures/memberoftag5.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('Socket class. - *' type=dynamic), + value: "Socket class.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -67,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('* @memberof module:network' type=dynamic), + value: "* @memberof module:network", }, ), name: None, @@ -96,7 +95,7 @@ ), ctxt: #0, }, - value: Atom('Open the socket.' type=dynamic), + value: "Open the socket.", }, tags: [], }, @@ -120,7 +119,7 @@ ), ctxt: #0, }, - value: Atom('Unique identifier for `Socket` class.' type=dynamic), + value: "Unique identifier for `Socket` class.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/memberoftagforced.debug b/crates/jsdoc/tests/fixtures/memberoftagforced.debug index fb7032539427..d8ffb2ca3eef 100644 --- a/crates/jsdoc/tests/fixtures/memberoftagforced.debug +++ b/crates/jsdoc/tests/fixtures/memberoftagforced.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('The current position.' type=dynamic), + value: "The current position.", }, tags: [ TagItem { @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -128,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('{object}' type=dynamic), + value: "{object}", }, }, ), @@ -153,7 +153,7 @@ ), ctxt: #0, }, - value: Atom('property' type=static), + value: "property", }, tag: Property( PropertyTag { @@ -187,7 +187,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ], }, @@ -202,7 +202,7 @@ ), ctxt: #0, }, - value: Atom('{boolean}' type=dynamic), + value: "{boolean}", }, ), desc: Text { @@ -215,7 +215,7 @@ ), ctxt: #0, }, - value: Atom('needsRevalidate Does this point need to be revalidated?' type=dynamic), + value: "needsRevalidate Does this point need to be revalidated?", }, }, ), @@ -242,7 +242,7 @@ ), ctxt: #0, }, - value: Atom('The x coordinate of the point.' type=dynamic), + value: "The x coordinate of the point.", }, tags: [ TagItem { @@ -265,7 +265,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -288,7 +288,7 @@ ), ctxt: #0, }, - value: Atom('{number}' type=dynamic), + value: "{number}", }, }, ), @@ -313,7 +313,7 @@ ), ctxt: #0, }, - value: Atom('name' type=static), + value: "name", }, tag: Name( NameTag { @@ -347,7 +347,7 @@ ), ctxt: #0, }, - value: Atom('point' type=inline), + value: "point", }, ], }, @@ -376,7 +376,7 @@ ), ctxt: #0, }, - value: Atom('The y coordinate of the point.' type=dynamic), + value: "The y coordinate of the point.", }, tags: [ TagItem { @@ -399,7 +399,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -422,7 +422,7 @@ ), ctxt: #0, }, - value: Atom('{number}' type=dynamic), + value: "{number}", }, }, ), @@ -447,7 +447,7 @@ ), ctxt: #0, }, - value: Atom('name' type=static), + value: "name", }, tag: Name( NameTag { @@ -481,7 +481,7 @@ ), ctxt: #0, }, - value: Atom('point' type=inline), + value: "point", }, ], }, @@ -510,7 +510,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -533,7 +533,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -556,7 +556,7 @@ ), ctxt: #0, }, - value: Atom('{Array}' type=inline), + value: "{Array}", }, }, ), @@ -581,7 +581,7 @@ ), ctxt: #0, }, - value: Atom('name' type=static), + value: "name", }, tag: Name( NameTag { @@ -615,7 +615,7 @@ ), ctxt: #0, }, - value: Atom('map' type=static), + value: "map", }, ], }, @@ -644,7 +644,7 @@ ), ctxt: #0, }, - value: Atom('The current cursor.' type=dynamic), + value: "The current cursor.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/membertag.debug b/crates/jsdoc/tests/fixtures/membertag.debug index 323b22bd75e8..61588c0de3e5 100644 --- a/crates/jsdoc/tests/fixtures/membertag.debug +++ b/crates/jsdoc/tests/fixtures/membertag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('member' type=inline), + value: "member", }, tag: Member( MemberTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, name: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -104,7 +104,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -127,7 +127,7 @@ ), ctxt: #0, }, - value: Atom('var' type=static), + value: "var", }, tag: Member( MemberTag { @@ -150,7 +150,7 @@ ), ctxt: #0, }, - value: Atom('foobar' type=inline), + value: "foobar", }, name: Text { span: Span { @@ -162,7 +162,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -189,7 +189,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -212,7 +212,7 @@ ), ctxt: #0, }, - value: Atom('var' type=static), + value: "var", }, tag: Member( MemberTag { @@ -235,7 +235,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, name: Text { span: Span { @@ -247,7 +247,7 @@ ), ctxt: #0, }, - value: Atom('string' type=static), + value: "string", }, }, ), @@ -274,7 +274,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -297,7 +297,7 @@ ), ctxt: #0, }, - value: Atom('member' type=inline), + value: "member", }, tag: Member( MemberTag { @@ -320,7 +320,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, name: Text { span: Span { @@ -332,7 +332,7 @@ ), ctxt: #0, }, - value: Atom('Object' type=static), + value: "Object", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/methoddefinition.debug b/crates/jsdoc/tests/fixtures/methoddefinition.debug index d51865d84812..089a9f4216a2 100644 --- a/crates/jsdoc/tests/fixtures/methoddefinition.debug +++ b/crates/jsdoc/tests/fixtures/methoddefinition.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('Document me.' type=dynamic), + value: "Document me.", }, tags: [], }, @@ -43,7 +43,7 @@ ), ctxt: #0, }, - value: Atom('Static document me.' type=dynamic), + value: "Static document me.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/mixintag.debug b/crates/jsdoc/tests/fixtures/mixintag.debug index ac9c373ffd05..1799549a0c60 100644 --- a/crates/jsdoc/tests/fixtures/mixintag.debug +++ b/crates/jsdoc/tests/fixtures/mixintag.debug @@ -19,10 +19,7 @@ ), ctxt: #0, }, - value: Atom('This provides methods used for event handling. It's not meant to - * be used directly, except as a provider of related methods. - * - *' type=dynamic), + value: "This provides methods used for event handling. It's not meant to\n * be used directly, except as a provider of related methods.\n *\n *", }, tags: [ TagItem { @@ -45,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('mixin' type=inline), + value: "mixin", }, tag: Mixin( MixinTag { @@ -68,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -95,7 +92,7 @@ ), ctxt: #0, }, - value: Atom('fires something.' type=dynamic), + value: "fires something.", }, tags: [], }, @@ -119,7 +116,7 @@ ), ctxt: #0, }, - value: Atom('handles a signal.' type=dynamic), + value: "handles a signal.", }, tags: [], }, @@ -143,7 +140,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -166,7 +163,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -190,7 +187,7 @@ ), ctxt: #0, }, - value: Atom('* @mixes Eventful' type=dynamic), + value: "* @mixes Eventful", }, ), name: None, diff --git a/crates/jsdoc/tests/fixtures/mixintag2.debug b/crates/jsdoc/tests/fixtures/mixintag2.debug index 706fb421204a..241bfbb6ef7a 100644 --- a/crates/jsdoc/tests/fixtures/mixintag2.debug +++ b/crates/jsdoc/tests/fixtures/mixintag2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('mixy' type=inline), + value: "mixy", }, }, ), @@ -104,8 +104,7 @@ ), ctxt: #0, }, - value: Atom('Object A. - *' type=dynamic), + value: "Object A.\n *", }, tags: [ TagItem { @@ -128,7 +127,7 @@ ), ctxt: #0, }, - value: Atom('mixin' type=inline), + value: "mixin", }, tag: Mixin( MixinTag { @@ -151,7 +150,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -178,7 +177,7 @@ ), ctxt: #0, }, - value: Atom('Some method.' type=dynamic), + value: "Some method.", }, tags: [], }, @@ -202,8 +201,7 @@ ), ctxt: #0, }, - value: Atom('Object B. Mixes Object A. - *' type=dynamic), + value: "Object B. Mixes Object A.\n *", }, tags: [ TagItem { @@ -226,7 +224,7 @@ ), ctxt: #0, }, - value: Atom('mixin' type=inline), + value: "mixin", }, tag: Mixin( MixinTag { @@ -249,7 +247,7 @@ ), ctxt: #0, }, - value: Atom('* @mixes module:mixy.ObjectA' type=dynamic), + value: "* @mixes module:mixy.ObjectA", }, }, ), @@ -276,8 +274,7 @@ ), ctxt: #0, }, - value: Atom('Object C. Mixes Object B and adds its own method. - *' type=dynamic), + value: "Object C. Mixes Object B and adds its own method.\n *", }, tags: [ TagItem { @@ -300,7 +297,7 @@ ), ctxt: #0, }, - value: Atom('mixin' type=inline), + value: "mixin", }, tag: Mixin( MixinTag { @@ -323,7 +320,7 @@ ), ctxt: #0, }, - value: Atom('* @mixes module:mixy.ObjectB' type=dynamic), + value: "* @mixes module:mixy.ObjectB", }, }, ), @@ -350,8 +347,7 @@ ), ctxt: #0, }, - value: Atom('Super-sweet method that's named in the comment, making this a virtual comment. - *' type=dynamic), + value: "Super-sweet method that's named in the comment, making this a virtual comment.\n *", }, tags: [ TagItem { @@ -374,7 +370,7 @@ ), ctxt: #0, }, - value: Atom('function' type=static), + value: "function", }, tag: Function( FunctionTag { @@ -398,7 +394,7 @@ ), ctxt: #0, }, - value: Atom('module:mixy.ObjectC.superSweet' type=dynamic), + value: "module:mixy.ObjectC.superSweet", }, ), }, @@ -426,7 +422,7 @@ ), ctxt: #0, }, - value: Atom('Class that mixes Object A, so it gets {' type=dynamic), + value: "Class that mixes Object A, so it gets {", }, tags: [ TagItem { @@ -449,7 +445,7 @@ ), ctxt: #0, }, - value: Atom('link' type=static), + value: "link", }, tag: Unknown( UnknownTag { @@ -472,7 +468,7 @@ ), ctxt: #0, }, - value: Atom('module:mixy.ClassA#method}.' type=dynamic), + value: "module:mixy.ClassA#method}.", }, }, ), @@ -497,7 +493,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -521,7 +517,7 @@ ), ctxt: #0, }, - value: Atom('* @mixes module:mixy.ObjectA' type=dynamic), + value: "* @mixes module:mixy.ObjectA", }, ), name: None, @@ -550,7 +546,7 @@ ), ctxt: #0, }, - value: Atom('Do a thing.' type=dynamic), + value: "Do a thing.", }, tags: [], }, @@ -574,7 +570,7 @@ ), ctxt: #0, }, - value: Atom('Class that mixes Object C, so it gets {' type=dynamic), + value: "Class that mixes Object C, so it gets {", }, tags: [ TagItem { @@ -597,7 +593,7 @@ ), ctxt: #0, }, - value: Atom('link' type=static), + value: "link", }, tag: Unknown( UnknownTag { @@ -620,7 +616,7 @@ ), ctxt: #0, }, - value: Atom('module:mixy.ClassB#method} and' type=dynamic), + value: "module:mixy.ClassB#method} and", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/modifiestag.debug b/crates/jsdoc/tests/fixtures/modifiestag.debug index 7ca17f2ee7e4..43924069d8f2 100644 --- a/crates/jsdoc/tests/fixtures/modifiestag.debug +++ b/crates/jsdoc/tests/fixtures/modifiestag.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('My mutator function. - *' type=dynamic), + value: "My mutator function.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('modifies' type=dynamic), + value: "modifies", }, tag: Unknown( UnknownTag { @@ -66,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('{(foo|bar)}' type=dynamic), + value: "{(foo|bar)}", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/moduleclasses.debug b/crates/jsdoc/tests/fixtures/moduleclasses.debug index 4f63f6377152..5077f9aca4c8 100644 --- a/crates/jsdoc/tests/fixtures/moduleclasses.debug +++ b/crates/jsdoc/tests/fixtures/moduleclasses.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('foo' type=inline), + value: "foo", }, }, ), @@ -104,7 +104,7 @@ ), ctxt: #0, }, - value: Atom('Bar class.' type=dynamic), + value: "Bar class.", }, tags: [], }, @@ -128,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('Construct a Bar.' type=dynamic), + value: "Construct a Bar.", }, tags: [], }, @@ -152,7 +152,7 @@ ), ctxt: #0, }, - value: Atom('bar property' type=dynamic), + value: "bar property", }, tags: [], }, @@ -176,7 +176,7 @@ ), ctxt: #0, }, - value: Atom('Baz class.' type=dynamic), + value: "Baz class.", }, tags: [], }, @@ -200,7 +200,7 @@ ), ctxt: #0, }, - value: Atom('Construct a Baz.' type=dynamic), + value: "Construct a Baz.", }, tags: [], }, @@ -224,7 +224,7 @@ ), ctxt: #0, }, - value: Atom('baz property' type=dynamic), + value: "baz property", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/moduleinner.debug b/crates/jsdoc/tests/fixtures/moduleinner.debug index 686ec4b5aba6..67693a45e269 100644 --- a/crates/jsdoc/tests/fixtures/moduleinner.debug +++ b/crates/jsdoc/tests/fixtures/moduleinner.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('my' type=inline), + value: "my", }, }, ), @@ -104,7 +104,7 @@ ), ctxt: #0, }, - value: Atom('document fooIn' type=dynamic), + value: "document fooIn", }, tags: [], }, @@ -128,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -151,7 +151,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { @@ -191,7 +191,7 @@ ), ctxt: #0, }, - value: Atom('document bar.Zop' type=dynamic), + value: "document bar.Zop", }, tags: [], }, @@ -215,7 +215,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -238,7 +238,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -278,7 +278,7 @@ ), ctxt: #0, }, - value: Atom('document exports.Frotz#quaz' type=dynamic), + value: "document exports.Frotz#quaz", }, tags: [], }, @@ -302,7 +302,7 @@ ), ctxt: #0, }, - value: Atom('document fooOut' type=dynamic), + value: "document fooOut", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/moduleisconstructor.debug b/crates/jsdoc/tests/fixtures/moduleisconstructor.debug index 12ac0768a994..d7a187639ed7 100644 --- a/crates/jsdoc/tests/fixtures/moduleisconstructor.debug +++ b/crates/jsdoc/tests/fixtures/moduleisconstructor.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('Describe the module here. - *' type=dynamic), + value: "Describe the module here.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -66,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('config' type=inline), + value: "config", }, ty: Text { span: Span { @@ -78,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('mymodule' type=dynamic), + value: "mymodule", }, }, ), @@ -105,9 +104,7 @@ ), ctxt: #0, }, - value: Atom('Create a new configuration. - * - *' type=dynamic), + value: "Create a new configuration.\n *\n *", }, tags: [ TagItem { @@ -130,7 +127,7 @@ ), ctxt: #0, }, - value: Atom('classdesc' type=dynamic), + value: "classdesc", }, tag: ClassDesc( JSDocClassDescTag { @@ -153,7 +150,7 @@ ), ctxt: #0, }, - value: Atom('Describe the class here.' type=dynamic), + value: "Describe the class here.", }, }, ), @@ -178,7 +175,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -202,7 +199,7 @@ ), ctxt: #0, }, - value: Atom('* @alias module:mymodule/config' type=dynamic), + value: "* @alias module:mymodule/config", }, ), name: Some( @@ -216,7 +213,7 @@ ), ctxt: #0, }, - value: Atom('* @param {string} id' type=dynamic), + value: "* @param {string} id", }, ), }, @@ -244,7 +241,7 @@ ), ctxt: #0, }, - value: Atom('Document me.' type=dynamic), + value: "Document me.", }, tags: [], }, @@ -268,9 +265,7 @@ ), ctxt: #0, }, - value: Atom('Get the configuration ID. - * - *' type=dynamic), + value: "Get the configuration ID.\n *\n *", }, tags: [ TagItem { @@ -293,7 +288,7 @@ ), ctxt: #0, }, - value: Atom('return' type=static), + value: "return", }, tag: Return( ReturnTag { @@ -317,7 +312,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), description: Text { @@ -330,7 +325,7 @@ ), ctxt: #0, }, - value: Atom('The configuration ID.' type=dynamic), + value: "The configuration ID.", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/moduleisconstructor2.debug b/crates/jsdoc/tests/fixtures/moduleisconstructor2.debug index 9507d5134835..b60b29f13fff 100644 --- a/crates/jsdoc/tests/fixtures/moduleisconstructor2.debug +++ b/crates/jsdoc/tests/fixtures/moduleisconstructor2.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('Describe the module here. - *' type=dynamic), + value: "Describe the module here.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -66,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('config' type=inline), + value: "config", }, ty: Text { span: Span { @@ -78,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('mymodule' type=dynamic), + value: "mymodule", }, }, ), @@ -105,7 +104,7 @@ ), ctxt: #0, }, - value: Atom('Describe the class here.' type=dynamic), + value: "Describe the class here.", }, tags: [], }, @@ -129,8 +128,7 @@ ), ctxt: #0, }, - value: Atom('Create a new configuration. - *' type=dynamic), + value: "Create a new configuration.\n *", }, tags: [ TagItem { @@ -153,7 +151,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -178,7 +176,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -191,7 +189,7 @@ ), ctxt: #0, }, - value: Atom('id' type=static), + value: "id", }, }, ), @@ -218,7 +216,7 @@ ), ctxt: #0, }, - value: Atom('Document me.' type=dynamic), + value: "Document me.", }, tags: [], }, @@ -242,9 +240,7 @@ ), ctxt: #0, }, - value: Atom('Get the configuration ID. - * - *' type=dynamic), + value: "Get the configuration ID.\n *\n *", }, tags: [ TagItem { @@ -267,7 +263,7 @@ ), ctxt: #0, }, - value: Atom('return' type=static), + value: "return", }, tag: Return( ReturnTag { @@ -291,7 +287,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), description: Text { @@ -304,7 +300,7 @@ ), ctxt: #0, }, - value: Atom('The configuration ID.' type=dynamic), + value: "The configuration ID.", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/moduleisfunction.debug b/crates/jsdoc/tests/fixtures/moduleisfunction.debug index 295911e07c7c..d59d5eaaa6f5 100644 --- a/crates/jsdoc/tests/fixtures/moduleisfunction.debug +++ b/crates/jsdoc/tests/fixtures/moduleisfunction.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('This is a module called foo. - *' type=dynamic), + value: "This is a module called foo.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -66,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -78,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('foo' type=inline), + value: "foo", }, }, ), @@ -105,8 +104,7 @@ ), ctxt: #0, }, - value: Atom('The module exports a single function. - *' type=dynamic), + value: "The module exports a single function.\n *", }, tags: [ TagItem { @@ -129,7 +127,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -154,7 +152,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -167,7 +165,7 @@ ), ctxt: #0, }, - value: Atom('bar' type=inline), + value: "bar", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/modules/data/mod-1.debug b/crates/jsdoc/tests/fixtures/modules/data/mod-1.debug index 26d016391250..a7726633421b 100644 --- a/crates/jsdoc/tests/fixtures/modules/data/mod-1.debug +++ b/crates/jsdoc/tests/fixtures/modules/data/mod-1.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/modules/data/mod-2.debug b/crates/jsdoc/tests/fixtures/modules/data/mod-2.debug index f580c7c436c0..8cbf1dba23aa 100644 --- a/crates/jsdoc/tests/fixtures/modules/data/mod-2.debug +++ b/crates/jsdoc/tests/fixtures/modules/data/mod-2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('my' type=inline), + value: "my", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/modules/data/mod-3.debug b/crates/jsdoc/tests/fixtures/modules/data/mod-3.debug index 5fa2838fe35e..1f0ec163266f 100644 --- a/crates/jsdoc/tests/fixtures/modules/data/mod-3.debug +++ b/crates/jsdoc/tests/fixtures/modules/data/mod-3.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('My test module.' type=dynamic), + value: "My test module.", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('my' type=inline), + value: "my", }, }, ), @@ -104,7 +104,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -127,7 +127,7 @@ ), ctxt: #0, }, - value: Atom('undocumented' type=dynamic), + value: "undocumented", }, tag: Unknown( UnknownTag { @@ -150,7 +150,7 @@ ), ctxt: #0, }, - value: Atom('@alias module:my/module' type=dynamic), + value: "@alias module:my/module", }, }, ), @@ -177,7 +177,7 @@ ), ctxt: #0, }, - value: Atom('Document a property.' type=dynamic), + value: "Document a property.", }, tags: [], }, @@ -201,7 +201,7 @@ ), ctxt: #0, }, - value: Atom('Document a method.' type=dynamic), + value: "Document a method.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/moduletag.debug b/crates/jsdoc/tests/fixtures/moduletag.debug index 2ff455c9e047..845356f49d2d 100644 --- a/crates/jsdoc/tests/fixtures/moduletag.debug +++ b/crates/jsdoc/tests/fixtures/moduletag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('bookshelf' type=dynamic), + value: "bookshelf", }, }, ), @@ -104,7 +104,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -127,7 +127,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -167,7 +167,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/moduletag10.debug b/crates/jsdoc/tests/fixtures/moduletag10.debug index a09f0c8cb332..7cfc22576594 100644 --- a/crates/jsdoc/tests/fixtures/moduletag10.debug +++ b/crates/jsdoc/tests/fixtures/moduletag10.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('foo' type=inline), + value: "foo", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/moduletag11.debug b/crates/jsdoc/tests/fixtures/moduletag11.debug index 4016dde18f82..078decddb7e8 100644 --- a/crates/jsdoc/tests/fixtures/moduletag11.debug +++ b/crates/jsdoc/tests/fixtures/moduletag11.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('Test module. - *' type=dynamic), + value: "Test module.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -66,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -78,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('foo' type=inline), + value: "foo", }, }, ), @@ -105,7 +104,7 @@ ), ctxt: #0, }, - value: Atom('Test class.' type=dynamic), + value: "Test class.", }, tags: [], }, @@ -129,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('Test class constructor.' type=dynamic), + value: "Test class constructor.", }, tags: [], }, @@ -153,7 +152,7 @@ ), ctxt: #0, }, - value: Atom('Test method.' type=dynamic), + value: "Test method.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/moduletag2.debug b/crates/jsdoc/tests/fixtures/moduletag2.debug index 05efa83b1bdb..f97051ade980 100644 --- a/crates/jsdoc/tests/fixtures/moduletag2.debug +++ b/crates/jsdoc/tests/fixtures/moduletag2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('color' type=static), + value: "color", }, }, ), @@ -104,7 +104,7 @@ ), ctxt: #0, }, - value: Atom('Blend two colors together.' type=dynamic), + value: "Blend two colors together.", }, tags: [], }, @@ -128,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('Darken a color by the given shade.' type=dynamic), + value: "Darken a color by the given shade.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/moduletag3.debug b/crates/jsdoc/tests/fixtures/moduletag3.debug index 24ca129dcf8e..b1bbfb2bd2c3 100644 --- a/crates/jsdoc/tests/fixtures/moduletag3.debug +++ b/crates/jsdoc/tests/fixtures/moduletag3.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('Photo/manager' type=dynamic), + value: "Photo/manager", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('foo' type=inline), + value: "foo", }, }, ), @@ -102,7 +102,7 @@ ), ctxt: #0, }, - value: Atom('desc' type=static), + value: "desc", }, tag: Description( DescriptionTag { @@ -125,7 +125,7 @@ ), ctxt: #0, }, - value: Atom('Manage a collection of photos.' type=dynamic), + value: "Manage a collection of photos.", }, }, ), @@ -152,7 +152,7 @@ ), ctxt: #0, }, - value: Atom('Construct a new Photo manager' type=dynamic), + value: "Construct a new Photo manager", }, tags: [ TagItem { @@ -175,7 +175,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -199,7 +199,7 @@ ), ctxt: #0, }, - value: Atom('module:foo/Photo/manager' type=dynamic), + value: "module:foo/Photo/manager", }, ), name: Some( @@ -213,7 +213,7 @@ ), ctxt: #0, }, - value: Atom('@param {String} collectionId The identifier of the managed collection.' type=dynamic), + value: "@param {String} collectionId The identifier of the managed collection.", }, ), }, @@ -241,7 +241,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -264,7 +264,7 @@ ), ctxt: #0, }, - value: Atom('function' type=static), + value: "function", }, tag: Function( FunctionTag { @@ -288,7 +288,7 @@ ), ctxt: #0, }, - value: Atom('module:foo/Photo/manager#getPhoto' type=dynamic), + value: "module:foo/Photo/manager#getPhoto", }, ), }, @@ -314,7 +314,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -339,7 +339,7 @@ ), ctxt: #0, }, - value: Atom('{String}' type=dynamic), + value: "{String}", }, ), desc: Text { @@ -352,7 +352,7 @@ ), ctxt: #0, }, - value: Atom('photoName' type=dynamic), + value: "photoName", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/moduletag4.debug b/crates/jsdoc/tests/fixtures/moduletag4.debug index b2ba0a286fa2..448c013da259 100644 --- a/crates/jsdoc/tests/fixtures/moduletag4.debug +++ b/crates/jsdoc/tests/fixtures/moduletag4.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('M' type=inline), + value: "M", }, }, ), @@ -104,9 +104,7 @@ ), ctxt: #0, }, - value: Atom('The differnet kind of mouse buttons. - * - *' type=dynamic), + value: "The differnet kind of mouse buttons.\n *\n *", }, tags: [ TagItem { @@ -129,7 +127,7 @@ ), ctxt: #0, }, - value: Atom('summary' type=static), + value: "summary", }, tag: Summary( SummaryTag { @@ -152,7 +150,7 @@ ), ctxt: #0, }, - value: Atom('Blah blah' type=dynamic), + value: "Blah blah", }, }, ), @@ -177,7 +175,7 @@ ), ctxt: #0, }, - value: Atom('readonly' type=static), + value: "readonly", }, tag: Readonly( ReadonlyTag { @@ -213,7 +211,7 @@ ), ctxt: #0, }, - value: Atom('enum' type=static), + value: "enum", }, tag: Enum( EnumTag { @@ -236,7 +234,7 @@ ), ctxt: #0, }, - value: Atom('{string} ' type=dynamic), + value: "{string} ", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/moduletag5.debug b/crates/jsdoc/tests/fixtures/moduletag5.debug index 138957d42d00..e04afbfafa91 100644 --- a/crates/jsdoc/tests/fixtures/moduletag5.debug +++ b/crates/jsdoc/tests/fixtures/moduletag5.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('bookshelf' type=dynamic), + value: "bookshelf", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/moduletag6.debug b/crates/jsdoc/tests/fixtures/moduletag6.debug index 777823ae1f7d..b6ac7b4ea977 100644 --- a/crates/jsdoc/tests/fixtures/moduletag6.debug +++ b/crates/jsdoc/tests/fixtures/moduletag6.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('appname' type=inline), + value: "appname", }, }, ), @@ -104,8 +104,7 @@ ), ctxt: #0, }, - value: Atom('The name of the application. - *' type=dynamic), + value: "The name of the application.\n *", }, tags: [ TagItem { @@ -128,7 +127,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -151,7 +150,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/moduletag7.debug b/crates/jsdoc/tests/fixtures/moduletag7.debug index 7abab0d96820..9e0c62d52f14 100644 --- a/crates/jsdoc/tests/fixtures/moduletag7.debug +++ b/crates/jsdoc/tests/fixtures/moduletag7.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('color' type=static), + value: "color", }, }, ), @@ -104,7 +104,7 @@ ), ctxt: #0, }, - value: Atom('Blend two colors together.' type=dynamic), + value: "Blend two colors together.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/moduletag8.debug b/crates/jsdoc/tests/fixtures/moduletag8.debug index 4784908ee003..ee209ee16fe2 100644 --- a/crates/jsdoc/tests/fixtures/moduletag8.debug +++ b/crates/jsdoc/tests/fixtures/moduletag8.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('color' type=static), + value: "color", }, }, ), @@ -104,7 +104,7 @@ ), ctxt: #0, }, - value: Atom('The name of the module.' type=dynamic), + value: "The name of the module.", }, tags: [], }, @@ -128,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('The most recent blended color.' type=dynamic), + value: "The most recent blended color.", }, tags: [], }, @@ -152,7 +152,7 @@ ), ctxt: #0, }, - value: Atom('Blend two colors together.' type=dynamic), + value: "Blend two colors together.", }, tags: [], }, @@ -176,8 +176,7 @@ ), ctxt: #0, }, - value: Atom('Get the red, green, and blue values of a color. - *' type=dynamic), + value: "Get the red, green, and blue values of a color.\n *", }, tags: [ TagItem { @@ -200,7 +199,7 @@ ), ctxt: #0, }, - value: Atom('function' type=static), + value: "function", }, tag: Function( FunctionTag { diff --git a/crates/jsdoc/tests/fixtures/moduletag9.debug b/crates/jsdoc/tests/fixtures/moduletag9.debug index a09f0c8cb332..7cfc22576594 100644 --- a/crates/jsdoc/tests/fixtures/moduletag9.debug +++ b/crates/jsdoc/tests/fixtures/moduletag9.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('foo' type=inline), + value: "foo", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/namespacetag.debug b/crates/jsdoc/tests/fixtures/namespacetag.debug index d4ad68eafcd3..4260bd18c176 100644 --- a/crates/jsdoc/tests/fixtures/namespacetag.debug +++ b/crates/jsdoc/tests/fixtures/namespacetag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { @@ -129,7 +129,7 @@ ), ctxt: #0, }, - value: Atom('Foo' type=inline), + value: "Foo", }, ), name: None, @@ -158,7 +158,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -181,7 +181,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { @@ -205,7 +205,7 @@ ), ctxt: #0, }, - value: Atom('{function}' type=dynamic), + value: "{function}", }, ), name: None, @@ -234,7 +234,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -257,7 +257,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { @@ -297,7 +297,7 @@ ), ctxt: #0, }, - value: Atom('Member of the namespace S.' type=dynamic), + value: "Member of the namespace S.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/nametag.debug b/crates/jsdoc/tests/fixtures/nametag.debug index eea5400c5786..6dfa6421cec8 100644 --- a/crates/jsdoc/tests/fixtures/nametag.debug +++ b/crates/jsdoc/tests/fixtures/nametag.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('A view. - *' type=dynamic), + value: "A view.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('name' type=static), + value: "name", }, tag: Name( NameTag { @@ -77,7 +76,7 @@ ), ctxt: #0, }, - value: Atom('View' type=inline), + value: "View", }, ], }, @@ -106,8 +105,7 @@ ), ctxt: #0, }, - value: Atom('A controller. - *' type=dynamic), + value: "A controller.\n *", }, tags: [ TagItem { @@ -130,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('name' type=static), + value: "name", }, tag: Name( NameTag { @@ -164,7 +162,7 @@ ), ctxt: #0, }, - value: Atom('Controller' type=dynamic), + value: "Controller", }, ], }, @@ -191,7 +189,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { diff --git a/crates/jsdoc/tests/fixtures/noaliastag.debug b/crates/jsdoc/tests/fixtures/noaliastag.debug index b33662996380..f632d5e8387a 100644 --- a/crates/jsdoc/tests/fixtures/noaliastag.debug +++ b/crates/jsdoc/tests/fixtures/noaliastag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('noalias' type=inline), + value: "noalias", }, tag: Unknown( UnknownTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/nocollapsetag.debug b/crates/jsdoc/tests/fixtures/nocollapsetag.debug index c15f3f504574..527882f9d9fa 100644 --- a/crates/jsdoc/tests/fixtures/nocollapsetag.debug +++ b/crates/jsdoc/tests/fixtures/nocollapsetag.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('A namespace. - *' type=dynamic), + value: "A namespace.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('const' type=static), + value: "const", }, tag: Const( ConstTag { @@ -83,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -106,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('nocollapse' type=dynamic), + value: "nocollapse", }, tag: Unknown( UnknownTag { @@ -129,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/nocompiletag.debug b/crates/jsdoc/tests/fixtures/nocompiletag.debug index a28d91f92fae..84c98db471f1 100644 --- a/crates/jsdoc/tests/fixtures/nocompiletag.debug +++ b/crates/jsdoc/tests/fixtures/nocompiletag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('nocompile' type=dynamic), + value: "nocompile", }, tag: Unknown( UnknownTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/nosideeffectstag.debug b/crates/jsdoc/tests/fixtures/nosideeffectstag.debug index 310c8b91e4b4..5d81aaa04a80 100644 --- a/crates/jsdoc/tests/fixtures/nosideeffectstag.debug +++ b/crates/jsdoc/tests/fixtures/nosideeffectstag.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('A function that does nothing. - *' type=dynamic), + value: "A function that does nothing.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('nosideeffects' type=dynamic), + value: "nosideeffects", }, tag: Unknown( UnknownTag { @@ -66,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/numericpropertytag.debug b/crates/jsdoc/tests/fixtures/numericpropertytag.debug index 54dec0940fea..aaf5da354264 100644 --- a/crates/jsdoc/tests/fixtures/numericpropertytag.debug +++ b/crates/jsdoc/tests/fixtures/numericpropertytag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { @@ -67,7 +67,7 @@ ), ctxt: #0, }, - value: Atom('@property {String} 1 The number one.' type=dynamic), + value: "@property {String} 1 The number one.", }, ), }, @@ -93,7 +93,7 @@ ), ctxt: #0, }, - value: Atom('property' type=static), + value: "property", }, tag: Property( PropertyTag { @@ -127,7 +127,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ], }, @@ -142,7 +142,7 @@ ), ctxt: #0, }, - value: Atom('{String}' type=dynamic), + value: "{String}", }, ), desc: Text { @@ -155,7 +155,7 @@ ), ctxt: #0, }, - value: Atom('2 The number two.' type=dynamic), + value: "2 The number two.", }, }, ), @@ -180,7 +180,7 @@ ), ctxt: #0, }, - value: Atom('property' type=static), + value: "property", }, tag: Property( PropertyTag { @@ -214,7 +214,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ], }, @@ -229,7 +229,7 @@ ), ctxt: #0, }, - value: Atom('{String}' type=dynamic), + value: "{String}", }, ), desc: Text { @@ -242,7 +242,7 @@ ), ctxt: #0, }, - value: Atom('3 The number three.' type=dynamic), + value: "3 The number three.", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/objectlit.debug b/crates/jsdoc/tests/fixtures/objectlit.debug index 27ba2bbb9f08..d90d0399e674 100644 --- a/crates/jsdoc/tests/fixtures/objectlit.debug +++ b/crates/jsdoc/tests/fixtures/objectlit.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, @@ -43,7 +43,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, @@ -67,7 +67,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/objectlit2.debug b/crates/jsdoc/tests/fixtures/objectlit2.debug index 9f27cc5b9f84..94a9ec7e9e7c 100644 --- a/crates/jsdoc/tests/fixtures/objectlit2.debug +++ b/crates/jsdoc/tests/fixtures/objectlit2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, @@ -43,7 +43,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/objectlit3.debug b/crates/jsdoc/tests/fixtures/objectlit3.debug index a75be180d7c9..4cf67cf66fe4 100644 --- a/crates/jsdoc/tests/fixtures/objectlit3.debug +++ b/crates/jsdoc/tests/fixtures/objectlit3.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('Tokens that can appear in the stream.' type=dynamic), + value: "Tokens that can appear in the stream.", }, tags: [], }, @@ -43,7 +43,7 @@ ), ctxt: #0, }, - value: Atom('Open parenthesis.' type=dynamic), + value: "Open parenthesis.", }, tags: [], }, @@ -67,7 +67,7 @@ ), ctxt: #0, }, - value: Atom('Executed before the token is processed.' type=dynamic), + value: "Executed before the token is processed.", }, tags: [], }, @@ -91,7 +91,7 @@ ), ctxt: #0, }, - value: Atom('Executed after the token is processed.' type=dynamic), + value: "Executed after the token is processed.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/overridetag.debug b/crates/jsdoc/tests/fixtures/overridetag.debug index 23206ec27919..1bcd078ce407 100644 --- a/crates/jsdoc/tests/fixtures/overridetag.debug +++ b/crates/jsdoc/tests/fixtures/overridetag.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('Parent class. - *' type=dynamic), + value: "Parent class.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -83,8 +82,7 @@ ), ctxt: #0, }, - value: Atom('Open the connection. - *' type=dynamic), + value: "Open the connection.\n *", }, tags: [ TagItem { @@ -107,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('virtual' type=inline), + value: "virtual", }, tag: Abstract( AbstractTag { @@ -145,7 +143,7 @@ ), ctxt: #0, }, - value: Atom('Close the connection.' type=dynamic), + value: "Close the connection.", }, tags: [], }, @@ -169,9 +167,7 @@ ), ctxt: #0, }, - value: Atom('Read the specified number of bytes from the connection. - * - *' type=dynamic), + value: "Read the specified number of bytes from the connection.\n *\n *", }, tags: [ TagItem { @@ -194,7 +190,7 @@ ), ctxt: #0, }, - value: Atom('function' type=static), + value: "function", }, tag: Function( FunctionTag { @@ -218,7 +214,7 @@ ), ctxt: #0, }, - value: Atom('Connection#read' type=dynamic), + value: "Connection#read", }, ), }, @@ -244,7 +240,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -269,7 +265,7 @@ ), ctxt: #0, }, - value: Atom('{number}' type=dynamic), + value: "{number}", }, ), desc: Text { @@ -282,7 +278,7 @@ ), ctxt: #0, }, - value: Atom('bytes - The number of bytes to read.' type=dynamic), + value: "bytes - The number of bytes to read.", }, }, ), @@ -307,7 +303,7 @@ ), ctxt: #0, }, - value: Atom('return' type=static), + value: "return", }, tag: Return( ReturnTag { @@ -331,7 +327,7 @@ ), ctxt: #0, }, - value: Atom('{Buffer}' type=dynamic), + value: "{Buffer}", }, ), description: Text { @@ -344,7 +340,7 @@ ), ctxt: #0, }, - value: Atom('The bytes that were read.' type=dynamic), + value: "The bytes that were read.", }, }, ), @@ -371,8 +367,7 @@ ), ctxt: #0, }, - value: Atom('Child class. - *' type=dynamic), + value: "Child class.\n *", }, tags: [ TagItem { @@ -395,7 +390,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -419,7 +414,7 @@ ), ctxt: #0, }, - value: Atom('* @extends Connection' type=dynamic), + value: "* @extends Connection", }, ), name: None, @@ -448,7 +443,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -471,7 +466,7 @@ ), ctxt: #0, }, - value: Atom('override' type=static), + value: "override", }, tag: Override( OverrideTag { @@ -509,8 +504,7 @@ ), ctxt: #0, }, - value: Atom('Close the socket. - *' type=dynamic), + value: "Close the socket.\n *", }, tags: [ TagItem { @@ -533,7 +527,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -558,7 +552,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -571,7 +565,7 @@ ), ctxt: #0, }, - value: Atom('message - A message explaining why the socket is being closed.' type=dynamic), + value: "message - A message explaining why the socket is being closed.", }, }, ), @@ -596,7 +590,7 @@ ), ctxt: #0, }, - value: Atom('override' type=static), + value: "override", }, tag: Override( OverrideTag { @@ -634,7 +628,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -657,7 +651,7 @@ ), ctxt: #0, }, - value: Atom('override' type=static), + value: "override", }, tag: Override( OverrideTag { diff --git a/crates/jsdoc/tests/fixtures/overridetag2.debug b/crates/jsdoc/tests/fixtures/overridetag2.debug index 05ba23d9c9a4..77cb773a92ab 100644 --- a/crates/jsdoc/tests/fixtures/overridetag2.debug +++ b/crates/jsdoc/tests/fixtures/overridetag2.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('Parent interface. - *' type=dynamic), + value: "Parent interface.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('interface' type=static), + value: "interface", }, tag: Interface( InterfaceTag { @@ -82,7 +81,7 @@ ), ctxt: #0, }, - value: Atom('Open the connection.' type=dynamic), + value: "Open the connection.", }, tags: [], }, @@ -106,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('Close the connection.' type=dynamic), + value: "Close the connection.", }, tags: [], }, @@ -130,9 +129,7 @@ ), ctxt: #0, }, - value: Atom('Read the specified number of bytes from the connection. - * - *' type=dynamic), + value: "Read the specified number of bytes from the connection.\n *\n *", }, tags: [ TagItem { @@ -155,7 +152,7 @@ ), ctxt: #0, }, - value: Atom('function' type=static), + value: "function", }, tag: Function( FunctionTag { @@ -179,7 +176,7 @@ ), ctxt: #0, }, - value: Atom('Connection#read' type=dynamic), + value: "Connection#read", }, ), }, @@ -205,7 +202,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -230,7 +227,7 @@ ), ctxt: #0, }, - value: Atom('{number}' type=dynamic), + value: "{number}", }, ), desc: Text { @@ -243,7 +240,7 @@ ), ctxt: #0, }, - value: Atom('bytes - The number of bytes to read.' type=dynamic), + value: "bytes - The number of bytes to read.", }, }, ), @@ -268,7 +265,7 @@ ), ctxt: #0, }, - value: Atom('return' type=static), + value: "return", }, tag: Return( ReturnTag { @@ -292,7 +289,7 @@ ), ctxt: #0, }, - value: Atom('{Buffer}' type=dynamic), + value: "{Buffer}", }, ), description: Text { @@ -305,7 +302,7 @@ ), ctxt: #0, }, - value: Atom('The bytes that were read.' type=dynamic), + value: "The bytes that were read.", }, }, ), @@ -332,8 +329,7 @@ ), ctxt: #0, }, - value: Atom('Child class. - *' type=dynamic), + value: "Child class.\n *", }, tags: [ TagItem { @@ -356,7 +352,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -380,7 +376,7 @@ ), ctxt: #0, }, - value: Atom('* @implements Connection' type=dynamic), + value: "* @implements Connection", }, ), name: None, @@ -409,7 +405,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -432,7 +428,7 @@ ), ctxt: #0, }, - value: Atom('override' type=static), + value: "override", }, tag: Override( OverrideTag { @@ -470,8 +466,7 @@ ), ctxt: #0, }, - value: Atom('Close the socket. - *' type=dynamic), + value: "Close the socket.\n *", }, tags: [ TagItem { @@ -494,7 +489,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -519,7 +514,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -532,7 +527,7 @@ ), ctxt: #0, }, - value: Atom('message - A message explaining why the socket is being closed.' type=dynamic), + value: "message - A message explaining why the socket is being closed.", }, }, ), @@ -557,7 +552,7 @@ ), ctxt: #0, }, - value: Atom('override' type=static), + value: "override", }, tag: Override( OverrideTag { @@ -595,7 +590,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -618,7 +613,7 @@ ), ctxt: #0, }, - value: Atom('override' type=static), + value: "override", }, tag: Override( OverrideTag { diff --git a/crates/jsdoc/tests/fixtures/packagetag.debug b/crates/jsdoc/tests/fixtures/packagetag.debug index e02cddd7fa2c..979316ddcc56 100644 --- a/crates/jsdoc/tests/fixtures/packagetag.debug +++ b/crates/jsdoc/tests/fixtures/packagetag.debug @@ -19,9 +19,7 @@ ), ctxt: #0, }, - value: Atom('This function is package-private. - * - *' type=dynamic), + value: "This function is package-private.\n *\n *", }, tags: [ TagItem { @@ -44,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('package' type=static), + value: "package", }, tag: Package( PackageTag { diff --git a/crates/jsdoc/tests/fixtures/packagetag2.debug b/crates/jsdoc/tests/fixtures/packagetag2.debug index 7a1acfc3970a..3293c276a513 100644 --- a/crates/jsdoc/tests/fixtures/packagetag2.debug +++ b/crates/jsdoc/tests/fixtures/packagetag2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('package' type=static), + value: "package", }, tag: Package( PackageTag { @@ -66,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('{Object.}' type=dynamic), + value: "{Object.}", }, ), }, diff --git a/crates/jsdoc/tests/fixtures/paramtag.debug b/crates/jsdoc/tests/fixtures/paramtag.debug index e879e77cfef5..d0c041506579 100644 --- a/crates/jsdoc/tests/fixtures/paramtag.debug +++ b/crates/jsdoc/tests/fixtures/paramtag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -67,7 +67,7 @@ ), ctxt: #0, }, - value: Atom('{ String | Array}' type=dynamic), + value: "{ String | Array}", }, ), desc: Text { @@ -80,7 +80,7 @@ ), ctxt: #0, }, - value: Atom('targetName The name (or names) of what to find.' type=dynamic), + value: "targetName The name (or names) of what to find.", }, }, ), @@ -107,7 +107,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -130,7 +130,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -155,7 +155,7 @@ ), ctxt: #0, }, - value: Atom('{function}' type=dynamic), + value: "{function}", }, ), desc: Text { @@ -168,7 +168,7 @@ ), ctxt: #0, }, - value: Atom('callback' type=dynamic), + value: "callback", }, }, ), @@ -195,7 +195,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -218,7 +218,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -243,7 +243,7 @@ ), ctxt: #0, }, - value: Atom('{function}' type=dynamic), + value: "{function}", }, ), desc: Text { @@ -256,7 +256,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -283,7 +283,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -306,7 +306,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -330,7 +330,7 @@ ), ctxt: #0, }, - value: Atom('The' type=inline), + value: "The", }, ), ty: Some( @@ -344,7 +344,7 @@ ), ctxt: #0, }, - value: Atom('id' type=static), + value: "id", }, ), desc: Text { @@ -357,7 +357,7 @@ ), ctxt: #0, }, - value: Atom('id of the element.' type=dynamic), + value: "id of the element.", }, }, ), @@ -384,7 +384,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -407,7 +407,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -432,7 +432,7 @@ ), ctxt: #0, }, - value: Atom('. Two or more elements.' type=dynamic), + value: ". Two or more elements.", }, }, ), @@ -459,7 +459,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -482,7 +482,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -507,7 +507,7 @@ ), ctxt: #0, }, - value: Atom('delimiter' type=dynamic), + value: "delimiter", }, ), desc: Text { @@ -520,7 +520,7 @@ ), ctxt: #0, }, - value: Atom('What to split on.' type=dynamic), + value: "What to split on.", }, }, ), @@ -547,7 +547,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -570,7 +570,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -595,7 +595,7 @@ ), ctxt: #0, }, - value: Atom('If true make the commit atomic.' type=dynamic), + value: "If true make the commit atomic.", }, }, ), @@ -622,7 +622,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -645,7 +645,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -669,7 +669,7 @@ ), ctxt: #0, }, - value: Atom('async' type=static), + value: "async", }, ), ty: None, @@ -683,7 +683,7 @@ ), ctxt: #0, }, - value: Atom('true] - whether to be asynchronous' type=dynamic), + value: "true] - whether to be asynchronous", }, }, ), @@ -710,7 +710,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -733,7 +733,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -773,7 +773,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -796,7 +796,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -821,7 +821,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -834,7 +834,7 @@ ), ctxt: #0, }, - value: Atom('- Hostname.' type=dynamic), + value: "- Hostname.", }, }, ), @@ -859,7 +859,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -884,7 +884,7 @@ ), ctxt: #0, }, - value: Atom('{number}' type=dynamic), + value: "{number}", }, ), desc: Text { @@ -897,7 +897,7 @@ ), ctxt: #0, }, - value: Atom('- Port number.' type=dynamic), + value: "- Port number.", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/paramtag2.debug b/crates/jsdoc/tests/fixtures/paramtag2.debug index 721cf138211b..8578c9f39a3e 100644 --- a/crates/jsdoc/tests/fixtures/paramtag2.debug +++ b/crates/jsdoc/tests/fixtures/paramtag2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('mysocket' type=dynamic), + value: "mysocket", }, }, ), @@ -104,7 +104,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -127,7 +127,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -152,7 +152,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -165,7 +165,7 @@ ), ctxt: #0, }, - value: Atom('- Hostname.' type=dynamic), + value: "- Hostname.", }, }, ), @@ -190,7 +190,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -215,7 +215,7 @@ ), ctxt: #0, }, - value: Atom('{number}' type=dynamic), + value: "{number}", }, ), desc: Text { @@ -228,7 +228,7 @@ ), ctxt: #0, }, - value: Atom('- Port number.' type=dynamic), + value: "- Port number.", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/paramtaginvalidtype.debug b/crates/jsdoc/tests/fixtures/paramtaginvalidtype.debug index 0dd11444eebd..6a5344a4b42b 100644 --- a/crates/jsdoc/tests/fixtures/paramtaginvalidtype.debug +++ b/crates/jsdoc/tests/fixtures/paramtaginvalidtype.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -130,7 +130,7 @@ ), ctxt: #0, }, - value: Atom('{string, number}' type=dynamic), + value: "{string, number}", }, ), desc: Text { @@ -143,7 +143,7 @@ ), ctxt: #0, }, - value: Atom('a' type=static), + value: "a", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/plugins.debug b/crates/jsdoc/tests/fixtures/plugins.debug index 350803167414..1cb1a747f494 100644 --- a/crates/jsdoc/tests/fixtures/plugins.debug +++ b/crates/jsdoc/tests/fixtures/plugins.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('name' type=static), + value: "name", }, tag: Name( NameTag { @@ -76,7 +76,7 @@ ), ctxt: #0, }, - value: Atom('virtual' type=inline), + value: "virtual", }, ], }, @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -128,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('foo' type=inline), + value: "foo", }, tag: Unknown( UnknownTag { @@ -151,7 +151,7 @@ ), ctxt: #0, }, - value: Atom('bar' type=inline), + value: "bar", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/polymerbehaviortag.debug b/crates/jsdoc/tests/fixtures/polymerbehaviortag.debug index 0ef34facbd85..a7249a40991a 100644 --- a/crates/jsdoc/tests/fixtures/polymerbehaviortag.debug +++ b/crates/jsdoc/tests/fixtures/polymerbehaviortag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('polymerBehavior' type=dynamic), + value: "polymerBehavior", }, tag: Unknown( UnknownTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/polymertag.debug b/crates/jsdoc/tests/fixtures/polymertag.debug index 64182aa81b13..70e9a60d587c 100644 --- a/crates/jsdoc/tests/fixtures/polymertag.debug +++ b/crates/jsdoc/tests/fixtures/polymertag.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('A Polymer class. - *' type=dynamic), + value: "A Polymer class.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('polymer' type=inline), + value: "polymer", }, tag: Unknown( UnknownTag { @@ -66,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/preservetag.debug b/crates/jsdoc/tests/fixtures/preservetag.debug index 2c0cbc198081..44b662429f43 100644 --- a/crates/jsdoc/tests/fixtures/preservetag.debug +++ b/crates/jsdoc/tests/fixtures/preservetag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('preserve' type=dynamic), + value: "preserve", }, tag: Unknown( UnknownTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/privatetag.debug b/crates/jsdoc/tests/fixtures/privatetag.debug index ca409e6dca6a..80f6d040dc9d 100644 --- a/crates/jsdoc/tests/fixtures/privatetag.debug +++ b/crates/jsdoc/tests/fixtures/privatetag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -66,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('* @private' type=dynamic), + value: "* @private", }, ), name: None, @@ -95,7 +95,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/privatetag2.debug b/crates/jsdoc/tests/fixtures/privatetag2.debug index 9a7d5b80119b..7ec162a3bf5e 100644 --- a/crates/jsdoc/tests/fixtures/privatetag2.debug +++ b/crates/jsdoc/tests/fixtures/privatetag2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('private' type=static), + value: "private", }, tag: Private( PrivateTag { @@ -66,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('{Object.}' type=dynamic), + value: "{Object.}", }, ), }, diff --git a/crates/jsdoc/tests/fixtures/projecttag.debug b/crates/jsdoc/tests/fixtures/projecttag.debug index 6effc963c0bc..4560ed26c9b9 100644 --- a/crates/jsdoc/tests/fixtures/projecttag.debug +++ b/crates/jsdoc/tests/fixtures/projecttag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('An automated documentation generator for JavaScript.' type=dynamic), + value: "An automated documentation generator for JavaScript.", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('project' type=inline), + value: "project", }, tag: Unknown( UnknownTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('JSDoc' type=inline), + value: "JSDoc", }, }, ), @@ -90,7 +90,7 @@ ), ctxt: #0, }, - value: Atom('version' type=inline), + value: "version", }, tag: Version( VersionTag { @@ -113,7 +113,7 @@ ), ctxt: #0, }, - value: Atom('3.0.0' type=inline), + value: "3.0.0", }, }, ), @@ -138,7 +138,7 @@ ), ctxt: #0, }, - value: Atom('copyright' type=dynamic), + value: "copyright", }, tag: Copyright( CopyrightTag { @@ -161,7 +161,7 @@ ), ctxt: #0, }, - value: Atom('2011 (c) Michael Mathews ' type=dynamic), + value: "2011 (c) Michael Mathews ", }, }, ), @@ -186,7 +186,7 @@ ), ctxt: #0, }, - value: Atom('license' type=inline), + value: "license", }, tag: License( LicenseTag { @@ -209,7 +209,7 @@ ), ctxt: #0, }, - value: Atom('Apache Version 2 ' type=dynamic), + value: "Apache Version 2 ", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/propertytag.debug b/crates/jsdoc/tests/fixtures/propertytag.debug index b28d5bc919b7..370e2b46fc94 100644 --- a/crates/jsdoc/tests/fixtures/propertytag.debug +++ b/crates/jsdoc/tests/fixtures/propertytag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { @@ -67,7 +67,7 @@ ), ctxt: #0, }, - value: Atom('@property {String} id=abc123 The identifier.' type=dynamic), + value: "@property {String} id=abc123 The identifier.", }, ), }, @@ -93,7 +93,7 @@ ), ctxt: #0, }, - value: Atom('property' type=static), + value: "property", }, tag: Property( PropertyTag { @@ -127,7 +127,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ], }, @@ -142,7 +142,7 @@ ), ctxt: #0, }, - value: Atom('{Object}' type=dynamic), + value: "{Object}", }, ), desc: Text { @@ -155,7 +155,7 @@ ), ctxt: #0, }, - value: Atom('defaults The default values.' type=dynamic), + value: "defaults The default values.", }, }, ), @@ -180,7 +180,7 @@ ), ctxt: #0, }, - value: Atom('property' type=static), + value: "property", }, tag: Property( PropertyTag { @@ -214,7 +214,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ], }, @@ -229,7 +229,7 @@ ), ctxt: #0, }, - value: Atom('{Number}' type=dynamic), + value: "{Number}", }, ), desc: Text { @@ -242,7 +242,7 @@ ), ctxt: #0, }, - value: Atom('defaults.a=1 The a property of the defaults.' type=dynamic), + value: "defaults.a=1 The a property of the defaults.", }, }, ), @@ -267,7 +267,7 @@ ), ctxt: #0, }, - value: Atom('property' type=static), + value: "property", }, tag: Property( PropertyTag { @@ -301,7 +301,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ], }, @@ -316,7 +316,7 @@ ), ctxt: #0, }, - value: Atom('{String}' type=dynamic), + value: "{String}", }, ), desc: Text { @@ -329,7 +329,7 @@ ), ctxt: #0, }, - value: Atom('defaults.b The b property of the defaults.' type=dynamic), + value: "defaults.b The b property of the defaults.", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/protectedtag.debug b/crates/jsdoc/tests/fixtures/protectedtag.debug index e4935f1a2b2c..003bb3e53ab3 100644 --- a/crates/jsdoc/tests/fixtures/protectedtag.debug +++ b/crates/jsdoc/tests/fixtures/protectedtag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('uid' type=inline), + value: "uid", }, }, ), @@ -104,7 +104,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -127,7 +127,7 @@ ), ctxt: #0, }, - value: Atom('protected' type=static), + value: "protected", }, tag: Protected( ProtectedTag { @@ -166,7 +166,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -189,7 +189,7 @@ ), ctxt: #0, }, - value: Atom('protected' type=static), + value: "protected", }, tag: Protected( ProtectedTag { @@ -228,7 +228,7 @@ ), ctxt: #0, }, - value: Atom('Root object.' type=dynamic), + value: "Root object.", }, tags: [], }, @@ -252,7 +252,7 @@ ), ctxt: #0, }, - value: Atom('Obtain a unique ID.' type=dynamic), + value: "Obtain a unique ID.", }, tags: [], }, @@ -276,7 +276,7 @@ ), ctxt: #0, }, - value: Atom('Associate an object with a unique ID.' type=dynamic), + value: "Associate an object with a unique ID.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/protectedtag2.debug b/crates/jsdoc/tests/fixtures/protectedtag2.debug index 9f348b474d70..7420dffeab62 100644 --- a/crates/jsdoc/tests/fixtures/protectedtag2.debug +++ b/crates/jsdoc/tests/fixtures/protectedtag2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('protected' type=static), + value: "protected", }, tag: Protected( ProtectedTag { @@ -66,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('{number}' type=dynamic), + value: "{number}", }, ), }, @@ -94,8 +94,7 @@ ), ctxt: #0, }, - value: Atom('Unique ID generator. - *' type=dynamic), + value: "Unique ID generator.\n *", }, tags: [ TagItem { @@ -118,7 +117,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -158,7 +157,7 @@ ), ctxt: #0, }, - value: Atom('Generate a unique ID.' type=dynamic), + value: "Generate a unique ID.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/publictag.debug b/crates/jsdoc/tests/fixtures/publictag.debug index 8364253a03d6..203927413ada 100644 --- a/crates/jsdoc/tests/fixtures/publictag.debug +++ b/crates/jsdoc/tests/fixtures/publictag.debug @@ -19,9 +19,7 @@ ), ctxt: #0, }, - value: Atom('Public class. - * - *' type=dynamic), + value: "Public class.\n *\n *", }, tags: [ TagItem { @@ -44,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -68,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('* @public' type=dynamic), + value: "* @public", }, ), name: None, diff --git a/crates/jsdoc/tests/fixtures/publictag2.debug b/crates/jsdoc/tests/fixtures/publictag2.debug index 5ebcc35aae59..1b59371bab86 100644 --- a/crates/jsdoc/tests/fixtures/publictag2.debug +++ b/crates/jsdoc/tests/fixtures/publictag2.debug @@ -19,9 +19,7 @@ ), ctxt: #0, }, - value: Atom('Public variable. - * - *' type=dynamic), + value: "Public variable.\n *\n *", }, tags: [ TagItem { @@ -44,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('public' type=static), + value: "public", }, tag: Public( PublicTag { diff --git a/crates/jsdoc/tests/fixtures/quotename.debug b/crates/jsdoc/tests/fixtures/quotename.debug index eafcac6e1ec6..3a051c01b050 100644 --- a/crates/jsdoc/tests/fixtures/quotename.debug +++ b/crates/jsdoc/tests/fixtures/quotename.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { @@ -145,7 +145,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -168,7 +168,7 @@ ), ctxt: #0, }, - value: Atom('member' type=inline), + value: "member", }, tag: Member( MemberTag { @@ -191,7 +191,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, name: Text { span: Span { @@ -203,7 +203,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/quotename2.debug b/crates/jsdoc/tests/fixtures/quotename2.debug index 22722e5afefe..1d70b95a3a9e 100644 --- a/crates/jsdoc/tests/fixtures/quotename2.debug +++ b/crates/jsdoc/tests/fixtures/quotename2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { @@ -145,7 +145,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/readonlytag.debug b/crates/jsdoc/tests/fixtures/readonlytag.debug index 7c6441fa73ee..a9e4083e230a 100644 --- a/crates/jsdoc/tests/fixtures/readonlytag.debug +++ b/crates/jsdoc/tests/fixtures/readonlytag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('readonly' type=static), + value: "readonly", }, tag: Readonly( ReadonlyTag { diff --git a/crates/jsdoc/tests/fixtures/requirestag.debug b/crates/jsdoc/tests/fixtures/requirestag.debug index 14fb12c57ec6..7e90fa3bdc64 100644 --- a/crates/jsdoc/tests/fixtures/requirestag.debug +++ b/crates/jsdoc/tests/fixtures/requirestag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('requires' type=dynamic), + value: "requires", }, tag: Requires( RequiresTag { @@ -76,7 +76,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, ], }, @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -128,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('requires' type=dynamic), + value: "requires", }, tag: Requires( RequiresTag { @@ -162,7 +162,7 @@ ), ctxt: #0, }, - value: Atom('foo' type=inline), + value: "foo", }, ], }, @@ -189,7 +189,7 @@ ), ctxt: #0, }, - value: Atom('requires' type=dynamic), + value: "requires", }, tag: Requires( RequiresTag { @@ -223,7 +223,7 @@ ), ctxt: #0, }, - value: Atom('Pez' type=inline), + value: "Pez", }, ], }, @@ -252,7 +252,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -275,7 +275,7 @@ ), ctxt: #0, }, - value: Atom('requires' type=dynamic), + value: "requires", }, tag: Requires( RequiresTag { @@ -309,7 +309,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ], }, @@ -336,7 +336,7 @@ ), ctxt: #0, }, - value: Atom('link' type=static), + value: "link", }, tag: Unknown( UnknownTag { @@ -359,7 +359,7 @@ ), ctxt: #0, }, - value: Atom('module:zest}' type=dynamic), + value: "module:zest}", }, }, ), @@ -384,7 +384,7 @@ ), ctxt: #0, }, - value: Atom('requires' type=dynamic), + value: "requires", }, tag: Requires( RequiresTag { @@ -418,7 +418,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ], }, @@ -445,7 +445,7 @@ ), ctxt: #0, }, - value: Atom('linkplain' type=dynamic), + value: "linkplain", }, tag: Unknown( UnknownTag { @@ -468,7 +468,7 @@ ), ctxt: #0, }, - value: Atom('module:zing}' type=dynamic), + value: "module:zing}", }, }, ), @@ -493,7 +493,7 @@ ), ctxt: #0, }, - value: Atom('requires' type=dynamic), + value: "requires", }, tag: Requires( RequiresTag { @@ -527,7 +527,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ], }, @@ -554,7 +554,7 @@ ), ctxt: #0, }, - value: Atom('linkstupid' type=dynamic), + value: "linkstupid", }, tag: Unknown( UnknownTag { @@ -577,7 +577,7 @@ ), ctxt: #0, }, - value: Atom('module:pizzazz}' type=dynamic), + value: "module:pizzazz}", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/restparams.debug b/crates/jsdoc/tests/fixtures/restparams.debug index d9eaec2f2e0b..5c04fc5e8b95 100644 --- a/crates/jsdoc/tests/fixtures/restparams.debug +++ b/crates/jsdoc/tests/fixtures/restparams.debug @@ -19,9 +19,7 @@ ), ctxt: #0, }, - value: Atom('Set the list of users who are admins. - * - *' type=dynamic), + value: "Set the list of users who are admins.\n *\n *", }, tags: [ TagItem { @@ -44,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -69,7 +67,7 @@ ), ctxt: #0, }, - value: Atom('{User}' type=inline), + value: "{User}", }, ), desc: Text { @@ -82,7 +80,7 @@ ), ctxt: #0, }, - value: Atom('users - The users who will receive admin rights.' type=dynamic), + value: "users - The users who will receive admin rights.", }, }, ), @@ -109,9 +107,7 @@ ), ctxt: #0, }, - value: Atom('Set the list of users who can access a widget. - * - *' type=dynamic), + value: "Set the list of users who can access a widget.\n *\n *", }, tags: [ TagItem { @@ -134,7 +130,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -159,7 +155,7 @@ ), ctxt: #0, }, - value: Atom('{Widget}' type=dynamic), + value: "{Widget}", }, ), desc: Text { @@ -172,7 +168,7 @@ ), ctxt: #0, }, - value: Atom('widget - The widget.' type=dynamic), + value: "widget - The widget.", }, }, ), @@ -197,7 +193,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -222,7 +218,7 @@ ), ctxt: #0, }, - value: Atom('{User}' type=inline), + value: "{User}", }, ), desc: Text { @@ -235,7 +231,7 @@ ), ctxt: #0, }, - value: Atom('users - The users who will receive rights to access the widget.' type=dynamic), + value: "users - The users who will receive rights to access the widget.", }, }, ), @@ -262,9 +258,7 @@ ), ctxt: #0, }, - value: Atom('Set the list of users who are managers. - * - *' type=dynamic), + value: "Set the list of users who are managers.\n *\n *", }, tags: [ TagItem { @@ -287,7 +281,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -312,7 +306,7 @@ ), ctxt: #0, }, - value: Atom('{User}' type=inline), + value: "{User}", }, ), desc: Text { @@ -325,7 +319,7 @@ ), ctxt: #0, }, - value: Atom('users - The users who are managers.' type=dynamic), + value: "users - The users who are managers.", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/restparams2.debug b/crates/jsdoc/tests/fixtures/restparams2.debug index f02ee5ff74db..4c9d553f4ba9 100644 --- a/crates/jsdoc/tests/fixtures/restparams2.debug +++ b/crates/jsdoc/tests/fixtures/restparams2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('Class representing a widget.' type=dynamic), + value: "Class representing a widget.", }, tags: [], }, @@ -43,9 +43,7 @@ ), ctxt: #0, }, - value: Atom('Add users who can access the widget. - * - *' type=dynamic), + value: "Add users who can access the widget.\n *\n *", }, tags: [ TagItem { @@ -68,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -93,7 +91,7 @@ ), ctxt: #0, }, - value: Atom('{User}' type=inline), + value: "{User}", }, ), desc: Text { @@ -106,7 +104,7 @@ ), ctxt: #0, }, - value: Atom('users - The users who can access the widget.' type=dynamic), + value: "users - The users who can access the widget.", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/returnstag.debug b/crates/jsdoc/tests/fixtures/returnstag.debug index 8d0024bf6f69..6b754936aad8 100644 --- a/crates/jsdoc/tests/fixtures/returnstag.debug +++ b/crates/jsdoc/tests/fixtures/returnstag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('returns' type=inline), + value: "returns", }, tag: Return( ReturnTag { @@ -66,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('{string|Array}' type=dynamic), + value: "{string|Array}", }, ), description: Text { @@ -79,7 +79,7 @@ ), ctxt: #0, }, - value: Atom('The names of the found item(s).' type=dynamic), + value: "The names of the found item(s).", }, }, ), @@ -106,7 +106,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -129,7 +129,7 @@ ), ctxt: #0, }, - value: Atom('returns' type=inline), + value: "returns", }, tag: Return( ReturnTag { @@ -153,7 +153,7 @@ ), ctxt: #0, }, - value: Atom('{!string}' type=dynamic), + value: "{!string}", }, ), description: Text { @@ -166,7 +166,7 @@ ), ctxt: #0, }, - value: Atom('The name, if defined.' type=dynamic), + value: "The name, if defined.", }, }, ), @@ -193,7 +193,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -216,7 +216,7 @@ ), ctxt: #0, }, - value: Atom('return' type=static), + value: "return", }, tag: Return( ReturnTag { @@ -240,7 +240,7 @@ ), ctxt: #0, }, - value: Atom('The' type=inline), + value: "The", }, ), description: Text { @@ -253,7 +253,7 @@ ), ctxt: #0, }, - value: Atom('binding id.' type=dynamic), + value: "binding id.", }, }, ), @@ -280,7 +280,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -303,7 +303,7 @@ ), ctxt: #0, }, - value: Atom('return' type=static), + value: "return", }, tag: Return( ReturnTag { @@ -327,7 +327,7 @@ ), ctxt: #0, }, - value: Atom('An' type=inline), + value: "An", }, ), description: Text { @@ -340,7 +340,7 @@ ), ctxt: #0, }, - value: Atom('object to be passed to {@link find}.' type=dynamic), + value: "object to be passed to {@link find}.", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/scopetags.debug b/crates/jsdoc/tests/fixtures/scopetags.debug index 647af7920582..0d5c9e415cd4 100644 --- a/crates/jsdoc/tests/fixtures/scopetags.debug +++ b/crates/jsdoc/tests/fixtures/scopetags.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('(scope tags for global objects do not override globalness hence need a container class) - *' type=dynamic), + value: "(scope tags for global objects do not override globalness hence need a container class)\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -66,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -78,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('scopetags' type=dynamic), + value: "scopetags", }, }, ), @@ -105,7 +104,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -128,7 +127,7 @@ ), ctxt: #0, }, - value: Atom('inner' type=inline), + value: "inner", }, tag: Inner( InnerTag { @@ -166,7 +165,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -189,7 +188,7 @@ ), ctxt: #0, }, - value: Atom('instance' type=dynamic), + value: "instance", }, tag: Instance( InstanceTag { @@ -227,7 +226,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -250,7 +249,7 @@ ), ctxt: #0, }, - value: Atom('static' type=static), + value: "static", }, tag: Static( StaticTag { diff --git a/crates/jsdoc/tests/fixtures/seetag.debug b/crates/jsdoc/tests/fixtures/seetag.debug index 480e8d921eef..90694c0e0973 100644 --- a/crates/jsdoc/tests/fixtures/seetag.debug +++ b/crates/jsdoc/tests/fixtures/seetag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('see' type=inline), + value: "see", }, tag: See( SeeTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('{@link bar}' type=dynamic), + value: "{@link bar}", }, }, ), @@ -92,7 +92,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -115,7 +115,7 @@ ), ctxt: #0, }, - value: Atom('see' type=inline), + value: "see", }, tag: See( SeeTag { @@ -138,7 +138,7 @@ ), ctxt: #0, }, - value: Atom('http://example.com/someref' type=dynamic), + value: "http://example.com/someref", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/sincetag.debug b/crates/jsdoc/tests/fixtures/sincetag.debug index 2b9712de1625..19404f85156d 100644 --- a/crates/jsdoc/tests/fixtures/sincetag.debug +++ b/crates/jsdoc/tests/fixtures/sincetag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('since' type=inline), + value: "since", }, tag: Since( SinceTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('1.2.3' type=inline), + value: "1.2.3", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/specialchars.debug b/crates/jsdoc/tests/fixtures/specialchars.debug index f215a59629d4..f8d7b68fd5aa 100644 --- a/crates/jsdoc/tests/fixtures/specialchars.debug +++ b/crates/jsdoc/tests/fixtures/specialchars.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('Port number.' type=dynamic), + value: "Port number.", }, tags: [], }, @@ -106,7 +106,7 @@ ), ctxt: #0, }, - value: Atom('Open a connection.' type=dynamic), + value: "Open a connection.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/specialnames.debug b/crates/jsdoc/tests/fixtures/specialnames.debug index 98d2dd60d697..8967d574c256 100644 --- a/crates/jsdoc/tests/fixtures/specialnames.debug +++ b/crates/jsdoc/tests/fixtures/specialnames.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, @@ -106,7 +106,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -129,7 +129,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { @@ -169,7 +169,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, @@ -193,7 +193,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/structtag.debug b/crates/jsdoc/tests/fixtures/structtag.debug index ee7a42808375..a2858d8ca33c 100644 --- a/crates/jsdoc/tests/fixtures/structtag.debug +++ b/crates/jsdoc/tests/fixtures/structtag.debug @@ -19,9 +19,7 @@ ), ctxt: #0, }, - value: Atom('Foo class. - * - *' type=dynamic), + value: "Foo class.\n *\n *", }, tags: [ TagItem { @@ -44,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -68,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('* @struct' type=dynamic), + value: "* @struct", }, ), name: None, diff --git a/crates/jsdoc/tests/fixtures/summarytag.debug b/crates/jsdoc/tests/fixtures/summarytag.debug index b376f18c59ce..467f9766ce29 100644 --- a/crates/jsdoc/tests/fixtures/summarytag.debug +++ b/crates/jsdoc/tests/fixtures/summarytag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('summary' type=static), + value: "summary", }, tag: Summary( SummaryTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/suppresstag.debug b/crates/jsdoc/tests/fixtures/suppresstag.debug index 742122df7306..87a73e0fc256 100644 --- a/crates/jsdoc/tests/fixtures/suppresstag.debug +++ b/crates/jsdoc/tests/fixtures/suppresstag.debug @@ -19,9 +19,7 @@ ), ctxt: #0, }, - value: Atom('Foo class. - * - *' type=dynamic), + value: "Foo class.\n *\n *", }, tags: [ TagItem { @@ -44,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -68,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('* @suppress {deprecated}' type=dynamic), + value: "* @suppress {deprecated}", }, ), name: None, diff --git a/crates/jsdoc/tests/fixtures/templatetag.debug b/crates/jsdoc/tests/fixtures/templatetag.debug index 7ea6c9426a23..d94080fea07e 100644 --- a/crates/jsdoc/tests/fixtures/templatetag.debug +++ b/crates/jsdoc/tests/fixtures/templatetag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -67,7 +67,7 @@ ), ctxt: #0, }, - value: Atom('{T}' type=inline), + value: "{T}", }, ), desc: Text { @@ -80,7 +80,7 @@ ), ctxt: #0, }, - value: Atom('t' type=inline), + value: "t", }, }, ), @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -129,7 +129,7 @@ ), ctxt: #0, }, - value: Atom('* @template T' type=dynamic), + value: "* @template T", }, ), name: None, diff --git a/crates/jsdoc/tests/fixtures/this-and-objectlit.debug b/crates/jsdoc/tests/fixtures/this-and-objectlit.debug index 0dab1177a4b4..88a7101f7bee 100644 --- a/crates/jsdoc/tests/fixtures/this-and-objectlit.debug +++ b/crates/jsdoc/tests/fixtures/this-and-objectlit.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/this.debug b/crates/jsdoc/tests/fixtures/this.debug index 6a88ecabe738..9d88f212574f 100644 --- a/crates/jsdoc/tests/fixtures/this.debug +++ b/crates/jsdoc/tests/fixtures/this.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/this2.debug b/crates/jsdoc/tests/fixtures/this2.debug index ee9be9991a8d..1effdbd89200 100644 --- a/crates/jsdoc/tests/fixtures/this2.debug +++ b/crates/jsdoc/tests/fixtures/this2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -145,7 +145,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, @@ -169,7 +169,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/this3.debug b/crates/jsdoc/tests/fixtures/this3.debug index a280bab5fcd7..4c52c95c9ec0 100644 --- a/crates/jsdoc/tests/fixtures/this3.debug +++ b/crates/jsdoc/tests/fixtures/this3.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/this4.debug b/crates/jsdoc/tests/fixtures/this4.debug index 15ac0542ce0e..feece7d8ea56 100644 --- a/crates/jsdoc/tests/fixtures/this4.debug +++ b/crates/jsdoc/tests/fixtures/this4.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('Render content.' type=dynamic), + value: "Render content.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/this5.debug b/crates/jsdoc/tests/fixtures/this5.debug index f2620c24fea7..8340e23470e0 100644 --- a/crates/jsdoc/tests/fixtures/this5.debug +++ b/crates/jsdoc/tests/fixtures/this5.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('template' type=static), + value: "template", }, }, ), @@ -104,7 +104,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -127,7 +127,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -151,7 +151,7 @@ ), ctxt: #0, }, - value: Atom('* @alias module:template.Template' type=dynamic), + value: "* @alias module:template.Template", }, ), name: None, @@ -180,7 +180,7 @@ ), ctxt: #0, }, - value: Atom('View file.' type=dynamic), + value: "View file.", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/this6.debug b/crates/jsdoc/tests/fixtures/this6.debug index 01f733e113bf..6cb57dc3f410 100644 --- a/crates/jsdoc/tests/fixtures/this6.debug +++ b/crates/jsdoc/tests/fixtures/this6.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('example' type=inline), + value: "example", }, }, ), @@ -104,9 +104,7 @@ ), ctxt: #0, }, - value: Atom('An ES6 class. - * - *' type=dynamic), + value: "An ES6 class.\n *\n *", }, tags: [ TagItem { @@ -129,7 +127,7 @@ ), ctxt: #0, }, - value: Atom('alias' type=inline), + value: "alias", }, tag: Alias( AliasTag { @@ -163,7 +161,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, ], }, @@ -192,9 +190,7 @@ ), ctxt: #0, }, - value: Atom('My property. - * - *' type=dynamic), + value: "My property.\n *\n *", }, tags: [ TagItem { @@ -217,7 +213,7 @@ ), ctxt: #0, }, - value: Atom('protected' type=static), + value: "protected", }, tag: Protected( ProtectedTag { diff --git a/crates/jsdoc/tests/fixtures/thistag.debug b/crates/jsdoc/tests/fixtures/thistag.debug index 537cdaf3e50b..89bdbbb522f9 100644 --- a/crates/jsdoc/tests/fixtures/thistag.debug +++ b/crates/jsdoc/tests/fixtures/thistag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('this' type=static), + value: "this", }, tag: This( ThisTag { @@ -139,7 +139,7 @@ ), ctxt: #0, }, - value: Atom('Foo' type=inline), + value: "Foo", }, ], }, @@ -168,7 +168,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/thistag2.debug b/crates/jsdoc/tests/fixtures/thistag2.debug index caf9d1398e43..837eb5e3cffe 100644 --- a/crates/jsdoc/tests/fixtures/thistag2.debug +++ b/crates/jsdoc/tests/fixtures/thistag2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('this' type=static), + value: "this", }, tag: This( ThisTag { @@ -139,7 +139,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ], }, @@ -168,7 +168,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, @@ -192,7 +192,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -215,7 +215,7 @@ ), ctxt: #0, }, - value: Atom('this' type=static), + value: "this", }, tag: This( ThisTag { @@ -249,7 +249,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ], }, diff --git a/crates/jsdoc/tests/fixtures/todotag.debug b/crates/jsdoc/tests/fixtures/todotag.debug index d396c70dc7df..28a80c212339 100644 --- a/crates/jsdoc/tests/fixtures/todotag.debug +++ b/crates/jsdoc/tests/fixtures/todotag.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('A function. - *' type=dynamic), + value: "A function.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('todo' type=inline), + value: "todo", }, tag: Todo( TodoTag { @@ -66,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('something' type=dynamic), + value: "something", }, }, ), @@ -91,7 +90,7 @@ ), ctxt: #0, }, - value: Atom('todo' type=inline), + value: "todo", }, tag: Todo( TodoTag { @@ -114,7 +113,7 @@ ), ctxt: #0, }, - value: Atom('something else' type=dynamic), + value: "something else", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/typedeftag.debug b/crates/jsdoc/tests/fixtures/typedeftag.debug index b01d6c9c0a93..d61b600c7e9f 100644 --- a/crates/jsdoc/tests/fixtures/typedeftag.debug +++ b/crates/jsdoc/tests/fixtures/typedeftag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('typedef' type=inline), + value: "typedef", }, tag: TypeDef( TypeDefTag { @@ -66,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('{(string|number)}' type=dynamic), + value: "{(string|number)}", }, ), name_path: NamePath { @@ -90,7 +90,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ], }, @@ -119,7 +119,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -142,7 +142,7 @@ ), ctxt: #0, }, - value: Atom('typedef' type=inline), + value: "typedef", }, tag: TypeDef( TypeDefTag { @@ -166,7 +166,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), name_path: NamePath { @@ -190,7 +190,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ], }, @@ -219,7 +219,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -242,7 +242,7 @@ ), ctxt: #0, }, - value: Atom('typedef' type=inline), + value: "typedef", }, tag: TypeDef( TypeDefTag { @@ -266,7 +266,7 @@ ), ctxt: #0, }, - value: Atom('{calc.NumberLike}' type=dynamic), + value: "{calc.NumberLike}", }, ), name_path: NamePath { @@ -290,7 +290,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ], }, @@ -319,7 +319,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -342,7 +342,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -367,7 +367,7 @@ ), ctxt: #0, }, - value: Atom('{calc.NumberLike}' type=dynamic), + value: "{calc.NumberLike}", }, ), desc: Text { @@ -380,7 +380,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/typedeftag2.debug b/crates/jsdoc/tests/fixtures/typedeftag2.debug index 5fda0ca40f13..5d147c8ace66 100644 --- a/crates/jsdoc/tests/fixtures/typedeftag2.debug +++ b/crates/jsdoc/tests/fixtures/typedeftag2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('typedef' type=inline), + value: "typedef", }, tag: TypeDef( TypeDefTag { @@ -66,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('{(string|number)}' type=dynamic), + value: "{(string|number)}", }, ), name_path: NamePath { @@ -90,7 +90,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ], }, diff --git a/crates/jsdoc/tests/fixtures/typekind.debug b/crates/jsdoc/tests/fixtures/typekind.debug index 963a6f40e615..be92a0b9205d 100644 --- a/crates/jsdoc/tests/fixtures/typekind.debug +++ b/crates/jsdoc/tests/fixtures/typekind.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('ConnectServer} blog/server' type=dynamic), + value: "ConnectServer} blog/server", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/typetag.debug b/crates/jsdoc/tests/fixtures/typetag.debug index bdd9af3d9572..37c1e5017440 100644 --- a/crates/jsdoc/tests/fixtures/typetag.debug +++ b/crates/jsdoc/tests/fixtures/typetag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('{string|Array}' type=dynamic), + value: "{string|Array}", }, }, ), @@ -92,7 +92,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -115,7 +115,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -138,7 +138,7 @@ ), ctxt: #0, }, - value: Atom('integer' type=inline), + value: "integer", }, }, ), @@ -165,7 +165,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -188,7 +188,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -211,7 +211,7 @@ ), ctxt: #0, }, - value: Atom('{!Array.}' type=dynamic), + value: "{!Array.}", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/typetag2.debug b/crates/jsdoc/tests/fixtures/typetag2.debug index eaa8a5833463..4a946bc433c7 100644 --- a/crates/jsdoc/tests/fixtures/typetag2.debug +++ b/crates/jsdoc/tests/fixtures/typetag2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('{(string|number)} A string or a number.' type=dynamic), + value: "{(string|number)} A string or a number.", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/typetaginline.debug b/crates/jsdoc/tests/fixtures/typetaginline.debug index d352d40cf5b4..5e8b6a7c7308 100644 --- a/crates/jsdoc/tests/fixtures/typetaginline.debug +++ b/crates/jsdoc/tests/fixtures/typetaginline.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('Inline type info only.' type=dynamic), + value: "Inline type info only.", }, tags: [], }, @@ -43,7 +43,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -66,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -89,7 +89,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -116,7 +116,7 @@ ), ctxt: #0, }, - value: Atom('Inline type info that conflicts with `' type=dynamic), + value: "Inline type info that conflicts with `", }, tags: [ TagItem { @@ -139,7 +139,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -164,7 +164,7 @@ ), ctxt: #0, }, - value: Atom('tag' type=inline), + value: "tag", }, ), desc: Text { @@ -177,7 +177,7 @@ ), ctxt: #0, }, - value: Atom('*' type=static), + value: "*", }, }, ), @@ -202,7 +202,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -226,7 +226,7 @@ ), ctxt: #0, }, - value: Atom('* @param {number} candyId - The candy's identifier.' type=dynamic), + value: "* @param {number} candyId - The candy's identifier.", }, ), name: None, @@ -255,7 +255,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -278,7 +278,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -301,7 +301,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -328,9 +328,7 @@ ), ctxt: #0, }, - value: Atom('Inline type info for leading param only. - * - *' type=dynamic), + value: "Inline type info for leading param only.\n *\n *", }, tags: [ TagItem { @@ -353,7 +351,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -378,7 +376,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -391,7 +389,7 @@ ), ctxt: #0, }, - value: Atom('item' type=inline), + value: "item", }, }, ), @@ -418,7 +416,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -441,7 +439,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -464,7 +462,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -491,9 +489,7 @@ ), ctxt: #0, }, - value: Atom('Inline type info for trailing param only. - * - *' type=dynamic), + value: "Inline type info for trailing param only.\n *\n *", }, tags: [ TagItem { @@ -516,7 +512,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -541,7 +537,7 @@ ), ctxt: #0, }, - value: Atom('{Dispenser}' type=dynamic), + value: "{Dispenser}", }, ), desc: Text { @@ -554,7 +550,7 @@ ), ctxt: #0, }, - value: Atom('dispenser' type=dynamic), + value: "dispenser", }, }, ), @@ -581,7 +577,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -604,7 +600,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -627,7 +623,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -654,9 +650,7 @@ ), ctxt: #0, }, - value: Atom('Inline type info for inner param only. - * - *' type=dynamic), + value: "Inline type info for inner param only.\n *\n *", }, tags: [ TagItem { @@ -679,7 +673,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -704,7 +698,7 @@ ), ctxt: #0, }, - value: Atom('{Dispenser}' type=dynamic), + value: "{Dispenser}", }, ), desc: Text { @@ -717,7 +711,7 @@ ), ctxt: #0, }, - value: Atom('dispenser' type=dynamic), + value: "dispenser", }, }, ), @@ -742,7 +736,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -767,7 +761,7 @@ ), ctxt: #0, }, - value: Atom('{number}' type=dynamic), + value: "{number}", }, ), desc: Text { @@ -780,7 +774,7 @@ ), ctxt: #0, }, - value: Atom('shade' type=inline), + value: "shade", }, }, ), @@ -805,7 +799,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -830,7 +824,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -843,7 +837,7 @@ ), ctxt: #0, }, - value: Atom('brand' type=inline), + value: "brand", }, }, ), @@ -870,7 +864,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -893,7 +887,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -916,7 +910,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/typetagwithnewline.debug b/crates/jsdoc/tests/fixtures/typetagwithnewline.debug index cd1d38bf7412..e84090444dbd 100644 --- a/crates/jsdoc/tests/fixtures/typetagwithnewline.debug +++ b/crates/jsdoc/tests/fixtures/typetagwithnewline.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('class' type=static), + value: "class", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -128,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('{(!Array.|' type=dynamic), + value: "{(!Array.|", }, }, ), @@ -155,7 +155,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -178,7 +178,7 @@ ), ctxt: #0, }, - value: Atom('type' type=static), + value: "type", }, tag: Type( TypeTag { @@ -201,7 +201,7 @@ ), ctxt: #0, }, - value: Atom('(!Array.|!Array.>|' type=dynamic), + value: "(!Array.|!Array.>|", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/undocumentedtag.debug b/crates/jsdoc/tests/fixtures/undocumentedtag.debug index 09065e46a9f9..dceb7d990942 100644 --- a/crates/jsdoc/tests/fixtures/undocumentedtag.debug +++ b/crates/jsdoc/tests/fixtures/undocumentedtag.debug @@ -19,8 +19,7 @@ ), ctxt: #0, }, - value: Atom('Undocumented doclet. - *' type=dynamic), + value: "Undocumented doclet.\n *", }, tags: [ TagItem { @@ -43,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('undocumented' type=dynamic), + value: "undocumented", }, tag: Unknown( UnknownTag { @@ -66,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/unrestrictedtag.debug b/crates/jsdoc/tests/fixtures/unrestrictedtag.debug index bec8f9fd7369..06051457e58f 100644 --- a/crates/jsdoc/tests/fixtures/unrestrictedtag.debug +++ b/crates/jsdoc/tests/fixtures/unrestrictedtag.debug @@ -19,9 +19,7 @@ ), ctxt: #0, }, - value: Atom('My class. - * - *' type=dynamic), + value: "My class.\n *\n *", }, tags: [ TagItem { @@ -44,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -68,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('* @unrestricted' type=dynamic), + value: "* @unrestricted", }, ), name: None, diff --git a/crates/jsdoc/tests/fixtures/utf8.debug b/crates/jsdoc/tests/fixtures/utf8.debug index 84502d324aaa..8115a4ef4a08 100644 --- a/crates/jsdoc/tests/fixtures/utf8.debug +++ b/crates/jsdoc/tests/fixtures/utf8.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -66,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('* @desc Τεκμηρίωση είναι η επικοινωνία!' type=dynamic), + value: "* @desc Τεκμηρίωση είναι η επικοινωνία!", }, ), name: None, diff --git a/crates/jsdoc/tests/fixtures/var.debug b/crates/jsdoc/tests/fixtures/var.debug index f7ad84b408cb..c7a2e7f9114c 100644 --- a/crates/jsdoc/tests/fixtures/var.debug +++ b/crates/jsdoc/tests/fixtures/var.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, @@ -43,7 +43,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, @@ -67,7 +67,7 @@ ), ctxt: #0, }, - value: Atom('document me' type=dynamic), + value: "document me", }, tags: [], }, diff --git a/crates/jsdoc/tests/fixtures/variations.debug b/crates/jsdoc/tests/fixtures/variations.debug index ba450b4eb0fd..04c470b4b155 100644 --- a/crates/jsdoc/tests/fixtures/variations.debug +++ b/crates/jsdoc/tests/fixtures/variations.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('namespace' type=static), + value: "namespace", }, tag: Namespace( NamespaceTag { @@ -66,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('anim' type=inline), + value: "anim", }, ), name: None, @@ -95,7 +95,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -118,7 +118,7 @@ ), ctxt: #0, }, - value: Atom('method' type=inline), + value: "method", }, tag: Function( FunctionTag { @@ -142,7 +142,7 @@ ), ctxt: #0, }, - value: Atom('anim.fadein(1)' type=dynamic), + value: "anim.fadein(1)", }, ), }, @@ -168,7 +168,7 @@ ), ctxt: #0, }, - value: Atom('desc' type=static), + value: "desc", }, tag: Description( DescriptionTag { @@ -191,7 +191,7 @@ ), ctxt: #0, }, - value: Atom('Show the nodelist elements by fading them to opaque.' type=dynamic), + value: "Show the nodelist elements by fading them to opaque.", }, }, ), @@ -216,7 +216,7 @@ ), ctxt: #0, }, - value: Atom('since' type=inline), + value: "since", }, tag: Since( SinceTag { @@ -239,7 +239,7 @@ ), ctxt: #0, }, - value: Atom('1.0' type=inline), + value: "1.0", }, }, ), @@ -264,7 +264,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -289,7 +289,7 @@ ), ctxt: #0, }, - value: Atom('{number}' type=dynamic), + value: "{number}", }, ), desc: Text { @@ -302,7 +302,7 @@ ), ctxt: #0, }, - value: Atom('[duration=400] How long the animation will run.' type=dynamic), + value: "[duration=400] How long the animation will run.", }, }, ), @@ -327,7 +327,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -352,7 +352,7 @@ ), ctxt: #0, }, - value: Atom('{function}' type=dynamic), + value: "{function}", }, ), desc: Text { @@ -365,7 +365,7 @@ ), ctxt: #0, }, - value: Atom('[callback] Called once the animation is complete.' type=dynamic), + value: "[callback] Called once the animation is complete.", }, }, ), @@ -390,7 +390,7 @@ ), ctxt: #0, }, - value: Atom('returns' type=inline), + value: "returns", }, tag: Return( ReturnTag { @@ -414,7 +414,7 @@ ), ctxt: #0, }, - value: Atom('{this}' type=inline), + value: "{this}", }, ), description: Text { @@ -427,7 +427,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -454,7 +454,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -477,7 +477,7 @@ ), ctxt: #0, }, - value: Atom('method' type=inline), + value: "method", }, tag: Function( FunctionTag { @@ -501,7 +501,7 @@ ), ctxt: #0, }, - value: Atom('anim.fadein(2)' type=dynamic), + value: "anim.fadein(2)", }, ), }, @@ -527,7 +527,7 @@ ), ctxt: #0, }, - value: Atom('desc' type=static), + value: "desc", }, tag: Description( DescriptionTag { @@ -550,7 +550,7 @@ ), ctxt: #0, }, - value: Atom('Show the nodelist elements by fading them to opaque.' type=dynamic), + value: "Show the nodelist elements by fading them to opaque.", }, }, ), @@ -575,7 +575,7 @@ ), ctxt: #0, }, - value: Atom('since' type=inline), + value: "since", }, tag: Since( SinceTag { @@ -598,7 +598,7 @@ ), ctxt: #0, }, - value: Atom('1.4.3' type=inline), + value: "1.4.3", }, }, ), @@ -623,7 +623,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -648,7 +648,7 @@ ), ctxt: #0, }, - value: Atom('{number}' type=dynamic), + value: "{number}", }, ), desc: Text { @@ -661,7 +661,7 @@ ), ctxt: #0, }, - value: Atom('[duration=400] How long the animation will run.' type=dynamic), + value: "[duration=400] How long the animation will run.", }, }, ), @@ -686,7 +686,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -711,7 +711,7 @@ ), ctxt: #0, }, - value: Atom('{string}' type=dynamic), + value: "{string}", }, ), desc: Text { @@ -724,7 +724,7 @@ ), ctxt: #0, }, - value: Atom('[easing=swing] The easing function for the transition.' type=dynamic), + value: "[easing=swing] The easing function for the transition.", }, }, ), @@ -749,7 +749,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -774,7 +774,7 @@ ), ctxt: #0, }, - value: Atom('{function}' type=dynamic), + value: "{function}", }, ), desc: Text { @@ -787,7 +787,7 @@ ), ctxt: #0, }, - value: Atom('[callback] Called once the animation is complete.' type=dynamic), + value: "[callback] Called once the animation is complete.", }, }, ), @@ -812,7 +812,7 @@ ), ctxt: #0, }, - value: Atom('returns' type=inline), + value: "returns", }, tag: Return( ReturnTag { @@ -836,7 +836,7 @@ ), ctxt: #0, }, - value: Atom('{this}' type=inline), + value: "{this}", }, ), description: Text { @@ -849,7 +849,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/variationtag.debug b/crates/jsdoc/tests/fixtures/variationtag.debug index 1a845407ff5b..0905ad6072c4 100644 --- a/crates/jsdoc/tests/fixtures/variationtag.debug +++ b/crates/jsdoc/tests/fixtures/variationtag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -82,7 +82,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -129,7 +129,7 @@ ), ctxt: #0, }, - value: Atom('* @variation 2' type=dynamic), + value: "* @variation 2", }, ), name: None, @@ -158,7 +158,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -181,7 +181,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -205,7 +205,7 @@ ), ctxt: #0, }, - value: Atom('* @variation (3)' type=dynamic), + value: "* @variation (3)", }, ), name: None, @@ -234,7 +234,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -257,7 +257,7 @@ ), ctxt: #0, }, - value: Atom('memberof' type=dynamic), + value: "memberof", }, tag: MemberOf( MemberOfTag { @@ -291,7 +291,7 @@ ), ctxt: #0, }, - value: Atom('someObject' type=dynamic), + value: "someObject", }, ], }, diff --git a/crates/jsdoc/tests/fixtures/versiontag.debug b/crates/jsdoc/tests/fixtures/versiontag.debug index daa41debd483..b8f979bed416 100644 --- a/crates/jsdoc/tests/fixtures/versiontag.debug +++ b/crates/jsdoc/tests/fixtures/versiontag.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('version' type=inline), + value: "version", }, tag: Version( VersionTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('1.2.3' type=inline), + value: "1.2.3", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/virtual.debug b/crates/jsdoc/tests/fixtures/virtual.debug index 9f07bd5afa9b..556fa960795a 100644 --- a/crates/jsdoc/tests/fixtures/virtual.debug +++ b/crates/jsdoc/tests/fixtures/virtual.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('name' type=static), + value: "name", }, tag: Name( NameTag { @@ -76,7 +76,7 @@ ), ctxt: #0, }, - value: Atom('dimensions' type=dynamic), + value: "dimensions", }, ], }, diff --git a/crates/jsdoc/tests/fixtures/virtual2.debug b/crates/jsdoc/tests/fixtures/virtual2.debug index 3b5fe8af6ccc..0d341fe6055b 100644 --- a/crates/jsdoc/tests/fixtures/virtual2.debug +++ b/crates/jsdoc/tests/fixtures/virtual2.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('lends' type=inline), + value: "lends", }, tag: Lends( LendsTag { @@ -76,7 +76,7 @@ ), ctxt: #0, }, - value: Atom('Person' type=inline), + value: "Person", }, ], }, @@ -105,7 +105,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -128,7 +128,7 @@ ), ctxt: #0, }, - value: Atom('constructs' type=dynamic), + value: "constructs", }, tag: Constructs( ConstructsTag { @@ -151,7 +151,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), @@ -178,9 +178,7 @@ ), ctxt: #0, }, - value: Atom('Callback for `say`. - * - *' type=dynamic), + value: "Callback for `say`.\n *\n *", }, tags: [ TagItem { @@ -203,7 +201,7 @@ ), ctxt: #0, }, - value: Atom('callback' type=dynamic), + value: "callback", }, tag: Callback( CallbackTag { @@ -237,7 +235,7 @@ ), ctxt: #0, }, - value: Atom('Person' type=inline), + value: "Person", }, ], }, @@ -266,9 +264,7 @@ ), ctxt: #0, }, - value: Atom('Speak a message asynchronously. - * - *' type=dynamic), + value: "Speak a message asynchronously.\n *\n *", }, tags: [ TagItem { @@ -291,7 +287,7 @@ ), ctxt: #0, }, - value: Atom('param' type=static), + value: "param", }, tag: Parameter( ParameterTag { @@ -316,7 +312,7 @@ ), ctxt: #0, }, - value: Atom('{Person~sayCallback}' type=dynamic), + value: "{Person~sayCallback}", }, ), desc: Text { @@ -329,7 +325,7 @@ ), ctxt: #0, }, - value: Atom('cb' type=inline), + value: "cb", }, }, ), diff --git a/crates/jsdoc/tests/fixtures/virtual3.debug b/crates/jsdoc/tests/fixtures/virtual3.debug index c31f29e5b5de..0eb501c7894c 100644 --- a/crates/jsdoc/tests/fixtures/virtual3.debug +++ b/crates/jsdoc/tests/fixtures/virtual3.debug @@ -19,7 +19,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -42,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('module' type=static), + value: "module", }, tag: Module( ModuleTag { @@ -65,7 +65,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, ty: Text { span: Span { @@ -77,7 +77,7 @@ ), ctxt: #0, }, - value: Atom('connection' type=dynamic), + value: "connection", }, }, ), @@ -104,7 +104,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, tags: [ TagItem { @@ -127,7 +127,7 @@ ), ctxt: #0, }, - value: Atom('constructor' type=static), + value: "constructor", }, tag: Class( ClassTag { @@ -151,7 +151,7 @@ ), ctxt: #0, }, - value: Atom('module:connection' type=dynamic), + value: "module:connection", }, ), name: None, diff --git a/crates/jsdoc/tests/fixtures/yieldstag.debug b/crates/jsdoc/tests/fixtures/yieldstag.debug index 6f5daf379674..0c33b8ae7bfc 100644 --- a/crates/jsdoc/tests/fixtures/yieldstag.debug +++ b/crates/jsdoc/tests/fixtures/yieldstag.debug @@ -19,9 +19,7 @@ ), ctxt: #0, }, - value: Atom('Generate the Fibonacci sequence of numbers. - * - *' type=dynamic), + value: "Generate the Fibonacci sequence of numbers.\n *\n *", }, tags: [ TagItem { @@ -44,7 +42,7 @@ ), ctxt: #0, }, - value: Atom('yields' type=inline), + value: "yields", }, tag: Yield( YieldTag { @@ -68,7 +66,7 @@ ), ctxt: #0, }, - value: Atom('{number}' type=dynamic), + value: "{number}", }, ), description: Text { @@ -81,7 +79,7 @@ ), ctxt: #0, }, - value: Atom('The next number in the Fibonacci sequence.' type=dynamic), + value: "The next number in the Fibonacci sequence.", }, }, ), @@ -108,9 +106,7 @@ ), ctxt: #0, }, - value: Atom('Generate the Fibonacci sequence of numbers. - * - *' type=dynamic), + value: "Generate the Fibonacci sequence of numbers.\n *\n *", }, tags: [ TagItem { @@ -133,7 +129,7 @@ ), ctxt: #0, }, - value: Atom('yields' type=inline), + value: "yields", }, tag: Yield( YieldTag { @@ -157,7 +153,7 @@ ), ctxt: #0, }, - value: Atom('The' type=inline), + value: "The", }, ), description: Text { @@ -170,7 +166,7 @@ ), ctxt: #0, }, - value: Atom('next number in the Fibonacci sequence.' type=dynamic), + value: "next number in the Fibonacci sequence.", }, }, ), @@ -197,9 +193,7 @@ ), ctxt: #0, }, - value: Atom('Generate the Fibonacci sequence of numbers. - * - *' type=dynamic), + value: "Generate the Fibonacci sequence of numbers.\n *\n *", }, tags: [ TagItem { @@ -222,7 +216,7 @@ ), ctxt: #0, }, - value: Atom('yields' type=inline), + value: "yields", }, tag: Yield( YieldTag { @@ -246,7 +240,7 @@ ), ctxt: #0, }, - value: Atom('{number}' type=dynamic), + value: "{number}", }, ), description: Text { @@ -259,7 +253,7 @@ ), ctxt: #0, }, - value: Atom('' type=static), + value: "", }, }, ), diff --git a/crates/swc/src/lib.rs b/crates/swc/src/lib.rs index 64bd9dc69725..26edea353344 100644 --- a/crates/swc/src/lib.rs +++ b/crates/swc/src/lib.rs @@ -106,6 +106,7 @@ //! See [swc_ecma_minifier::eval::Evaluator]. #![deny(unused)] #![allow(clippy::too_many_arguments)] +#![allow(clippy::mutable_key_type)] #![cfg_attr(docsrs, feature(doc_cfg))] pub extern crate swc_atoms as atoms; diff --git a/crates/swc_atoms/Cargo.toml b/crates/swc_atoms/Cargo.toml index 0e3606319b84..e2229942ce66 100644 --- a/crates/swc_atoms/Cargo.toml +++ b/crates/swc_atoms/Cargo.toml @@ -29,5 +29,6 @@ serde = "1" string_cache = "0.8.7" triomphe = "0.1.8" + [build-dependencies] string_cache_codegen = "0.5.2" diff --git a/crates/swc_atoms/build.rs b/crates/swc_atoms/build.rs index fca64c8c1301..7870949717ff 100644 --- a/crates/swc_atoms/build.rs +++ b/crates/swc_atoms/build.rs @@ -5,7 +5,7 @@ fn main() { .lines() .map(|l| l.trim()) .collect::>(); - gen("js_word", "JsWord", &strs); + gen("internal_word", "InternalWord", &strs); } fn gen(mac_name: &str, type_name: &str, atoms: &[&str]) { diff --git a/crates/swc_atoms/src/lib.rs b/crates/swc_atoms/src/lib.rs index 988cd8755f56..ce47de52184a 100644 --- a/crates/swc_atoms/src/lib.rs +++ b/crates/swc_atoms/src/lib.rs @@ -7,85 +7,60 @@ pub extern crate once_cell; use std::{ - borrow::{Borrow, Cow}, + borrow::Cow, fmt::{self, Display, Formatter}, hash::Hash, ops::Deref, rc::Rc, }; -use rustc_hash::FxHashSet; +use once_cell::sync::Lazy; use serde::Serializer; -use triomphe::{Arc, HeaderWithLength, ThinArc}; -include!(concat!(env!("OUT_DIR"), "/js_word.rs")); +pub use self::{atom as js_word, Atom as JsWord}; -/// An (optionally) interned string. +/// Clone-on-write string. /// -/// Use [AtomGenerator], [`Atom::new`] or `.into()` to create [Atom]s. -/// If you think the same value will be used multiple time, use [AtomGenerator]. -/// Othrwise, create an [Atom] using `.into()`. /// -/// # Comparison with [JsWord][] -/// -/// [JsWord][] is a globally interned string with phf support, while [Atom] is a -/// locally interened string. Global interning results in a less memory usage, -/// but global means a mutex. Because of the mutex, [Atom] performs better in -/// multi-thread environments. But due to lack of phf or global interning, -/// comparison and hashing of [Atom] is slower than them of [JsWord]. -/// -/// # Usages -/// -/// This should be used instead of [JsWord] for -/// -/// - Long texts, which is **not likely to be duplicated**. This does not mean -/// "longer than xx" as this is a type. -/// - Raw values. -#[derive(Clone)] +/// See [tendril] for more details. +#[derive(Clone, Default)] #[cfg_attr(feature = "rkyv-impl", derive(rkyv::bytecheck::CheckBytes))] #[cfg_attr(feature = "rkyv-impl", repr(C))] -pub struct Atom(ThinArc, u8>); +pub struct Atom(string_cache::Atom); -fn _assert_size() { - let _static_assert_size_eq = std::mem::transmute::; -} +/// Safety: We do not perform slicing of single [Atom] from multiple threads. +/// In other words, typically [Atom] is created in a single thread (and in the +/// parser code) and passed around. +unsafe impl Sync for Atom {} + +// fn _assert_size() { +// let _static_assert_size_eq = std::mem::transmute::; +// } impl Atom { - /// Creates a bad [Atom] from a string. - /// - /// This [Atom] is bad because it doesn't help reducing memory usage. - /// - /// # Note - /// - /// Although this is called `bad`, it's fine to use this if a string is - /// unlikely to be duplicated. - /// - /// e.g. Texts in template literals or comments are unlikely to benefit from - /// interning. + /// Creates a new [Atom] from a string. pub fn new(s: S) -> Self where - Arc: From, S: AsRef, { - let len = s.as_ref().as_bytes().len(); + Atom(s.as_ref().into()) + } - Self(ThinArc::from_header_and_slice( - HeaderWithLength::new((), len), - s.as_ref().as_bytes(), - )) + #[inline] + pub fn to_ascii_lowercase(&self) -> Self { + Self(self.0.to_ascii_lowercase()) } } +/// API wrappers for [tendril]. +impl Atom {} + impl Deref for Atom { type Target = str; #[inline] fn deref(&self) -> &Self::Target { - unsafe { - // Safety: We only consturct this type from valid str - - std::str::from_utf8_unchecked(&self.0.slice) - } + &self.0 } } @@ -131,32 +106,18 @@ impl_eq!(std::sync::Arc); impl_eq!(Rc); impl_eq!(Cow<'_, str>); impl_eq!(String); -impl_eq!(JsWord); impl_from!(&'_ str); impl_from_deref!(Box); -impl_from!(Arc); impl_from_deref!(Cow<'_, str>); impl_from!(String); -impl From for Atom { - fn from(v: JsWord) -> Self { - Self::new(&*v) - } -} - impl AsRef for Atom { fn as_ref(&self) -> &str { self } } -impl Borrow for Atom { - fn borrow(&self) -> &str { - self - } -} - impl fmt::Debug for Atom { fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { fmt::Debug::fmt(&**self, f) @@ -169,12 +130,6 @@ impl Display for Atom { } } -impl Default for Atom { - fn default() -> Self { - atom!("") - } -} - impl PartialOrd for Atom { fn partial_cmp(&self, other: &Self) -> Option { (**self).partial_cmp(&**other) @@ -189,12 +144,7 @@ impl Ord for Atom { impl PartialEq for Atom { fn eq(&self, other: &Self) -> bool { - // Fast path - if self.0.as_ptr() == other.0.as_ptr() { - return true; - } - - (**self).eq(&**other) + self.0 == other.0 } } @@ -202,34 +152,7 @@ impl Eq for Atom {} impl Hash for Atom { fn hash(&self, state: &mut H) { - (**self).hash(state) - } -} - -/// Generator for an interned strings. -/// -/// A lexer is expected to store this in it. -#[derive(Debug, Default, Clone)] -pub struct AtomGenerator { - inner: FxHashSet, -} - -impl AtomGenerator { - /// Get an interned [Atom] or create one from `s`. - pub fn intern(&mut self, s: S) -> Atom - where - Arc: From, - S: Eq + Hash, - S: AsRef, - { - if let Some(v) = self.inner.get(s.as_ref()).cloned() { - return v; - } - - let new = Atom::new(s); - - self.inner.insert(new.clone()); - new + self.0.hash(state) } } @@ -251,23 +174,24 @@ impl<'de> serde::de::Deserialize<'de> for Atom { } } -/// Creates an atom from a constant. +/// Creates an Atom from a constant. #[macro_export] macro_rules! atom { - ($s:literal) => {{ - static CACHE: $crate::once_cell::sync::Lazy<$crate::Atom> = - $crate::once_cell::sync::Lazy::new(|| $crate::Atom::new($s)); + ($s:tt) => {{ + static CACHE: $crate::CahcedAtom = $crate::CahcedAtom::new(|| $crate::Atom::new($s)); $crate::Atom::clone(&*CACHE) }}; } -#[test] -fn _assert() { - let mut g = AtomGenerator::default(); +/// Creates an Atom from a constant. +#[macro_export] +macro_rules! lazy_atom { + ($s:tt) => {{ + static CACHE: $crate::CahcedAtom = $crate::CahcedAtom::new(|| $crate::Atom::new($s)); - g.intern("str"); - g.intern(String::new()); + $crate::Atom::clone(&*CACHE) + }}; } impl PartialEq for str { @@ -309,111 +233,12 @@ where } } -/// NOT A PUBLIC API. -/// -/// This type exists to allow serializing [JsWord] using `rkyv`. -#[cfg(feature = "rkyv-impl")] -#[derive(Debug, Clone, Copy)] -#[cfg_attr(feature = "rkyv-impl", derive(rkyv::bytecheck::CheckBytes))] -#[cfg_attr(feature = "rkyv-impl", repr(C))] -pub struct EncodeJsWord; - -#[cfg(feature = "rkyv-impl")] -impl rkyv::with::ArchiveWith for EncodeJsWord { - type Archived = rkyv::Archived; - type Resolver = rkyv::Resolver; - - unsafe fn resolve_with( - field: &crate::JsWord, - pos: usize, - resolver: Self::Resolver, - out: *mut Self::Archived, - ) { - use rkyv::Archive; - - let s = field.to_string(); - s.resolve(pos, resolver, out); - } -} - -#[cfg(feature = "rkyv-impl")] -impl rkyv::with::SerializeWith for EncodeJsWord -where - S: ?Sized + rkyv::ser::Serializer, -{ - fn serialize_with( - field: &crate::JsWord, - serializer: &mut S, - ) -> Result { - rkyv::string::ArchivedString::serialize_from_str(field, serializer) - } -} - -#[cfg(feature = "rkyv-impl")] -impl rkyv::with::DeserializeWith, crate::JsWord, D> for EncodeJsWord -where - D: ?Sized + rkyv::Fallible, -{ - fn deserialize_with( - field: &rkyv::Archived, - deserializer: &mut D, - ) -> Result { - use rkyv::Deserialize; - - let s: String = field.deserialize(deserializer)?; - - Ok(s.into()) - } -} - -#[cfg(feature = "rkyv-impl")] -impl rkyv::with::ArchiveWith> for EncodeJsWord { - type Archived = rkyv::Archived>; - type Resolver = rkyv::Resolver>; - - unsafe fn resolve_with( - field: &Option, - pos: usize, - resolver: Self::Resolver, - out: *mut Self::Archived, - ) { - use rkyv::Archive; - - let s = field.as_ref().map(|s| s.to_string()); - s.resolve(pos, resolver, out); - } -} - -#[cfg(feature = "rkyv-impl")] -impl rkyv::with::SerializeWith, S> for EncodeJsWord -where - S: ?Sized + rkyv::ser::Serializer, -{ - fn serialize_with( - value: &Option, - serializer: &mut S, - ) -> Result { - value - .as_ref() - .map(|value| rkyv::string::ArchivedString::serialize_from_str(value, serializer)) - .transpose() - } -} - -#[cfg(feature = "rkyv-impl")] -impl rkyv::with::DeserializeWith>, Option, D> - for EncodeJsWord -where - D: ?Sized + rkyv::Fallible, -{ - fn deserialize_with( - field: &rkyv::Archived>, - deserializer: &mut D, - ) -> Result, D::Error> { - use rkyv::Deserialize; +#[doc(hidden)] +pub type CahcedAtom = Lazy; - let s: Option = field.deserialize(deserializer)?; +include!(concat!(env!("OUT_DIR"), "/internal_word.rs")); - Ok(s.map(|s| s.into())) - } -} +/// This should be used as a key for hash maps and hash sets. +/// +/// This will be replaced with [Atom] in the future. +pub type StaticString = String; diff --git a/crates/swc_bundler/examples/bundle.rs b/crates/swc_bundler/examples/bundle.rs index 8bbd9d6c0225..51b7ed544852 100644 --- a/crates/swc_bundler/examples/bundle.rs +++ b/crates/swc_bundler/examples/bundle.rs @@ -11,7 +11,6 @@ use std::{ }; use anyhow::Error; -use swc_atoms::js_word; use swc_bundler::{Bundle, Bundler, Load, ModuleData, ModuleRecord}; use swc_common::{ errors::{ColorConfig, Handler}, @@ -191,7 +190,7 @@ impl swc_bundler::Hook for Hook { Ok(vec![ KeyValueProp { - key: PropName::Ident(Ident::new(js_word!("url"), span)), + key: PropName::Ident(Ident::new("url".into(), span)), value: Box::new(Expr::Lit(Lit::Str(Str { span, raw: None, @@ -199,7 +198,7 @@ impl swc_bundler::Hook for Hook { }))), }, KeyValueProp { - key: PropName::Ident(Ident::new(js_word!("main"), span)), + key: PropName::Ident(Ident::new("main".into(), span)), value: Box::new(if module_record.is_entry { Expr::Member(MemberExpr { span, @@ -207,7 +206,7 @@ impl swc_bundler::Hook for Hook { span, kind: MetaPropKind::ImportMeta, })), - prop: MemberProp::Ident(Ident::new(js_word!("main"), span)), + prop: MemberProp::Ident(Ident::new("main".into(), span)), }) } else { Expr::Lit(Lit::Bool(Bool { span, value: false })) diff --git a/crates/swc_bundler/src/bundler/chunk/cjs.rs b/crates/swc_bundler/src/bundler/chunk/cjs.rs index 412d983890d3..3cece5037d6b 100644 --- a/crates/swc_bundler/src/bundler/chunk/cjs.rs +++ b/crates/swc_bundler/src/bundler/chunk/cjs.rs @@ -1,7 +1,6 @@ use std::{collections::HashMap, sync::atomic::Ordering}; use anyhow::Error; -use swc_atoms::js_word; use swc_common::{collections::AHashMap, Span, SyntaxContext, DUMMY_SP}; use swc_ecma_ast::{ModuleItem, *}; use swc_ecma_utils::{quote_ident, undefined, ExprFactory}; @@ -357,7 +356,7 @@ impl VisitMut for DefaultHandler { e.visit_mut_children_with(self); if let Expr::Ident(i) = e { - if i.sym == js_word!("default") { + if i.sym == "default" { *e = Expr::Member(MemberExpr { span: i.span, obj: Box::new(Expr::Ident(Ident::new( diff --git a/crates/swc_bundler/src/bundler/chunk/computed_key.rs b/crates/swc_bundler/src/bundler/chunk/computed_key.rs index 660d1140a3b4..5820b737bbe4 100644 --- a/crates/swc_bundler/src/bundler/chunk/computed_key.rs +++ b/crates/swc_bundler/src/bundler/chunk/computed_key.rs @@ -1,7 +1,6 @@ use std::mem::take; use anyhow::{bail, Error}; -use swc_atoms::js_word; use swc_common::{SyntaxContext, DUMMY_SP}; use swc_ecma_ast::*; use swc_ecma_utils::{contains_top_level_await, find_pat_ids, private_ident, ExprFactory}; @@ -239,10 +238,7 @@ impl Fold for ExportToReturn { let ident = expr.ident; let ident = ident.unwrap_or_else(|| private_ident!("_default_decl")); - self.export_key_value( - Ident::new(js_word!("default"), export.span), - ident.clone(), - ); + self.export_key_value(Ident::new("default".into(), export.span), ident.clone()); Some(Stmt::Decl(Decl::Class(ClassDecl { ident, @@ -254,10 +250,7 @@ impl Fold for ExportToReturn { let ident = expr.ident; let ident = ident.unwrap_or_else(|| private_ident!("_default_decl")); - self.export_key_value( - Ident::new(js_word!("default"), export.span), - ident.clone(), - ); + self.export_key_value(Ident::new("default".into(), export.span), ident.clone()); Some(Stmt::Decl(Decl::Fn(FnDecl { ident, diff --git a/crates/swc_bundler/src/bundler/chunk/merge.rs b/crates/swc_bundler/src/bundler/chunk/merge.rs index 281725d4b81c..9bf36776d8f0 100644 --- a/crates/swc_bundler/src/bundler/chunk/merge.rs +++ b/crates/swc_bundler/src/bundler/chunk/merge.rs @@ -3,7 +3,6 @@ use std::sync::atomic::Ordering; use anyhow::Error; use indexmap::IndexSet; use petgraph::EdgeDirection; -use swc_atoms::js_word; use swc_common::{ collections::{AHashMap, AHashSet, ARandomState}, sync::Lock, @@ -292,7 +291,7 @@ where let ids: Vec = find_pat_ids(decl); for id in ids { - if *id.sym() == js_word!("default") { + if *id.sym() == "default" { continue; } @@ -324,7 +323,7 @@ where let ids: Vec = find_pat_ids(decl); for id in ids { - if *id.sym() == js_word!("default") { + if *id.sym() == "default" { continue; } @@ -515,7 +514,7 @@ where } }; // Default is not exported via `export *` - if exported.sym == js_word!("default") { + if &*exported.sym == "default" { exported.span.ctxt == info.export_ctxt() } else { ctx.is_exported_ctxt(exported.span.ctxt, info.export_ctxt()) @@ -623,7 +622,7 @@ where }, ImportSpecifier::Default(s) => { new.push( - Ident::new(js_word!("default"), import.span) + Ident::new("default".into(), import.span) .assign_to(s.local.clone()) .into_module_item( injected_ctxt, @@ -671,7 +670,7 @@ where // create `const local_default = orig_ident` if original identifier exists. let local = - Ident::new(js_word!("default"), DUMMY_SP.with_ctxt(info.local_ctxt())); + Ident::new("default".into(), DUMMY_SP.with_ctxt(info.local_ctxt())); match export.decl { DefaultDecl::Class(c) => { @@ -747,7 +746,7 @@ where ); let exported = - Ident::new(js_word!("default"), DUMMY_SP.with_ctxt(info.export_ctxt())); + Ident::new("default".into(), DUMMY_SP.with_ctxt(info.export_ctxt())); new.push( local @@ -782,7 +781,7 @@ where // TODO: Check if we really need this. let local = - Ident::new(js_word!("default"), DUMMY_SP.with_ctxt(info.local_ctxt())); + Ident::new("default".into(), DUMMY_SP.with_ctxt(info.local_ctxt())); // Create `const local_default = expr` new.push( @@ -793,7 +792,7 @@ where ); let exported = - Ident::new(js_word!("default"), DUMMY_SP.with_ctxt(info.export_ctxt())); + Ident::new("default".into(), DUMMY_SP.with_ctxt(info.export_ctxt())); new.push( local @@ -1079,7 +1078,7 @@ where }) => { new.push( Ident::new( - js_word!("default"), + "default".into(), DUMMY_SP.with_ctxt(info.local_ctxt()), ) .clone() @@ -1240,7 +1239,7 @@ where .find(|s| s.0.src.value == import.src.value) { let imported = Ident::new( - js_word!("default"), + "default".into(), DUMMY_SP.with_ctxt(src.export_ctxt), ); vars.push(( diff --git a/crates/swc_bundler/src/bundler/export.rs b/crates/swc_bundler/src/bundler/export.rs index 7ca6ed497ad1..e397adceee82 100644 --- a/crates/swc_bundler/src/bundler/export.rs +++ b/crates/swc_bundler/src/bundler/export.rs @@ -1,5 +1,5 @@ use indexmap::IndexMap; -use swc_atoms::{js_word, JsWord}; +use swc_atoms::JsWord; use swc_common::{collections::ARandomState, FileName, SyntaxContext}; use swc_ecma_ast::*; use swc_ecma_utils::find_pat_ids; @@ -183,7 +183,7 @@ where .entry(None) .or_default() .push(Specifier::Specific { - local: Id::new(js_word!("default"), SyntaxContext::empty()), + local: Id::new("default".into(), SyntaxContext::empty()), alias: None, }); } @@ -194,7 +194,7 @@ where .entry(None) .or_default() .push(Specifier::Specific { - local: Id::new(js_word!("default"), SyntaxContext::empty()), + local: Id::new("default".into(), SyntaxContext::empty()), alias: None, }); } @@ -233,7 +233,7 @@ where ExportSpecifier::Default(d) => { v.push(Specifier::Specific { local: d.exported.clone().into(), - alias: Some(Id::new(js_word!("default"), SyntaxContext::empty())), + alias: Some(Id::new("default".into(), SyntaxContext::empty())), }); } ExportSpecifier::Named(n) => { diff --git a/crates/swc_bundler/src/bundler/finalize.rs b/crates/swc_bundler/src/bundler/finalize.rs index b5de94a39b3f..6e0d34716b63 100644 --- a/crates/swc_bundler/src/bundler/finalize.rs +++ b/crates/swc_bundler/src/bundler/finalize.rs @@ -2,7 +2,6 @@ use std::path::{Path, PathBuf}; use anyhow::Error; use relative_path::RelativePath; -use swc_atoms::js_word; use swc_common::{collections::AHashMap, util::move_map::MoveMap, FileName, Mark, DUMMY_SP}; use swc_ecma_ast::*; use swc_ecma_transforms_base::{ @@ -208,7 +207,7 @@ where props.push(PropOrSpread::Prop(Box::new(Prop::KeyValue( KeyValueProp { key: PropName::Ident(Ident::new( - js_word!("default"), + "default".into(), DUMMY_SP, )), value: Box::new(Expr::Ident(s.exported)), @@ -260,7 +259,7 @@ where props.push(PropOrSpread::Prop(Box::new(Prop::KeyValue( KeyValueProp { key: PropName::Ident(Ident::new( - js_word!("default"), + "default".into(), export.span, )), value: Box::new(Expr::Ident(ident.clone())), @@ -281,7 +280,7 @@ where props.push(PropOrSpread::Prop(Box::new(Prop::KeyValue( KeyValueProp { key: PropName::Ident(Ident::new( - js_word!("default"), + "default".into(), export.span, )), value: Box::new(Expr::Ident(ident.clone())), diff --git a/crates/swc_bundler/src/bundler/import/mod.rs b/crates/swc_bundler/src/bundler/import/mod.rs index be8ab29a2c47..d9d38bd6c610 100644 --- a/crates/swc_bundler/src/bundler/import/mod.rs +++ b/crates/swc_bundler/src/bundler/import/mod.rs @@ -1,5 +1,5 @@ use anyhow::{Context, Error}; -use swc_atoms::{js_word, JsWord}; +use swc_atoms::JsWord; use swc_common::{ collections::{AHashMap, AHashSet}, sync::Lrc, @@ -224,14 +224,7 @@ where match &mut e.callee { Callee::Expr(callee) - if self.bundler.config.require - && matches!( - &**callee, - Expr::Ident(Ident { - sym: js_word!("require"), - .. - }) - ) => + if self.bundler.config.require && callee.is_ident_ref_to("require") => { if self.bundler.is_external(&src.value) { return; @@ -267,7 +260,7 @@ where // // ExprOrSuper::Expr(ref e) => match &**e { // Expr::Ident(Ident { - // sym: js_word!("import"), + // sym: "import", // .. // }) => { // self.info.dynamic_imports.push(src.clone()); @@ -610,13 +603,7 @@ where ref args, .. }) if self.bundler.config.require - && matches!( - &**callee, - Expr::Ident(Ident { - sym: js_word!("require"), - .. - }) - ) + && callee.is_ident_ref_to("require") && args.len() == 1 => { let span = *span; diff --git a/crates/swc_bundler/src/bundler/keywords.rs b/crates/swc_bundler/src/bundler/keywords.rs index 4a0997fd2b36..7cb987821bb0 100644 --- a/crates/swc_bundler/src/bundler/keywords.rs +++ b/crates/swc_bundler/src/bundler/keywords.rs @@ -1,4 +1,3 @@ -use swc_atoms::js_word; use swc_common::{collections::AHashMap, util::take::Take}; use swc_ecma_ast::*; use swc_ecma_utils::private_ident; @@ -14,7 +13,7 @@ pub struct KeywordRenamer { impl KeywordRenamer { /// Returns `Some(new_ident)` if it should be renamed. fn renamed(&mut self, id: &Ident) -> Option { - if id.sym == js_word!("import") { + if id.sym == "import" { return None; } diff --git a/crates/swc_bundler/src/bundler/load.rs b/crates/swc_bundler/src/bundler/load.rs index a50f6d0f2b82..74cb31e593a6 100644 --- a/crates/swc_bundler/src/bundler/load.rs +++ b/crates/swc_bundler/src/bundler/load.rs @@ -4,7 +4,6 @@ use anyhow::{Context, Error}; use is_macro::Is; #[cfg(feature = "rayon")] use rayon::iter::ParallelIterator; -use swc_atoms::js_word; use swc_common::{sync::Lrc, FileName, SourceFile, SyntaxContext}; use swc_ecma_ast::{ CallExpr, Callee, Expr, Ident, ImportDecl, ImportSpecifier, MemberExpr, MemberProp, Module, @@ -364,7 +363,7 @@ where } ImportSpecifier::Default(s) => specifiers.push(Specifier::Specific { local: s.local.into(), - alias: Some(Id::new(js_word!("default"), s.span.ctxt())), + alias: Some(Id::new("default".into(), s.span.ctxt())), }), ImportSpecifier::Namespace(s) => { specifiers.push(Specifier::Namespace { @@ -432,11 +431,7 @@ impl Visit for Es6ModuleDetector { match &e.callee { Callee::Expr(e) => { - if let Expr::Ident(Ident { - sym: js_word!("require"), - .. - }) = &**e - { + if let Expr::Ident(Ident { sym: _require, .. }) = &**e { self.found_other = true; } } diff --git a/crates/swc_bundler/src/lib.rs b/crates/swc_bundler/src/lib.rs index e04c2be3ba50..c967819bf3e7 100644 --- a/crates/swc_bundler/src/lib.rs +++ b/crates/swc_bundler/src/lib.rs @@ -1,5 +1,6 @@ #![deny(clippy::all)] #![allow(unstable_name_collisions)] +#![allow(clippy::mutable_key_type)] pub use self::{ bundler::{Bundle, BundleKind, Bundler, Config, ModuleType}, diff --git a/crates/swc_bundler/src/modules/sort/stmt.rs b/crates/swc_bundler/src/modules/sort/stmt.rs index 47361bafbb80..086bb9cb4a87 100644 --- a/crates/swc_bundler/src/modules/sort/stmt.rs +++ b/crates/swc_bundler/src/modules/sort/stmt.rs @@ -2,7 +2,6 @@ use std::{collections::VecDeque, iter::from_fn, ops::Range}; use indexmap::IndexSet; use petgraph::EdgeDirection::{Incoming as Dependants, Outgoing as Dependencies}; -use swc_atoms::js_word; use swc_common::{ collections::{AHashMap, AHashSet, ARandomState}, sync::Lrc, @@ -389,11 +388,7 @@ impl Visit for FieldInitFinder { Callee::Super(_) | Callee::Import(_) => {} Callee::Expr(callee) => { if let Expr::Member(callee) = &**callee { - if let Expr::Ident(Ident { - sym: js_word!("Object"), - .. - }) = &*callee.obj - { + if callee.obj.is_ident_ref_to("Object") { match &callee.prop { MemberProp::Ident(Ident { sym: prop_sym, .. }) if *prop_sym == *"assign" => diff --git a/crates/swc_bundler/src/util.rs b/crates/swc_bundler/src/util.rs index a5853d6746ff..9ff36025e309 100644 --- a/crates/swc_bundler/src/util.rs +++ b/crates/swc_bundler/src/util.rs @@ -130,11 +130,7 @@ where #[cfg(not(feature = "concurrent"))] pub fn get(&self, k: &K) -> Option { - if let Some(v) = self.inner.borrow().get(k) { - Some(v.clone()) - } else { - None - } + self.inner.borrow().get(k).map(|v| v.clone()) } #[cfg(feature = "concurrent")] diff --git a/crates/swc_bundler/tests/deno.rs b/crates/swc_bundler/tests/deno.rs index ad593a30c783..ee9a8c56478a 100644 --- a/crates/swc_bundler/tests/deno.rs +++ b/crates/swc_bundler/tests/deno.rs @@ -7,7 +7,6 @@ use std::{collections::HashMap, fs::write, path::PathBuf, process::Command}; use anyhow::Error; use ntest::timeout; -use swc_atoms::js_word; use swc_bundler::{Bundler, Load, ModuleRecord}; use swc_common::{collections::AHashSet, errors::HANDLER, FileName, Mark, Span, GLOBALS}; use swc_ecma_ast::*; @@ -1113,7 +1112,7 @@ impl swc_bundler::Hook for Hook { Ok(vec![ KeyValueProp { - key: PropName::Ident(Ident::new(js_word!("url"), span)), + key: PropName::Ident(Ident::new("url".into(), span)), value: Box::new(Expr::Lit(Lit::Str(Str { span, raw: None, @@ -1121,7 +1120,7 @@ impl swc_bundler::Hook for Hook { }))), }, KeyValueProp { - key: PropName::Ident(Ident::new(js_word!("main"), span)), + key: PropName::Ident(Ident::new("main".into(), span)), value: Box::new(if module_record.is_entry { Expr::Member(MemberExpr { span, @@ -1129,7 +1128,7 @@ impl swc_bundler::Hook for Hook { span, kind: MetaPropKind::ImportMeta, })), - prop: MemberProp::Ident(Ident::new(js_word!("main"), span)), + prop: MemberProp::Ident(Ident::new("main".into(), span)), }) } else { Expr::Lit(Lit::Bool(Bool { span, value: false })) diff --git a/crates/swc_bundler/tests/fixture.rs b/crates/swc_bundler/tests/fixture.rs index ef753d32abfa..bd837a3cd060 100644 --- a/crates/swc_bundler/tests/fixture.rs +++ b/crates/swc_bundler/tests/fixture.rs @@ -7,7 +7,6 @@ use std::{ }; use anyhow::Error; -use swc_atoms::js_word; use swc_bundler::{BundleKind, Bundler, Config, ModuleRecord}; use swc_common::{errors::HANDLER, FileName, Globals, Span}; use swc_ecma_ast::{ @@ -152,7 +151,7 @@ impl swc_bundler::Hook for Hook { Ok(vec![ KeyValueProp { - key: PropName::Ident(Ident::new(js_word!("url"), span)), + key: PropName::Ident(Ident::new("url".into(), span)), value: Box::new(Expr::Lit(Lit::Str(Str { span, raw: None, @@ -160,7 +159,7 @@ impl swc_bundler::Hook for Hook { }))), }, KeyValueProp { - key: PropName::Ident(Ident::new(js_word!("main"), span)), + key: PropName::Ident(Ident::new("main".into(), span)), value: Box::new(if module_record.is_entry { Expr::Member(MemberExpr { span, @@ -168,7 +167,7 @@ impl swc_bundler::Hook for Hook { span, kind: MetaPropKind::ImportMeta, })), - prop: MemberProp::Ident(Ident::new(js_word!("main"), span)), + prop: MemberProp::Ident(Ident::new("main".into(), span)), }) } else { Expr::Lit(Lit::Bool(Bool { span, value: false })) diff --git a/crates/swc_core/src/lib.rs b/crates/swc_core/src/lib.rs index 503102ab2289..45ac390981be 100644 --- a/crates/swc_core/src/lib.rs +++ b/crates/swc_core/src/lib.rs @@ -1,5 +1,9 @@ #![cfg_attr(docsrs, feature(doc_cfg))] +#[cfg(feature = "swc_atoms")] +#[cfg_attr(docsrs, doc(cfg(feature = "swc_atoms")))] +pub use swc_atoms as atoms; + // Quote #[cfg(feature = "ecma_quote")] #[cfg_attr(docsrs, doc(cfg(feature = "ecma_quote")))] diff --git a/crates/swc_css_ast/src/at_rule.rs b/crates/swc_css_ast/src/at_rule.rs index 460ad0b50971..b575d0642cc0 100644 --- a/crates/swc_css_ast/src/at_rule.rs +++ b/crates/swc_css_ast/src/at_rule.rs @@ -858,7 +858,6 @@ pub enum SizeFeatureName { #[derive(Eq, Hash)] pub struct ExtensionName { pub span: Span, - #[cfg_attr(feature = "rkyv", with(swc_atoms::EncodeJsWord))] pub value: JsWord, pub raw: Option, } diff --git a/crates/swc_css_ast/src/base.rs b/crates/swc_css_ast/src/base.rs index 9aca4f1f9bd5..2693c5d827d1 100644 --- a/crates/swc_css_ast/src/base.rs +++ b/crates/swc_css_ast/src/base.rs @@ -119,6 +119,15 @@ impl PartialEq for FunctionName { } } +impl PartialEq<&'_ str> for FunctionName { + fn eq(&self, other: &&str) -> bool { + match self { + FunctionName::DashedIdent(v) => *v == **other, + FunctionName::Ident(v) => *v == **other, + } + } +} + impl PartialEq for FunctionName { fn eq(&self, other: &JsWord) -> bool { match self { diff --git a/crates/swc_css_ast/src/lib.rs b/crates/swc_css_ast/src/lib.rs index 8173f6d8dcf4..bcff5b8dcb7b 100644 --- a/crates/swc_css_ast/src/lib.rs +++ b/crates/swc_css_ast/src/lib.rs @@ -21,7 +21,7 @@ mod value; /// use swc_atoms::js_word; /// use swc_css_ast::*; /// -/// assert!(matches_eq_ignore_ascii_case!(JsWord::from("A"), js_word!("a"))); +/// assert!(matches_eq_ignore_ascii_case!(JsWord::from("A"), "a")); /// assert!(matches_eq_ignore_ascii_case!("A", "a")); /// ``` #[macro_export] @@ -44,7 +44,7 @@ macro_rules! matches_eq_ignore_ascii_case { /// use swc_atoms::js_word; /// use swc_css_ast::*; /// -/// assert!(matches_eq!(JsWord::from("a"), js_word!("a"))); +/// assert!(matches_eq!(JsWord::from("a"), "a")); /// assert!(matches_eq!("a", "a")); /// ``` #[macro_export] diff --git a/crates/swc_css_ast/src/selector.rs b/crates/swc_css_ast/src/selector.rs index 1d216ea6cf41..68f47b67d3c9 100644 --- a/crates/swc_css_ast/src/selector.rs +++ b/crates/swc_css_ast/src/selector.rs @@ -412,7 +412,7 @@ pub enum PseudoElementSelectorChildren { #[derive(Eq, Hash)] pub struct CustomHighlightName { pub span: Span, - #[cfg_attr(feature = "rkyv", with(swc_atoms::EncodeJsWord))] + pub value: JsWord, pub raw: Option, } diff --git a/crates/swc_css_ast/src/token.rs b/crates/swc_css_ast/src/token.rs index 45d9eff9cfaa..548622072e96 100644 --- a/crates/swc_css_ast/src/token.rs +++ b/crates/swc_css_ast/src/token.rs @@ -69,7 +69,7 @@ pub enum NumberType { pub struct DimensionToken { pub value: f64, pub raw_value: Atom, - #[cfg_attr(feature = "rkyv", with(swc_atoms::EncodeJsWord))] + pub unit: JsWord, #[cfg_attr(feature = "serde-impl", serde(rename = "type"))] @@ -95,30 +95,26 @@ pub struct DimensionToken { #[cfg_attr(feature = "serde-impl", derive(serde::Serialize, serde::Deserialize))] pub enum Token { Ident { - #[cfg_attr(feature = "rkyv", with(swc_atoms::EncodeJsWord))] value: JsWord, raw: Atom, }, Function { - #[cfg_attr(feature = "rkyv", with(swc_atoms::EncodeJsWord))] value: JsWord, raw: Atom, }, /// `@` AtKeyword { - #[cfg_attr(feature = "rkyv", with(swc_atoms::EncodeJsWord))] value: JsWord, raw: Atom, }, /// `#` Hash { is_id: bool, - #[cfg_attr(feature = "rkyv", with(swc_atoms::EncodeJsWord))] + value: JsWord, raw: Atom, }, String { - #[cfg_attr(feature = "rkyv", with(swc_atoms::EncodeJsWord))] value: JsWord, raw: Atom, }, @@ -127,7 +123,6 @@ pub enum Token { }, /// `url(value)` Url { - #[cfg_attr(feature = "rkyv", with(swc_atoms::EncodeJsWord))] value: JsWord, /// Name and value raw: Box, diff --git a/crates/swc_css_ast/src/value.rs b/crates/swc_css_ast/src/value.rs index aff8d67f604a..bfcfdfbf8a25 100644 --- a/crates/swc_css_ast/src/value.rs +++ b/crates/swc_css_ast/src/value.rs @@ -14,7 +14,7 @@ use crate::Function; #[derive(Eq, PartialOrd, Ord, Hash)] pub struct Ident { pub span: Span, - #[cfg_attr(feature = "rkyv", with(swc_atoms::EncodeJsWord))] + pub value: JsWord, pub raw: Option, } @@ -48,7 +48,7 @@ impl Take for Ident { #[derive(Eq, Hash)] pub struct CustomIdent { pub span: Span, - #[cfg_attr(feature = "rkyv", with(swc_atoms::EncodeJsWord))] + pub value: JsWord, pub raw: Option, } @@ -64,7 +64,7 @@ impl EqIgnoreSpan for CustomIdent { #[derive(Eq, Hash)] pub struct DashedIdent { pub span: Span, - #[cfg_attr(feature = "rkyv", with(swc_atoms::EncodeJsWord))] + pub value: JsWord, pub raw: Option, } @@ -87,7 +87,7 @@ impl PartialEq for DashedIdent { #[derive(Eq, Hash)] pub struct CustomPropertyName { pub span: Span, - #[cfg_attr(feature = "rkyv", with(swc_atoms::EncodeJsWord))] + pub value: JsWord, pub raw: Option, } @@ -103,7 +103,7 @@ impl EqIgnoreSpan for CustomPropertyName { #[derive(Eq, Hash)] pub struct Str { pub span: Span, - #[cfg_attr(feature = "rkyv", with(swc_atoms::EncodeJsWord))] + pub value: JsWord, pub raw: Option, } @@ -176,7 +176,6 @@ pub struct HexColor { /// Includes `#` pub span: Span, /// Does **not** include `#` - #[cfg_attr(feature = "rkyv", with(swc_atoms::EncodeJsWord))] pub value: JsWord, /// Does **not** include `#` pub raw: Option, @@ -443,7 +442,7 @@ pub enum UrlValue { #[derive(Eq, Hash, EqIgnoreSpan)] pub struct UrlValueRaw { pub span: Span, - #[cfg_attr(feature = "rkyv", with(swc_atoms::EncodeJsWord))] + pub value: JsWord, pub raw: Option, } @@ -461,9 +460,9 @@ pub enum UrlModifier { #[derive(Eq, Hash)] pub struct UnicodeRange { pub span: Span, - #[cfg_attr(feature = "rkyv", with(swc_atoms::EncodeJsWord))] + pub start: JsWord, - #[cfg_attr(feature = "rkyv", with(swc_atoms::EncodeJsWord))] + pub end: Option, pub raw: Option, } diff --git a/crates/swc_css_codegen/src/lib.rs b/crates/swc_css_codegen/src/lib.rs index dd4bf349ae20..6b0e7008e34a 100644 --- a/crates/swc_css_codegen/src/lib.rs +++ b/crates/swc_css_codegen/src/lib.rs @@ -6,7 +6,6 @@ pub use std::fmt::Result; use std::{borrow::Cow, str, str::from_utf8}; use serde::{Deserialize, Serialize}; -use swc_atoms::*; use swc_common::{BytePos, Span, Spanned, DUMMY_SP}; use swc_css_ast::*; use swc_css_codegen_macros::emitter; @@ -379,7 +378,7 @@ where self, AtRuleName::Ident(swc_css_ast::Ident { span: n.span, - value: js_word!("layer"), + value: "layer".into(), raw: None }) ) diff --git a/crates/swc_css_compat/src/compiler/color_alpha_parameter.rs b/crates/swc_css_compat/src/compiler/color_alpha_parameter.rs index a2af9c491316..3fbc7f9b99a7 100644 --- a/crates/swc_css_compat/src/compiler/color_alpha_parameter.rs +++ b/crates/swc_css_compat/src/compiler/color_alpha_parameter.rs @@ -1,4 +1,3 @@ -use swc_atoms::js_word; use swc_css_ast::{AbsoluteColorBase, ComponentValue, FunctionName}; use crate::compiler::Compiler; @@ -16,11 +15,11 @@ impl Compiler { } }; - if name.value == js_word!("rgb") { - name.value = js_word!("rgba"); + if name.value == "rgb" { + name.value = "rgba".into(); name.raw = None; - } else if name.value == js_word!("hsl") { - name.value = js_word!("hsla"); + } else if name.value == "hsl" { + name.value = "hsla".into(); name.raw = None; } } else { @@ -31,11 +30,11 @@ impl Compiler { } }; - if name.value == js_word!("rgba") { - name.value = js_word!("rgb"); + if name.value == "rgba" { + name.value = "rgb".into(); name.raw = None; - } else if name.value == js_word!("hsla") { - name.value = js_word!("hsl"); + } else if name.value == "hsla" { + name.value = "hsl".into(); name.raw = None; } } diff --git a/crates/swc_css_compat/src/compiler/color_hex_alpha.rs b/crates/swc_css_compat/src/compiler/color_hex_alpha.rs index 6cd80841dabb..6e66d3566015 100644 --- a/crates/swc_css_compat/src/compiler/color_hex_alpha.rs +++ b/crates/swc_css_compat/src/compiler/color_hex_alpha.rs @@ -1,4 +1,3 @@ -use swc_atoms::js_word; use swc_common::DUMMY_SP; use swc_css_ast::{ AbsoluteColorBase, AlphaValue, Color, ComponentValue, Delimiter, DelimiterValue, Function, @@ -45,7 +44,7 @@ impl Compiler { span: hex_color.span, name: FunctionName::Ident(Ident { span: DUMMY_SP, - value: js_word!("rgba"), + value: "rgba".into(), raw: None, }), value: vec![ diff --git a/crates/swc_css_compat/src/compiler/color_hwb.rs b/crates/swc_css_compat/src/compiler/color_hwb.rs index d5c95379e375..11fb582571be 100644 --- a/crates/swc_css_compat/src/compiler/color_hwb.rs +++ b/crates/swc_css_compat/src/compiler/color_hwb.rs @@ -1,4 +1,3 @@ -use swc_atoms::js_word; use swc_css_ast::{ AbsoluteColorBase, AlphaValue, Angle, ComponentValue, Delimiter, DelimiterValue, FunctionName, Hue, Ident, Number, Percentage, @@ -29,7 +28,7 @@ impl Compiler { Some(value) } Some(ComponentValue::Ident(box Ident { value, .. })) - if value.eq_ignore_ascii_case(&js_word!("none")) => + if value.eq_ignore_ascii_case("none") => { Some(0.0) } @@ -52,7 +51,7 @@ impl Compiler { Some(*value / 100.0) } Some(ComponentValue::Ident(box Ident { value, .. })) - if value.eq_ignore_ascii_case(&js_word!("none")) => + if value.eq_ignore_ascii_case("none") => { Some(0.0) } @@ -84,7 +83,7 @@ impl Compiler { Some(*value / 100.0) } Some(ComponentValue::Ident(box Ident { value, .. })) - if value.eq_ignore_ascii_case(&js_word!("none")) => + if value.eq_ignore_ascii_case("none") => { Some(0.0) } @@ -95,7 +94,7 @@ impl Compiler { pub(crate) fn process_color_hwb(&mut self, n: &mut AbsoluteColorBase) { if let AbsoluteColorBase::Function(function) = n { - if function.name != js_word!("hwb") { + if function.name != "hwb" { return; } @@ -121,7 +120,7 @@ impl Compiler { if a == 1.0 { *n = AbsoluteColorBase::Function(swc_css_ast::Function { name: FunctionName::Ident(Ident { - value: js_word!("rgb"), + value: "rgb".into(), span: Default::default(), raw: None, }), @@ -155,7 +154,7 @@ impl Compiler { } else { *n = AbsoluteColorBase::Function(swc_css_ast::Function { name: FunctionName::Ident(Ident { - value: js_word!("rgba"), + value: "rgba".into(), span: Default::default(), raw: None, }), diff --git a/crates/swc_css_compat/src/compiler/color_space_separated_parameters.rs b/crates/swc_css_compat/src/compiler/color_space_separated_parameters.rs index d5b46e44fb8f..03ce1f7e2ca5 100644 --- a/crates/swc_css_compat/src/compiler/color_space_separated_parameters.rs +++ b/crates/swc_css_compat/src/compiler/color_space_separated_parameters.rs @@ -1,6 +1,5 @@ use std::mem::take; -use swc_atoms::js_word; use swc_common::DUMMY_SP; use swc_css_ast::{matches_eq, AbsoluteColorBase, ComponentValue, Delimiter, DelimiterValue}; @@ -12,13 +11,7 @@ impl Compiler { n: &mut AbsoluteColorBase, ) { if let AbsoluteColorBase::Function(function) = n { - if !matches_eq!( - function.name, - js_word!("rgb"), - js_word!("rgba"), - js_word!("hsl"), - js_word!("hsla") - ) { + if !matches_eq!(function.name, "rgb", "rgba", "hsl", "hsla") { return; } diff --git a/crates/swc_css_compat/src/compiler/custom_media.rs b/crates/swc_css_compat/src/compiler/custom_media.rs index bb61097e811b..950bb8d464ec 100644 --- a/crates/swc_css_compat/src/compiler/custom_media.rs +++ b/crates/swc_css_compat/src/compiler/custom_media.rs @@ -1,6 +1,5 @@ use std::mem::take; -use swc_atoms::js_word; use swc_common::{util::take::Take, DUMMY_SP}; use swc_css_ast::{ AtRule, AtRuleName, AtRulePrelude, CustomMediaQuery, CustomMediaQueryMediaType, Ident, @@ -18,7 +17,7 @@ pub(super) struct CustomMediaHandler { impl CustomMediaHandler { pub(crate) fn store_custom_media(&mut self, n: &mut AtRule) { if let AtRuleName::Ident(name) = &n.name { - if name.value == js_word!("custom-media") { + if name.value == "custom-media" { if let Some(box AtRulePrelude::CustomMediaPrelude(prelude)) = &mut n.prelude { self.medias.push(prelude.take()); } @@ -29,7 +28,7 @@ impl CustomMediaHandler { pub(crate) fn process_rules(&mut self, n: &mut Vec) { n.retain(|n| match n { Rule::AtRule(n) => { - if matches!(&n.name, AtRuleName::Ident(ident) if ident.value == js_word!("custom-media")) { + if matches!(&n.name, AtRuleName::Ident(ident) if ident.value == "custom-media") { return false; } diff --git a/crates/swc_css_compat/src/compiler/legacy_rgb_and_hsl.rs b/crates/swc_css_compat/src/compiler/legacy_rgb_and_hsl.rs index d66cd68e86a9..decf4627af34 100644 --- a/crates/swc_css_compat/src/compiler/legacy_rgb_and_hsl.rs +++ b/crates/swc_css_compat/src/compiler/legacy_rgb_and_hsl.rs @@ -1,6 +1,5 @@ use std::f64::consts::PI; -use swc_atoms::js_word; use swc_css_ast::{ matches_eq, AbsoluteColorBase, AlphaValue, Angle, ComponentValue, Hue, Number, Percentage, }; @@ -11,8 +10,8 @@ use crate::compiler::Compiler; impl Compiler { pub(crate) fn process_rgb_and_hsl(&mut self, n: &mut AbsoluteColorBase) { if let AbsoluteColorBase::Function(function) = n { - let is_rgb = matches_eq!(function.name, js_word!("rgb"), js_word!("rgba")); - let is_hsl = matches_eq!(function.name, js_word!("hsl"), js_word!("hsla")); + let is_rgb = matches_eq!(function.name, "rgb", "rgba"); + let is_hsl = matches_eq!(function.name, "hsl", "hsla"); if is_rgb { function.value = function @@ -42,11 +41,11 @@ impl Compiler { unit, .. })) => { - let value = match unit.value.to_ascii_lowercase() { - js_word!("deg") => value, - js_word!("grad") => value * 180.0 / 200.0, - js_word!("rad") => value * 180.0 / PI, - js_word!("turn") => value * 360.0, + let value = match &*unit.value.to_ascii_lowercase() { + "deg" => value, + "grad" => value * 180.0 / 200.0, + "rad" => value * 180.0 / PI, + "turn" => value * 360.0, _ => { unreachable!(); } diff --git a/crates/swc_css_compat/src/compiler/media_query_ranges.rs b/crates/swc_css_compat/src/compiler/media_query_ranges.rs index 0044b7f8f1e4..416aa3f06b0f 100644 --- a/crates/swc_css_compat/src/compiler/media_query_ranges.rs +++ b/crates/swc_css_compat/src/compiler/media_query_ranges.rs @@ -1,4 +1,3 @@ -use swc_atoms::js_word; use swc_common::DUMMY_SP; use swc_css_ast::{ Dimension, Ident, MediaFeature, MediaFeatureName, MediaFeaturePlain, MediaFeatureRange, @@ -130,45 +129,45 @@ impl Compiler { } fn get_left_media_feature_name(&self, name: &Ident) -> Option { - let value = match name.value { - js_word!("width") => js_word!("min-width"), - js_word!("height") => js_word!("min-height"), - js_word!("device-width") => js_word!("min-device-width"), - js_word!("device-height") => js_word!("min-device-height"), - js_word!("aspect-ratio") => js_word!("min-aspect-ratio"), - js_word!("device-aspect-ratio") => js_word!("min-device-aspect-ratio"), - js_word!("color") => js_word!("min-color"), - js_word!("color-index") => js_word!("min-color-index"), - js_word!("monochrome") => js_word!("min-monochrome"), - js_word!("resolution") => js_word!("min-resolution"), + let value = match &*name.value { + "width" => "min-width", + "height" => "min-height", + "device-width" => "min-device-width", + "device-height" => "min-device-height", + "aspect-ratio" => "min-aspect-ratio", + "device-aspect-ratio" => "min-device-aspect-ratio", + "color" => "min-color", + "color-index" => "min-color-index", + "monochrome" => "min-monochrome", + "resolution" => "min-resolution", _ => return None, }; Some(MediaFeatureName::Ident(Ident { span: DUMMY_SP, - value, + value: value.into(), raw: None, })) } fn get_right_media_feature_name(&self, name: &Ident) -> Option { - let value = match name.value { - js_word!("width") => js_word!("max-width"), - js_word!("height") => js_word!("max-height"), - js_word!("device-width") => js_word!("max-device-width"), - js_word!("device-height") => js_word!("max-device-height"), - js_word!("aspect-ratio") => js_word!("max-aspect-ratio"), - js_word!("device-aspect-ratio") => js_word!("max-device-aspect-ratio"), - js_word!("color") => js_word!("max-color"), - js_word!("color-index") => js_word!("max-color-index"), - js_word!("monochrome") => js_word!("max-monochrome"), - js_word!("resolution") => js_word!("max-resolution"), + let value = match &*name.value { + "width" => "max-width", + "height" => "max-height", + "device-width" => "max-device-width", + "device-height" => "max-device-height", + "aspect-ratio" => "max-aspect-ratio", + "device-aspect-ratio" => "max-device-aspect-ratio", + "color" => "max-color", + "color-index" => "max-color-index", + "monochrome" => "max-monochrome", + "resolution" => "max-resolution", _ => return None, }; Some(MediaFeatureName::Ident(Ident { span: DUMMY_SP, - value, + value: value.into(), raw: None, })) } diff --git a/crates/swc_css_compat/src/compiler/selector_not.rs b/crates/swc_css_compat/src/compiler/selector_not.rs index 5b99b97681d8..3560d89a114b 100644 --- a/crates/swc_css_compat/src/compiler/selector_not.rs +++ b/crates/swc_css_compat/src/compiler/selector_not.rs @@ -1,4 +1,3 @@ -use swc_atoms::js_word; use swc_css_ast::{ CompoundSelector, PseudoClassSelector, PseudoClassSelectorChildren, SelectorList, SubclassSelector, @@ -8,7 +7,7 @@ use crate::compiler::Compiler; impl Compiler { pub(crate) fn process_selector_not(&mut self, n: &mut CompoundSelector) { - let has_not = n.subclass_selectors.iter().any(|n| matches!(n, SubclassSelector::PseudoClass(PseudoClassSelector { name, children: Some(children), ..}) if name.value == js_word!("not") + let has_not = n.subclass_selectors.iter().any(|n| matches!(n, SubclassSelector::PseudoClass(PseudoClassSelector { name, children: Some(children), ..}) if name.value == "not" && matches!(children.get(0), Some(PseudoClassSelectorChildren::SelectorList(selector_list)) if selector_list.children.len() > 1))); if !has_not { @@ -24,7 +23,7 @@ impl Compiler { name, children: Some(children), .. - }) if name.value == js_word!("not") + }) if name.value == "not" && matches!(children.get(0), Some(PseudoClassSelectorChildren::SelectorList(selector_list)) if selector_list.children.len() > 1) => { if let Some(PseudoClassSelectorChildren::SelectorList(selector_list)) = diff --git a/crates/swc_css_lints/src/rules/custom_property_no_missing_var_function.rs b/crates/swc_css_lints/src/rules/custom_property_no_missing_var_function.rs index e6023bee14f0..abe0c1a61f5e 100644 --- a/crates/swc_css_lints/src/rules/custom_property_no_missing_var_function.rs +++ b/crates/swc_css_lints/src/rules/custom_property_no_missing_var_function.rs @@ -1,4 +1,3 @@ -use swc_atoms::js_word; use swc_css_ast::*; use swc_css_visit::{Visit, VisitWith}; @@ -38,7 +37,7 @@ impl Visit for CustomPropertyNoMissingVarFunction { } fn visit_function(&mut self, function: &Function) { - self.in_var_function.push(function.name == js_word!("var")); + self.in_var_function.push(function.name == *"var"); function.visit_children_with(self); self.in_var_function.pop(); } diff --git a/crates/swc_css_lints/src/rules/font_family_no_duplicate_names.rs b/crates/swc_css_lints/src/rules/font_family_no_duplicate_names.rs index a7ebf0838756..3ab1f736b5a8 100644 --- a/crates/swc_css_lints/src/rules/font_family_no_duplicate_names.rs +++ b/crates/swc_css_lints/src/rules/font_family_no_duplicate_names.rs @@ -98,13 +98,11 @@ impl Visit for FontFamilyNoDuplicateNames { fn visit_declaration(&mut self, declaration: &Declaration) { match &declaration.name { DeclarationName::Ident(Ident { value, .. }) - if value.eq_str_ignore_ascii_case("font-family") => + if value.eq_ignore_ascii_case("font-family") => { self.check_component_values(&declaration.value); } - DeclarationName::Ident(Ident { value, .. }) - if value.eq_str_ignore_ascii_case("font") => - { + DeclarationName::Ident(Ident { value, .. }) if value.eq_ignore_ascii_case("font") => { let index = declaration .value .iter() diff --git a/crates/swc_css_minifier/src/compressor/angle.rs b/crates/swc_css_minifier/src/compressor/angle.rs index db32240a6529..7033571624b8 100644 --- a/crates/swc_css_minifier/src/compressor/angle.rs +++ b/crates/swc_css_minifier/src/compressor/angle.rs @@ -1,4 +1,3 @@ -use swc_atoms::js_word; use swc_css_ast::*; use swc_css_utils::angle_to_deg; @@ -52,7 +51,7 @@ impl Compressor { angle.unit = Ident { span: angle.unit.span, - value: js_word!("deg"), + value: "deg".into(), raw: None, }; } diff --git a/crates/swc_css_minifier/src/compressor/calc_sum.rs b/crates/swc_css_minifier/src/compressor/calc_sum.rs index af2555c58083..a60e7142033b 100644 --- a/crates/swc_css_minifier/src/compressor/calc_sum.rs +++ b/crates/swc_css_minifier/src/compressor/calc_sum.rs @@ -1,4 +1,4 @@ -use swc_atoms::{js_word, JsWord}; +use swc_atoms::Atom; use swc_common::{collections::AHashMap, Span}; use swc_css_ast::*; @@ -315,7 +315,7 @@ fn simplify_calc_operator_node_sum(nodes: &[CalcNode]) -> CalcNode { // combine numbers, combine percentages, combine px values, etc.) let mut number: Option = None; let mut percentage: Option = None; - let mut dimensions: AHashMap = AHashMap::default(); + let mut dimensions: AHashMap = AHashMap::default(); let mut idx = 0; while idx < nodes.len() { match &nodes[idx] { @@ -333,7 +333,7 @@ fn simplify_calc_operator_node_sum(nodes: &[CalcNode]) -> CalcNode { } CalcNode::Dimension(d) => { let unit = get_dimension_unit_lowercase(d); - match &dimensions.get(&unit) { + match &dimensions.get(&*unit) { Some(prev_idx) => { if try_to_sum_nodes(&mut nodes, **prev_idx, idx) { nodes.remove(idx); @@ -342,7 +342,7 @@ fn simplify_calc_operator_node_sum(nodes: &[CalcNode]) -> CalcNode { } } None => { - dimensions.insert(unit, idx); + dimensions.insert(unit.to_string(), idx); idx += 1; } } @@ -441,7 +441,7 @@ fn try_to_switch_sign_of_nodes(nodes: &[CalcNode]) -> Option { } fn try_to_reduce_node_with_dimensions( - dimensions: &mut AHashMap, + dimensions: &mut AHashMap, nodes: &mut Vec, ) { try_to_reduce_node_with_absolute_lengths(dimensions, nodes); @@ -452,13 +452,10 @@ fn try_to_reduce_node_with_dimensions( // https://www.w3.org/TR/css-values-4/#absolute-lengths fn try_to_reduce_node_with_absolute_lengths( - dimensions: &mut AHashMap, + dimensions: &mut AHashMap, nodes: &mut Vec, ) { - if let (Some(idx_cm), Some(idx_mm)) = ( - dimensions.get(&js_word!("cm")), - dimensions.get(&js_word!("mm")), - ) { + if let (Some(idx_cm), Some(idx_mm)) = (dimensions.get("cm"), dimensions.get("mm")) { let value_cm = get_value(&nodes[*idx_cm]); let value_mm = get_value(&nodes[*idx_mm]); if let Some(result) = try_to_sum_values(value_cm, value_mm, Some(10.0)) { @@ -467,10 +464,7 @@ fn try_to_reduce_node_with_absolute_lengths( } } - if let (Some(idx_mm), Some(idx_q)) = ( - dimensions.get(&js_word!("mm")), - dimensions.get(&js_word!("q")), - ) { + if let (Some(idx_mm), Some(idx_q)) = (dimensions.get("mm"), dimensions.get("q")) { let value_mm = get_value(&nodes[*idx_mm]); let value_q = get_value(&nodes[*idx_q]); if let Some(result) = try_to_sum_values(value_mm, value_q, Some(4.0)) { @@ -479,10 +473,7 @@ fn try_to_reduce_node_with_absolute_lengths( } } - if let (Some(idx_cm), Some(idx_q)) = ( - dimensions.get(&js_word!("cm")), - dimensions.get(&js_word!("q")), - ) { + if let (Some(idx_cm), Some(idx_q)) = (dimensions.get("cm"), dimensions.get("q")) { let value_cm = get_value(&nodes[*idx_cm]); let value_q = get_value(&nodes[*idx_q]); if let Some(result) = try_to_sum_values(value_cm, value_q, Some(40.0)) { @@ -491,10 +482,7 @@ fn try_to_reduce_node_with_absolute_lengths( } } - if let (Some(idx_in), Some(idx_px)) = ( - dimensions.get(&js_word!("in")), - dimensions.get(&js_word!("px")), - ) { + if let (Some(idx_in), Some(idx_px)) = (dimensions.get("in"), dimensions.get("px")) { let value_in = get_value(&nodes[*idx_in]); let value_px = get_value(&nodes[*idx_px]); if let Some(result) = try_to_sum_values(value_in, value_px, Some(96.0)) { @@ -503,10 +491,7 @@ fn try_to_reduce_node_with_absolute_lengths( } } - if let (Some(idx_in), Some(idx_pc)) = ( - dimensions.get(&js_word!("in")), - dimensions.get(&js_word!("pc")), - ) { + if let (Some(idx_in), Some(idx_pc)) = (dimensions.get("in"), dimensions.get("pc")) { let value_in = get_value(&nodes[*idx_in]); let value_pc = get_value(&nodes[*idx_pc]); if let Some(result) = try_to_sum_values(value_in, value_pc, Some(6.0)) { @@ -515,10 +500,7 @@ fn try_to_reduce_node_with_absolute_lengths( } } - if let (Some(idx_pc), Some(idx_pt)) = ( - dimensions.get(&js_word!("pc")), - dimensions.get(&js_word!("pt")), - ) { + if let (Some(idx_pc), Some(idx_pt)) = (dimensions.get("pc"), dimensions.get("pt")) { let value_pc = get_value(&nodes[*idx_pc]); let value_pt = get_value(&nodes[*idx_pt]); if let Some(result) = try_to_sum_values(value_pc, value_pt, Some(12.0)) { @@ -527,10 +509,7 @@ fn try_to_reduce_node_with_absolute_lengths( } } - if let (Some(idx_pc), Some(idx_px)) = ( - dimensions.get(&js_word!("pc")), - dimensions.get(&js_word!("px")), - ) { + if let (Some(idx_pc), Some(idx_px)) = (dimensions.get("pc"), dimensions.get("px")) { let value_pc = get_value(&nodes[*idx_pc]); let value_px = get_value(&nodes[*idx_px]); if let Some(result) = try_to_sum_values(value_pc, value_px, Some(16.0)) { @@ -542,51 +521,42 @@ fn try_to_reduce_node_with_absolute_lengths( // https://www.w3.org/TR/css-values-4/#time fn try_to_reduce_node_with_durations( - dimensions: &mut AHashMap, + dimensions: &mut AHashMap, nodes: &mut Vec, ) { - if let (Some(idx_ms), Some(idx_s)) = ( - dimensions.get(&js_word!("ms")), - dimensions.get(&js_word!("s")), - ) { + if let (Some(idx_ms), Some(idx_s)) = (dimensions.get("ms"), dimensions.get("s")) { let value_ms = get_value(&nodes[*idx_ms]); let value_s = get_value(&nodes[*idx_s]); if let Some(result) = try_to_sum_values(value_s, value_ms, Some(1000.0)) { set_value(&mut nodes[*idx_ms], result); nodes.remove(*idx_s); - dimensions.remove(&js_word!("s")); + dimensions.remove("s"); } } } // https://www.w3.org/TR/css-values-4/#frequency fn try_to_reduce_node_with_frequencies( - dimensions: &mut AHashMap, + dimensions: &mut AHashMap, nodes: &mut Vec, ) { - if let (Some(idx_hz), Some(idx_khz)) = ( - dimensions.get(&js_word!("hz")), - dimensions.get(&js_word!("khz")), - ) { + if let (Some(idx_hz), Some(idx_khz)) = (dimensions.get("hz"), dimensions.get("khz")) { let value_hz = get_value(&nodes[*idx_hz]); let value_khz = get_value(&nodes[*idx_khz]); if let Some(result) = try_to_sum_values(value_khz, value_hz, Some(1000.0)) { set_value(&mut nodes[*idx_hz], result); nodes.remove(*idx_khz); - dimensions.remove(&js_word!("khz")); + dimensions.remove("khz"); } } } // https://www.w3.org/TR/css-values-4/#resolution fn try_to_reduce_node_with_resolutions( - dimensions: &mut AHashMap, + dimensions: &mut AHashMap, nodes: &mut Vec, ) { - match ( - dimensions.get(&js_word!("dppx")), - dimensions.get(&js_word!("x")), - ) { + match (dimensions.get("dppx"), dimensions.get("x")) { // "x" is an alias for "dppx" (Some(idx_dppx), Some(idx_x)) => { let value_dppx = get_value(&nodes[*idx_dppx]); @@ -594,43 +564,37 @@ fn try_to_reduce_node_with_resolutions( if let Some(result) = try_to_sum_values(value_x, value_dppx, None) { set_value(&mut nodes[*idx_x], result); nodes.remove(*idx_dppx); - dimensions.remove(&js_word!("dppx")); + dimensions.remove("dppx"); } } (Some(idx_dppx), None) => { // rename "dppx" into "x" if let CalcNode::Dimension(Dimension::Resolution(r)) = &mut nodes[*idx_dppx] { - r.unit.value = js_word!("x"); - dimensions.insert(js_word!("x"), *idx_dppx); - dimensions.remove(&js_word!("dppx")); + r.unit.value = "x".into(); + dimensions.insert("x".into(), *idx_dppx); + dimensions.remove("dppx"); } } _ => {} } - if let (Some(idx_x), Some(idx_dpi)) = ( - dimensions.get(&js_word!("x")), - dimensions.get(&js_word!("dpi")), - ) { + if let (Some(idx_x), Some(idx_dpi)) = (dimensions.get("x"), dimensions.get("dpi")) { let value_x = get_value(&nodes[*idx_x]); let value_dpi = get_value(&nodes[*idx_dpi]); if let Some(result) = try_to_sum_values(value_x, value_dpi, Some(96.0)) { set_value(&mut nodes[*idx_dpi], result); nodes.remove(*idx_x); - dimensions.remove(&js_word!("x")); + dimensions.remove("x"); } } - if let (Some(idx_dpcm), Some(idx_dpi)) = ( - dimensions.get(&js_word!("dpcm")), - dimensions.get(&js_word!("dpi")), - ) { + if let (Some(idx_dpcm), Some(idx_dpi)) = (dimensions.get("dpcm"), dimensions.get("dpi")) { let value_dpcm = get_value(&nodes[*idx_dpcm]); let value_dpi = get_value(&nodes[*idx_dpi]); if let Some(result) = try_to_sum_values(value_dpcm, value_dpi, Some(2.54)) { set_value(&mut nodes[*idx_dpi], result); nodes.remove(*idx_dpcm); - dimensions.remove(&js_word!("dpcm")); + dimensions.remove("dpcm"); } } } @@ -1144,7 +1108,7 @@ fn sort_calculations_children(nodes: &[CalcNode]) -> Vec { ret } -fn get_dimension_unit_lowercase(d: &Dimension) -> JsWord { +fn get_dimension_unit_lowercase(d: &Dimension) -> Atom { match d { Dimension::Length(l) => l.unit.value.to_ascii_lowercase(), Dimension::Angle(a) => a.unit.value.to_ascii_lowercase(), diff --git a/crates/swc_css_minifier/src/compressor/color.rs b/crates/swc_css_minifier/src/compressor/color.rs index 75c5c3672863..d9caa8e614c4 100644 --- a/crates/swc_css_minifier/src/compressor/color.rs +++ b/crates/swc_css_minifier/src/compressor/color.rs @@ -1,4 +1,4 @@ -use swc_atoms::{js_word, JsWord}; +use swc_atoms::JsWord; use swc_common::DUMMY_SP; use swc_css_ast::*; use swc_css_utils::{angle_to_deg, hsl_to_rgb, hwb_to_rgb, to_rgb255, NAMED_COLORS}; @@ -121,7 +121,7 @@ macro_rules! make_color { span: $span, name: FunctionName::Ident(Ident { span: DUMMY_SP, - value: js_word!("rgba"), + value: "rgba".into(), raw: None, }), value: vec![ @@ -247,7 +247,7 @@ impl Compressor { Some(*value / 100.0) } Some(ComponentValue::Ident(box Ident { value, .. })) - if value.eq_ignore_ascii_case(&js_word!("none")) => + if value.eq_ignore_ascii_case("none") => { Some(0.0) } @@ -277,7 +277,7 @@ impl Compressor { Some(value) } Some(ComponentValue::Ident(box Ident { value, .. })) - if value.eq_ignore_ascii_case(&js_word!("none")) => + if value.eq_ignore_ascii_case("none") => { Some(0.0) } @@ -300,7 +300,7 @@ impl Compressor { Some(*value / 100.0) } Some(ComponentValue::Ident(box Ident { value, .. })) - if value.eq_ignore_ascii_case(&js_word!("none")) => + if value.eq_ignore_ascii_case("none") => { Some(0.0) } @@ -335,7 +335,7 @@ impl Compressor { Some((2.55 * *value).round()) } Some(ComponentValue::Ident(box Ident { value, .. })) - if value.eq_ignore_ascii_case(&js_word!("none")) => + if value.eq_ignore_ascii_case("none") => { Some(0.0) } @@ -351,12 +351,12 @@ impl Compressor { value, span, .. - })) => match value.to_ascii_lowercase() { - js_word!("transparent") => { + })) => match &*value.to_ascii_lowercase() { + "transparent" => { *color = make_color!(*span, 0.0_f64, 0.0_f64, 0.0_f64, 0.0_f64); } name => { - if let Some(value) = NAMED_COLORS.get(&name) { + if let Some(value) = NAMED_COLORS.get(name) { *color = make_color!( *span, value.rgb[0] as f64, @@ -387,7 +387,7 @@ impl Compressor { name, value, .. - })) if name == &js_word!("rgb") || name == &js_word!("rgba") => { + })) if name == "rgb" || name == "rgba" => { let rgba: Vec<_> = value .iter() .filter(|n| { @@ -425,7 +425,7 @@ impl Compressor { name, value, .. - })) if name == &js_word!("hsl") || name == &js_word!("hsla") => { + })) if name == "hsl" || name == "hsla" => { let hsla: Vec<_> = value .iter() .filter(|n| { @@ -465,7 +465,7 @@ impl Compressor { name, value, .. - })) if name == &js_word!("hwb") => { + })) if name == "hwb" => { let h = match self.get_hue(value.get(0).as_ref()) { Some(value) => value, _ => return, diff --git a/crates/swc_css_minifier/src/compressor/declaration.rs b/crates/swc_css_minifier/src/compressor/declaration.rs index 7ab2f5862bb2..aa77e08b7476 100644 --- a/crates/swc_css_minifier/src/compressor/declaration.rs +++ b/crates/swc_css_minifier/src/compressor/declaration.rs @@ -1,4 +1,3 @@ -use swc_atoms::js_word; use swc_common::{util::take::Take, Span, DUMMY_SP}; use swc_css_ast::*; @@ -7,8 +6,8 @@ use super::Compressor; impl Compressor { pub(super) fn compress_declaration(&self, declaration: &mut Declaration) { if let DeclarationName::Ident(Ident { value: name, .. }) = &declaration.name { - match *name { - js_word!("display") if declaration.value.len() > 1 => { + match &**name { + "display" if declaration.value.len() > 1 => { let mut outside = None; let mut inside = None; let mut list_item = None; @@ -17,10 +16,7 @@ impl Compressor { match value { outside_node @ ComponentValue::Ident(box Ident { value, .. }) if matches_eq_ignore_ascii_case!( - value, - js_word!("block"), - js_word!("inline"), - js_word!("run-in") + value, "block", "inline", "run-in" ) => { outside = Some(outside_node); @@ -28,26 +24,22 @@ impl Compressor { inside_node @ ComponentValue::Ident(box Ident { value, .. }) if matches_eq_ignore_ascii_case!( value, - js_word!("flow"), - js_word!("flow-root"), - js_word!("table"), - js_word!("flex"), - js_word!("grid"), - js_word!("ruby") + "flow", + "flow-root", + "table", + "flex", + "grid", + "ruby" ) => { inside = Some(inside_node); } list_item_node @ ComponentValue::Ident(box Ident { value, .. }) - if value.eq_ignore_ascii_case(&js_word!("list-item")) => + if value.eq_ignore_ascii_case("list-item") => { if let Some(ComponentValue::Ident(box Ident { value, .. })) = inside { - if !matches_eq_ignore_ascii_case!( - value, - js_word!("flow"), - js_word!("flow-root") - ) { + if !matches_eq_ignore_ascii_case!(value, "flow", "flow-root") { continue; } } @@ -69,7 +61,7 @@ impl Compressor { .. })), None, - ) if inside_value.eq_ignore_ascii_case(&js_word!("flow")) => { + ) if inside_value.eq_ignore_ascii_case("flow") => { declaration.value = vec![outside.clone()]; } // `block flow-root` -> `flow-root` @@ -85,8 +77,8 @@ impl Compressor { }), ), None, - ) if outside_value.eq_ignore_ascii_case(&js_word!("block")) - && inside_value.eq_ignore_ascii_case(&js_word!("flow-root")) => + ) if outside_value.eq_ignore_ascii_case("block") + && inside_value.eq_ignore_ascii_case("flow-root") => { declaration.value = vec![inside.clone()]; } @@ -102,12 +94,12 @@ impl Compressor { .. })), None, - ) if outside_value.eq_ignore_ascii_case(&js_word!("inline")) - && inside_value.eq_ignore_ascii_case(&js_word!("flow-root")) => + ) if outside_value.eq_ignore_ascii_case("inline") + && inside_value.eq_ignore_ascii_case("flow-root") => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("inline-block"), + value: "inline-block".into(), raw: None, }))]; } @@ -122,8 +114,8 @@ impl Compressor { .. })), Some(list_item), - ) if outside_value.eq_ignore_ascii_case(&js_word!("block")) - && inside_value.eq_ignore_ascii_case(&js_word!("flow")) => + ) if outside_value.eq_ignore_ascii_case("block") + && inside_value.eq_ignore_ascii_case("flow") => { declaration.value = vec![list_item.clone()]; } @@ -135,7 +127,7 @@ impl Compressor { })), None, Some(list_item), - ) if outside_value.eq_ignore_ascii_case(&js_word!("block")) => { + ) if outside_value.eq_ignore_ascii_case("block") => { declaration.value = vec![list_item.clone()]; } // `flow list-item` -> `list-item` @@ -146,7 +138,7 @@ impl Compressor { .. })), Some(list_item), - ) if inside_value.eq_ignore_ascii_case(&js_word!("flow")) => { + ) if inside_value.eq_ignore_ascii_case("flow") => { declaration.value = vec![list_item.clone()]; } // `inline flow list-item` -> `inline list-item` @@ -162,8 +154,8 @@ impl Compressor { .. })), Some(list_item), - ) if outside_value.eq_ignore_ascii_case(&js_word!("inline")) - && inside_value.eq_ignore_ascii_case(&js_word!("flow")) => + ) if outside_value.eq_ignore_ascii_case("inline") + && inside_value.eq_ignore_ascii_case("flow") => { declaration.value = vec![outside.clone(), list_item.clone()]; } @@ -182,12 +174,12 @@ impl Compressor { }), ), None, - ) if outside_value.eq_ignore_ascii_case(&js_word!("block")) + ) if outside_value.eq_ignore_ascii_case("block") && matches_eq_ignore_ascii_case!( inside_value, - js_word!("flex"), - js_word!("grid"), - js_word!("table") + "flex", + "grid", + "table" ) => { declaration.value = vec![inside.clone()]; @@ -205,8 +197,8 @@ impl Compressor { }), ), None, - ) if outside_value.eq_ignore_ascii_case(&js_word!("inline")) - && inside_value.eq_ignore_ascii_case(&js_word!("ruby")) => + ) if outside_value.eq_ignore_ascii_case("inline") + && inside_value.eq_ignore_ascii_case("ruby") => { declaration.value = vec![inside.clone()]; } @@ -215,16 +207,16 @@ impl Compressor { } // TODO handle `auto` // TODO compress numbers too - js_word!("padding") - | js_word!("margin") - | js_word!("border-width") - | js_word!("inset") - | js_word!("scroll-margin") - | js_word!("scroll-padding") - | js_word!("mask-border-outset") - | js_word!("border-image-width") - | js_word!("border-image-outset") - | js_word!("border-image-slice") + "padding" + | "margin" + | "border-width" + | "inset" + | "scroll-margin" + | "scroll-padding" + | "mask-border-outset" + | "border-image-width" + | "border-image-outset" + | "border-image-slice" if declaration.value.len() > 1 => { let top = declaration.value.get(0); @@ -259,27 +251,27 @@ impl Compressor { } } } - js_word!("padding-inline") - | js_word!("padding-block") - | js_word!("margin-inline") - | js_word!("margin-block") - | js_word!("margin-inline") - | js_word!("inset-inline") - | js_word!("inset-block") - | js_word!("border-inline-width") - | js_word!("border-block-width") - | js_word!("scroll-padding-inline") - | js_word!("scroll-padding-block") - | js_word!("scroll-margin-inline") - | js_word!("scroll-margin-block") - | js_word!("border-top-left-radius") - | js_word!("border-top-right-radius") - | js_word!("border-bottom-right-radius") - | js_word!("border-bottom-left-radius") - | js_word!("border-start-start-radius") - | js_word!("border-start-end-radius") - | js_word!("border-end-start-radius") - | js_word!("border-end-end-radius") + "padding-inline" + | "padding-block" + | "margin-inline" + | "margin-block" + | "margin-inline" + | "inset-inline" + | "inset-block" + | "border-inline-width" + | "border-block-width" + | "scroll-padding-inline" + | "scroll-padding-block" + | "scroll-margin-inline" + | "scroll-margin-block" + | "border-top-left-radius" + | "border-top-right-radius" + | "border-bottom-right-radius" + | "border-bottom-left-radius" + | "border-start-start-radius" + | "border-start-end-radius" + | "border-end-start-radius" + | "border-end-end-radius" if declaration.value.len() == 2 => { let first = declaration.value.get(0); @@ -291,7 +283,7 @@ impl Compressor { declaration.value.remove(1); } } - js_word!("border-style") if declaration.value.len() > 1 => { + "border-style" if declaration.value.len() > 1 => { let top = declaration.value.get(0); let right = declaration .value @@ -324,9 +316,7 @@ impl Compressor { } } } - js_word!("border-spacing") | js_word!("border-image-repeat") - if declaration.value.len() == 2 => - { + "border-spacing" | "border-image-repeat" if declaration.value.len() == 2 => { let first = declaration.value.get(0); let second = declaration.value.get(1); @@ -334,14 +324,14 @@ impl Compressor { declaration.value.remove(1); } } - js_word!("font-weight") => { + "font-weight" => { declaration.value = declaration .value .take() .into_iter() .map(|node| match node { ComponentValue::Ident(box Ident { value, span, .. }) - if value.eq_ignore_ascii_case(&js_word!("normal")) => + if value.eq_ignore_ascii_case("normal") => { ComponentValue::Integer(Box::new(Integer { span, @@ -350,7 +340,7 @@ impl Compressor { })) } ComponentValue::Ident(box Ident { value, span, .. }) - if value.eq_ignore_ascii_case(&js_word!("bold")) => + if value.eq_ignore_ascii_case("bold") => { ComponentValue::Integer(Box::new(Integer { span, @@ -362,9 +352,7 @@ impl Compressor { }) .collect(); } - js_word!("background-repeat") - | js_word!("mask-repeat") - | js_word!("-webkit-mask-repeat") + "background-repeat" | "mask-repeat" | "-webkit-mask-repeat" if declaration.value.len() == 2 => { let first = declaration.value.get(0); @@ -383,42 +371,42 @@ impl Compressor { ) = (first, second) { match ( - first_value.to_ascii_lowercase(), - second_value.to_ascii_lowercase(), + &*first_value.to_ascii_lowercase(), + &*second_value.to_ascii_lowercase(), ) { - (js_word!("repeat"), js_word!("no-repeat")) => { + ("repeat", "no-repeat") => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("repeat-x"), + value: "repeat-x".into(), raw: None, }))]; } - (js_word!("no-repeat"), js_word!("repeat")) => { + ("no-repeat", "repeat") => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("repeat-y"), + value: "repeat-y".into(), raw: None, }))]; } - (js_word!("repeat"), js_word!("repeat")) - | (js_word!("space"), js_word!("space")) - | (js_word!("round"), js_word!("round")) - | (js_word!("no-repeat"), js_word!("no-repeat")) => { + ("repeat", "repeat") + | ("space", "space") + | ("round", "round") + | ("no-repeat", "no-repeat") => { declaration.value.remove(1); } _ => {} } } } - js_word!("border-image-repeat") - | js_word!("mask-border-repeat") - | js_word!("-webkit-mask-box-image-repeat") - | js_word!("overscroll-behavior") - | js_word!("scroll-snap-align") - | js_word!("overflow") - | js_word!("place-self") - | js_word!("place-items") - | js_word!("place-content") + "border-image-repeat" + | "mask-border-repeat" + | "-webkit-mask-box-image-repeat" + | "overscroll-behavior" + | "scroll-snap-align" + | "overflow" + | "place-self" + | "place-items" + | "place-content" if declaration.value.len() == 2 => { let first = declaration.value.get(0); @@ -428,13 +416,13 @@ impl Compressor { declaration.value.remove(1); } } - js_word!("animation") if !declaration.value.is_empty() => { + "animation" if !declaration.value.is_empty() => { let first = declaration.value.get(0).cloned(); if let Some(ComponentValue::Str(ident)) = first { declaration.value.remove(0); match &*ident.value.to_ascii_lowercase() { _ if crate::is_css_wide_keyword(&ident.value) - || ident.value.eq_ignore_ascii_case(&js_word!("none")) => + || ident.value.eq_ignore_ascii_case("none") => { declaration.value.insert(0, ComponentValue::Str(ident)); } @@ -459,7 +447,7 @@ impl Compressor { } } } - js_word!("animation-name") => { + "animation-name" => { declaration.value = declaration .value .take() @@ -469,7 +457,7 @@ impl Compressor { let value = ident.value.to_ascii_lowercase(); match &*value { _ if crate::is_css_wide_keyword(&ident.value) - || ident.value.eq_ignore_ascii_case(&js_word!("none")) => + || ident.value.eq_ignore_ascii_case("none") => { node } @@ -500,7 +488,7 @@ impl Compressor { let is_initial = if let Some(ComponentValue::Ident(box Ident { value, span, .. })) = declaration.value.get(0) { - if value.eq_ignore_ascii_case(&js_word!("initial")) { + if value.eq_ignore_ascii_case("initial") { Some(span) } else { None @@ -613,231 +601,231 @@ impl Compressor { return; }; - match *name { - js_word!("accent-color") - | js_word!("align-self") - | js_word!("animation-timeline") - | js_word!("aspect-ratio") - | js_word!("block-size") - | js_word!("bottom") - | js_word!("break-after") - | js_word!("break-before") - | js_word!("break-inside") - | js_word!("caret-color") - | js_word!("caret-shape") - | js_word!("clip") - | js_word!("column-count") - | js_word!("column-width") - | js_word!("cursor") - | js_word!("flex-basis") - | js_word!("font-kerning") - | js_word!("font-optical-sizing") - | js_word!("forced-color-adjust") - | js_word!("grid-auto-columns") - | js_word!("grid-auto-rows") - | js_word!("grid-column-end") - | js_word!("grid-column-start") - | js_word!("grid-row-end") - | js_word!("grid-row-start") - | js_word!("height") - | js_word!("hyphenate-character") - | js_word!("image-rendering") - | js_word!("ime-mode") - | js_word!("initial-letter-align") - | js_word!("inline-size") - | js_word!("input-security") - | js_word!("inset") - | js_word!("inset-block") - | js_word!("inset-block-end") - | js_word!("inset-block-start") - | js_word!("inset-inline") - | js_word!("inset-inline-end") - | js_word!("inset-inline-start") - | js_word!("isolation") - | js_word!("justify-self") - | js_word!("left") - | js_word!("line-break") - | js_word!("mask-border-width") - | js_word!("mask-size") - | js_word!("min-height") - | js_word!("min-width") - | js_word!("offset-anchor") - | js_word!("offset-position") - | js_word!("offset-rotate") - | js_word!("overflow-anchor") - | js_word!("overflow-block") - | js_word!("overflow-inline") - | js_word!("overscroll-behavior") - | js_word!("overscroll-behavior-block") - | js_word!("overscroll-behavior-inline") - | js_word!("overscroll-behavior-x") - | js_word!("overscroll-behavior-y") - | js_word!("page-break-after") - | js_word!("page-break-before") - | js_word!("page-break-inside") - | js_word!("pointer-events") - | js_word!("right") - | js_word!("scrollbar-color") - | js_word!("scrollbar-gutter") - | js_word!("scrollbar-width") - | js_word!("scroll-behavior") - | js_word!("scroll-padding") - | js_word!("scroll-padding-block") - | js_word!("scroll-padding-block-start") - | js_word!("scroll-padding-block-end") - | js_word!("scroll-padding-bottom") - | js_word!("scroll-padding-inline") - | js_word!("scroll-padding-inline-start") - | js_word!("scroll-padding-inline-end") - | js_word!("scroll-padding-left") - | js_word!("scroll-padding-right") - | js_word!("scroll-padding-top") - | js_word!("table-layout") - | js_word!("text-align-last") - | js_word!("text-decoration-skip-ink") - | js_word!("text-decoration-thickness") - | js_word!("text-justify") - | js_word!("text-rendering") - | js_word!("text-underline-offset") - | js_word!("text-underline-position") - | js_word!("top") - | js_word!("touch-action") - | js_word!("user-select") - | js_word!("width") - | js_word!("will-change") - | js_word!("z-index") => { + match &**name { + "accent-color" + | "align-self" + | "animation-timeline" + | "aspect-ratio" + | "block-size" + | "bottom" + | "break-after" + | "break-before" + | "break-inside" + | "caret-color" + | "caret-shape" + | "clip" + | "column-count" + | "column-width" + | "cursor" + | "flex-basis" + | "font-kerning" + | "font-optical-sizing" + | "forced-color-adjust" + | "grid-auto-columns" + | "grid-auto-rows" + | "grid-column-end" + | "grid-column-start" + | "grid-row-end" + | "grid-row-start" + | "height" + | "hyphenate-character" + | "image-rendering" + | "ime-mode" + | "initial-letter-align" + | "inline-size" + | "input-security" + | "inset" + | "inset-block" + | "inset-block-end" + | "inset-block-start" + | "inset-inline" + | "inset-inline-end" + | "inset-inline-start" + | "isolation" + | "justify-self" + | "left" + | "line-break" + | "mask-border-width" + | "mask-size" + | "min-height" + | "min-width" + | "offset-anchor" + | "offset-position" + | "offset-rotate" + | "overflow-anchor" + | "overflow-block" + | "overflow-inline" + | "overscroll-behavior" + | "overscroll-behavior-block" + | "overscroll-behavior-inline" + | "overscroll-behavior-x" + | "overscroll-behavior-y" + | "page-break-after" + | "page-break-before" + | "page-break-inside" + | "pointer-events" + | "right" + | "scrollbar-color" + | "scrollbar-gutter" + | "scrollbar-width" + | "scroll-behavior" + | "scroll-padding" + | "scroll-padding-block" + | "scroll-padding-block-start" + | "scroll-padding-block-end" + | "scroll-padding-bottom" + | "scroll-padding-inline" + | "scroll-padding-inline-start" + | "scroll-padding-inline-end" + | "scroll-padding-left" + | "scroll-padding-right" + | "scroll-padding-top" + | "table-layout" + | "text-align-last" + | "text-decoration-skip-ink" + | "text-decoration-thickness" + | "text-justify" + | "text-rendering" + | "text-underline-offset" + | "text-underline-position" + | "top" + | "touch-action" + | "user-select" + | "width" + | "will-change" + | "z-index" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("auto"), + value: "auto".into(), raw: None, }))]; } - js_word!("-webkit-line-clamp") - | js_word!("animation-fill-mode") - | js_word!("animation-name") - | js_word!("appearance") - | js_word!("backdrop-filter") - | js_word!("background-image") - | js_word!("border-block-style") - | js_word!("border-block-end-style") - | js_word!("border-block-start-style") - | js_word!("border-bottom-style") - | js_word!("border-image-source") - | js_word!("border-inline-style") - | js_word!("border-inline-end-style") - | js_word!("border-inline-start-style") - | js_word!("border-left-style") - | js_word!("border-right-style") - | js_word!("border-top-style") - | js_word!("box-shadow") - | js_word!("clear") - | js_word!("clip-path") - | js_word!("column-rule-style") - | js_word!("column-span") - | js_word!("contain") - | js_word!("contain-intrinsic-block-size") - | js_word!("contain-intrinsic-height") - | js_word!("contain-intrinsic-inline-size") - | js_word!("contain-intrinsic-width") - | js_word!("counter-increment") - | js_word!("counter-reset") - | js_word!("counter-set") - | js_word!("filter") - | js_word!("float") - | js_word!("font-size-adjust") - | js_word!("grid-template-areas") - | js_word!("grid-template-columns") - | js_word!("grid-template-rows") - | js_word!("hanging-punctuation") - | js_word!("line-clamp") - | js_word!("list-style-image") - | js_word!("margin-trim") - | js_word!("mask-border-source") - | js_word!("mask-image") - | js_word!("max-block-size") - | js_word!("max-height") - | js_word!("max-inline-size") - | js_word!("max-lines") - | js_word!("max-width") - | js_word!("offset-path") - | js_word!("outline-style") - | js_word!("perspective") - | js_word!("resize") - | js_word!("rotate") - | js_word!("scale") - | js_word!("scroll-snap-align") - | js_word!("scroll-snap-coordinate") - | js_word!("scroll-snap-points-x") - | js_word!("scroll-snap-points-y") - | js_word!("scroll-snap-type") - | js_word!("scroll-snap-type-x") - | js_word!("scroll-snap-type-y") - | js_word!("scroll-timeline-name") - | js_word!("shape-outside") - | js_word!("text-combine-upright") - | js_word!("text-decoration-line") - | js_word!("text-emphasis-style") - | js_word!("text-shadow") - | js_word!("text-transform") - | js_word!("transform") - | js_word!("translate") => { + "-webkit-line-clamp" + | "animation-fill-mode" + | "animation-name" + | "appearance" + | "backdrop-filter" + | "background-image" + | "border-block-style" + | "border-block-end-style" + | "border-block-start-style" + | "border-bottom-style" + | "border-image-source" + | "border-inline-style" + | "border-inline-end-style" + | "border-inline-start-style" + | "border-left-style" + | "border-right-style" + | "border-top-style" + | "box-shadow" + | "clear" + | "clip-path" + | "column-rule-style" + | "column-span" + | "contain" + | "contain-intrinsic-block-size" + | "contain-intrinsic-height" + | "contain-intrinsic-inline-size" + | "contain-intrinsic-width" + | "counter-increment" + | "counter-reset" + | "counter-set" + | "filter" + | "float" + | "font-size-adjust" + | "grid-template-areas" + | "grid-template-columns" + | "grid-template-rows" + | "hanging-punctuation" + | "line-clamp" + | "list-style-image" + | "margin-trim" + | "mask-border-source" + | "mask-image" + | "max-block-size" + | "max-height" + | "max-inline-size" + | "max-lines" + | "max-width" + | "offset-path" + | "outline-style" + | "perspective" + | "resize" + | "rotate" + | "scale" + | "scroll-snap-align" + | "scroll-snap-coordinate" + | "scroll-snap-points-x" + | "scroll-snap-points-y" + | "scroll-snap-type" + | "scroll-snap-type-x" + | "scroll-snap-type-y" + | "scroll-timeline-name" + | "shape-outside" + | "text-combine-upright" + | "text-decoration-line" + | "text-emphasis-style" + | "text-shadow" + | "text-transform" + | "transform" + | "translate" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("none"), + value: "none".into(), raw: None, }))]; } - js_word!("align-content") - | js_word!("align-items") - | js_word!("align-tracks") - | js_word!("animation-direction") - | js_word!("background-blend-mode") - | js_word!("color-scheme") - | js_word!("column-gap") - | js_word!("content") - | js_word!("font-feature-settings") - | js_word!("font-language-override") - | js_word!("font-variation-settings") - | js_word!("font-stretch") - | js_word!("font-style") - | js_word!("font-variant") - | js_word!("font-variant-alternates") - | js_word!("font-variant-caps") - | js_word!("font-variant-east-asian") - | js_word!("font-variant-ligatures") - | js_word!("font-variant-numeric") - | js_word!("font-variant-position") - | js_word!("font-weight") - | js_word!("initial-letter") - | js_word!("justify-content") - | js_word!("justify-tracks") - | js_word!("letter-spacing") - | js_word!("line-height") - | js_word!("math-shift") - | js_word!("math-style") - | js_word!("mix-blend-mode") - | js_word!("overflow-wrap") - | js_word!("paint-order") - | js_word!("place-content") - | js_word!("row-gap") - | js_word!("scroll-snap-stop") - | js_word!("unicode-bidi") - | js_word!("white-space") - | js_word!("word-break") - | js_word!("word-spacing") - | js_word!("word-wrap") - | js_word!("grid-row-gap") - | js_word!("grid-column-gap") => { + "align-content" + | "align-items" + | "align-tracks" + | "animation-direction" + | "background-blend-mode" + | "color-scheme" + | "column-gap" + | "content" + | "font-feature-settings" + | "font-language-override" + | "font-variation-settings" + | "font-stretch" + | "font-style" + | "font-variant" + | "font-variant-alternates" + | "font-variant-caps" + | "font-variant-east-asian" + | "font-variant-ligatures" + | "font-variant-numeric" + | "font-variant-position" + | "font-weight" + | "initial-letter" + | "justify-content" + | "justify-tracks" + | "letter-spacing" + | "line-height" + | "math-shift" + | "math-style" + | "mix-blend-mode" + | "overflow-wrap" + | "paint-order" + | "place-content" + | "row-gap" + | "scroll-snap-stop" + | "unicode-bidi" + | "white-space" + | "word-break" + | "word-spacing" + | "word-wrap" + | "grid-row-gap" + | "grid-column-gap" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("normal"), + value: "normal".into(), raw: None, }))]; } - js_word!("animation-delay") - | js_word!("animation-duration") - | js_word!("transition-delay") - | js_word!("transition-duration") => { + "animation-delay" + | "animation-duration" + | "transition-delay" + | "transition-duration" => { declaration.value = vec![ComponentValue::Dimension(Box::new(Dimension::Time(Time { span, @@ -848,12 +836,12 @@ impl Compressor { }, unit: Ident { span: DUMMY_SP, - value: js_word!("s"), + value: "s".into(), raw: None, }, })))]; } - js_word!("shape-image-threshold") | js_word!("opacity") => { + "shape-image-threshold" | "opacity" => { declaration.value = vec![ComponentValue::AlphaValue(Box::new(AlphaValue::Number( Number { span, @@ -862,35 +850,35 @@ impl Compressor { }, )))]; } - js_word!("animation-iteration-count") => { + "animation-iteration-count" => { declaration.value = vec![ComponentValue::Number(Box::new(Number { span, value: 1.0, raw: None, }))]; } - js_word!("animation-timing-function") | js_word!("transition-timing-function") => { + "animation-timing-function" | "transition-timing-function" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("ease"), + value: "ease".into(), raw: None, }))]; } - js_word!("azimuth") | js_word!("mask-position") => { + "azimuth" | "mask-position" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("center"), + value: "center".into(), raw: None, }))]; } - js_word!("background-attachment") => { + "background-attachment" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("scroll"), + value: "scroll".into(), raw: None, }))]; } - js_word!("background-position") => { + "background-position" => { declaration.value = vec![ ComponentValue::Percentage(Box::new(Percentage { span, @@ -910,7 +898,7 @@ impl Compressor { })), ]; } - js_word!("background-position-x") | js_word!("background-position-y") => { + "background-position-x" | "background-position-y" => { declaration.value = vec![ComponentValue::Percentage(Box::new(Percentage { span, value: Number { @@ -920,49 +908,49 @@ impl Compressor { }, }))]; } - js_word!("background-repeat") | js_word!("mask-repeat") => { + "background-repeat" | "mask-repeat" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("repeat"), + value: "repeat".into(), raw: None, }))]; } - js_word!("block-overflow") => { + "block-overflow" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("clip"), + value: "clip".into(), raw: None, }))]; } - js_word!("border-block-width") - | js_word!("border-block-end-width") - | js_word!("border-block-start-width") - | js_word!("border-bottom-width") - | js_word!("border-inline-width") - | js_word!("border-inline-end-width") - | js_word!("border-inline-start-width") - | js_word!("border-left-width") - | js_word!("border-right-width") - | js_word!("border-top-width") - | js_word!("column-rule-width") - | js_word!("font-size") - | js_word!("outline-width") => { + "border-block-width" + | "border-block-end-width" + | "border-block-start-width" + | "border-bottom-width" + | "border-inline-width" + | "border-inline-end-width" + | "border-inline-start-width" + | "border-left-width" + | "border-right-width" + | "border-top-width" + | "column-rule-width" + | "font-size" + | "outline-width" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("medium"), + value: "medium".into(), raw: None, }))]; } - js_word!("border-top-left-radius") - | js_word!("border-top-right-radius") - | js_word!("border-start-end-radius") - | js_word!("border-start-start-radius") - | js_word!("border-bottom-left-radius") - | js_word!("border-bottom-right-radius") - | js_word!("border-end-end-radius") - | js_word!("border-end-start-radius") - | js_word!("shape-margin") - | js_word!("offset-distance") => { + "border-top-left-radius" + | "border-top-right-radius" + | "border-start-end-radius" + | "border-start-start-radius" + | "border-bottom-left-radius" + | "border-bottom-right-radius" + | "border-end-end-radius" + | "border-end-start-radius" + | "shape-margin" + | "offset-distance" => { declaration.value = vec![ComponentValue::LengthPercentage(Box::new( LengthPercentage::Length(Length { span, @@ -973,52 +961,52 @@ impl Compressor { }, unit: Ident { span: DUMMY_SP, - value: js_word!("px"), + value: "px".into(), raw: None, }, }), ))]; } - js_word!("padding-block") - | js_word!("padding-block-end") - | js_word!("padding-block-start") - | js_word!("padding-bottom") - | js_word!("padding-inline") - | js_word!("padding-inline-end") - | js_word!("padding-inline-start") - | js_word!("padding-left") - | js_word!("padding-right") - | js_word!("padding-top") - | js_word!("padding") - | js_word!("margin-block") - | js_word!("margin-block-end") - | js_word!("margin-block-start") - | js_word!("margin-bottom") - | js_word!("margin-inline") - | js_word!("margin-inline-end") - | js_word!("margin-inline-start") - | js_word!("margin-left") - | js_word!("margin-right") - | js_word!("margin-top") - | js_word!("margin") - | js_word!("scroll-margin") - | js_word!("scroll-margin-block") - | js_word!("scroll-margin-block-start") - | js_word!("scroll-margin-block-end") - | js_word!("scroll-margin-bottom") - | js_word!("scroll-margin-inline") - | js_word!("scroll-margin-inline-start") - | js_word!("scroll-margin-inline-end") - | js_word!("scroll-margin-left") - | js_word!("scroll-margin-right") - | js_word!("scroll-margin-top") - | js_word!("min-inline-size") - | js_word!("min-block-size") - | js_word!("border-image-outset") - | js_word!("text-indent") - | js_word!("outline-offset") - | js_word!("line-height-step") - | js_word!("border-spacing") => { + "padding-block" + | "padding-block-end" + | "padding-block-start" + | "padding-bottom" + | "padding-inline" + | "padding-inline-end" + | "padding-inline-start" + | "padding-left" + | "padding-right" + | "padding-top" + | "padding" + | "margin-block" + | "margin-block-end" + | "margin-block-start" + | "margin-bottom" + | "margin-inline" + | "margin-inline-end" + | "margin-inline-start" + | "margin-left" + | "margin-right" + | "margin-top" + | "margin" + | "scroll-margin" + | "scroll-margin-block" + | "scroll-margin-block-start" + | "scroll-margin-block-end" + | "scroll-margin-bottom" + | "scroll-margin-inline" + | "scroll-margin-inline-start" + | "scroll-margin-inline-end" + | "scroll-margin-left" + | "scroll-margin-right" + | "scroll-margin-top" + | "min-inline-size" + | "min-block-size" + | "border-image-outset" + | "text-indent" + | "outline-offset" + | "line-height-step" + | "border-spacing" => { declaration.value = vec![ComponentValue::Dimension(Box::new(Dimension::Length( Length { span, @@ -1029,27 +1017,27 @@ impl Compressor { }, unit: Ident { span: DUMMY_SP, - value: js_word!("px"), + value: "px".into(), raw: None, }, }, )))]; } - js_word!("flex-direction") | js_word!("grid-auto-flow") => { + "flex-direction" | "grid-auto-flow" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("row"), + value: "row".into(), raw: None, }))]; } - js_word!("mask-border-slice") | js_word!("mask-border-outset") => { + "mask-border-slice" | "mask-border-outset" => { declaration.value = vec![ComponentValue::Number(Box::new(Number { span, value: 0.0, raw: None, }))]; } - js_word!("border-image-slice") => { + "border-image-slice" => { declaration.value = vec![ComponentValue::Percentage(Box::new(Percentage { span, value: Number { @@ -1059,70 +1047,70 @@ impl Compressor { }, }))]; } - js_word!("border-image-width") => { + "border-image-width" => { declaration.value = vec![ComponentValue::Number(Box::new(Number { span, value: 1.0, raw: None, }))]; } - js_word!("box-decoration-break") => { + "box-decoration-break" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("slice"), + value: "slice".into(), raw: None, }))]; } - js_word!("caption-side") => { + "caption-side" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("top"), + value: "top".into(), raw: None, }))]; } - js_word!("direction") => { + "direction" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("ltr"), + value: "ltr".into(), raw: None, }))]; } - js_word!("empty-cells") => { + "empty-cells" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("show"), + value: "show".into(), raw: None, }))]; } - js_word!("flex-grow") => { + "flex-grow" => { declaration.value = vec![ComponentValue::Number(Box::new(Number { span, value: 0.0, raw: None, }))]; } - js_word!("flex-shrink") => { + "flex-shrink" => { declaration.value = vec![ComponentValue::Number(Box::new(Number { span, value: 1.0, raw: None, }))]; } - js_word!("flex-wrap") => { + "flex-wrap" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("nowrap"), + value: "nowrap".into(), raw: None, }))]; } - js_word!("hyphens") => { + "hyphens" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("manual"), + value: "manual".into(), raw: None, }))]; } - js_word!("image-resolution") => { + "image-resolution" => { declaration.value = vec![ComponentValue::Dimension(Box::new( Dimension::Resolution(Resolution { span, @@ -1133,62 +1121,62 @@ impl Compressor { }, unit: Ident { span: DUMMY_SP, - value: js_word!("dppx"), + value: "dppx".into(), raw: None, }, }), ))]; } - js_word!("justify-items") => { + "justify-items" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("legacy"), + value: "legacy".into(), raw: None, }))]; } - js_word!("list-style-type") => { + "list-style-type" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("disk"), + value: "disk".into(), raw: None, }))]; } - js_word!("mask-border-mode") => { + "mask-border-mode" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("alpha"), + value: "alpha".into(), raw: None, }))]; } - js_word!("mask-composite") => { + "mask-composite" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("add"), + value: "add".into(), raw: None, }))]; } - js_word!("masonry-auto-flow") => { + "masonry-auto-flow" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("pack"), + value: "pack".into(), raw: None, }))]; } - js_word!("math-depth") | js_word!("order") => { + "math-depth" | "order" => { declaration.value = vec![ComponentValue::Integer(Box::new(Integer { span, value: 0, raw: None, }))]; } - js_word!("object-fit") => { + "object-fit" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("fill"), + value: "fill".into(), raw: None, }))]; } - js_word!("overflow-clip-margin") => { + "overflow-clip-margin" => { declaration.value = vec![ComponentValue::Dimension(Box::new(Dimension::Length( Length { span, @@ -1199,69 +1187,69 @@ impl Compressor { }, unit: Ident { span: DUMMY_SP, - value: js_word!("px"), + value: "px".into(), raw: None, }, }, )))]; } - js_word!("position") => { + "position" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("static"), + value: "static".into(), raw: None, }))]; } - js_word!("scroll-timeline-axis") => { + "scroll-timeline-axis" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("block"), + value: "block".into(), raw: None, }))]; } - js_word!("tab-size") => { + "tab-size" => { declaration.value = vec![ComponentValue::Number(Box::new(Number { span: DUMMY_SP, value: 8.0, raw: None, }))]; } - js_word!("text-decoration-style") => { + "text-decoration-style" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("solid"), + value: "solid".into(), raw: None, }))]; } - js_word!("text-orientation") => { + "text-orientation" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("mixed"), + value: "mixed".into(), raw: None, }))]; } - js_word!("text-overflow") => { + "text-overflow" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("clip"), + value: "clip".into(), raw: None, }))]; } - js_word!("transform-style") => { + "transform-style" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("flat"), + value: "flat".into(), raw: None, }))]; } - js_word!("transition-property") => { + "transition-property" => { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span, - value: js_word!("all"), + value: "all".into(), raw: None, }))]; } - js_word!("orphans") | js_word!("widows") => { + "orphans" | "widows" => { declaration.value = vec![ComponentValue::Integer(Box::new(Integer { span, value: 2, @@ -1279,47 +1267,47 @@ impl Compressor { return; }; - match *name { - js_word!("background-clip") | js_word!("mask-clip") | js_word!("mask-origin") => { + match &**name { + "background-clip" | "mask-clip" | "mask-origin" => { if let Some(ComponentValue::Ident(box Ident { value, span, .. })) = declaration.value.get(0) { - if value.eq_ignore_ascii_case(&js_word!("border-box")) { + if value.eq_ignore_ascii_case("border-box") { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("initial"), + value: "initial".into(), raw: None, }))]; } } } - js_word!("background-color") => { + "background-color" => { if let Some(ComponentValue::Ident(box Ident { value, span, .. })) = declaration.value.get(0) { - if value.eq_ignore_ascii_case(&js_word!("transparent")) { + if value.eq_ignore_ascii_case("transparent") { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("initial"), + value: "initial".into(), raw: None, }))]; } } } - js_word!("background-origin") => { + "background-origin" => { if let Some(ComponentValue::Ident(box Ident { value, span, .. })) = declaration.value.get(0) { - if value.eq_ignore_ascii_case(&js_word!("padding-box")) { + if value.eq_ignore_ascii_case("padding-box") { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("initial"), + value: "initial".into(), raw: None, }))]; } } } - js_word!("background-size") => { + "background-size" => { if let ( Some(ComponentValue::Ident(box Ident { value: first, span, .. @@ -1327,83 +1315,83 @@ impl Compressor { Some(ComponentValue::Ident(box Ident { value: second, .. })), ) = (declaration.value.get(0), declaration.value.get(1)) { - if first.eq_ignore_ascii_case(&js_word!("auto")) - && second.eq_ignore_ascii_case(&js_word!("auto")) + if first.eq_ignore_ascii_case("auto") + && second.eq_ignore_ascii_case("auto") && declaration.value.len() == 2 { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("initial"), + value: "initial".into(), raw: None, }))]; } } } - js_word!("border-block-color") - | js_word!("border-block-start-color") - | js_word!("border-block-end-color") - | js_word!("border-inline-color") - | js_word!("border-inline-start-color") - | js_word!("border-inline-end-color") - | js_word!("border-bottom-color") - | js_word!("border-left-color") - | js_word!("border-right-color") - | js_word!("border-top-color") - | js_word!("column-rule-color") - | js_word!("text-emphasis-color") - | js_word!("text-decoration-color") => { + "border-block-color" + | "border-block-start-color" + | "border-block-end-color" + | "border-inline-color" + | "border-inline-start-color" + | "border-inline-end-color" + | "border-bottom-color" + | "border-left-color" + | "border-right-color" + | "border-top-color" + | "column-rule-color" + | "text-emphasis-color" + | "text-decoration-color" => { if let Some(ComponentValue::Ident(box Ident { value, span, .. })) = declaration.value.get(0) { - if value.eq_ignore_ascii_case(&js_word!("currentcolor")) { + if value.eq_ignore_ascii_case("currentcolor") { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("initial"), + value: "initial".into(), raw: None, }))]; } } } - js_word!("border-collapse") => { + "border-collapse" => { if let Some(ComponentValue::Ident(box Ident { value, span, .. })) = declaration.value.get(0) { - if value.eq_ignore_ascii_case(&js_word!("separate")) { + if value.eq_ignore_ascii_case("separate") { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("initial"), + value: "initial".into(), raw: None, }))]; } } } - js_word!("box-sizing") => { + "box-sizing" => { if let Some(ComponentValue::Ident(box Ident { value, span, .. })) = declaration.value.get(0) { - if value.eq_ignore_ascii_case(&js_word!("content-box")) { + if value.eq_ignore_ascii_case("content-box") { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("initial"), + value: "initial".into(), raw: None, }))]; } } } - js_word!("color") => { + "color" => { if let Some(ComponentValue::Ident(box Ident { value, span, .. })) = declaration.value.get(0) { - if value.eq_ignore_ascii_case(&js_word!("canvastext")) { + if value.eq_ignore_ascii_case("canvastext") { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("initial"), + value: "initial".into(), raw: None, }))]; } } } - js_word!("font-synthesis") => { + "font-synthesis" => { if let ( Some(ComponentValue::Ident(box Ident { value: first, span, .. @@ -1411,99 +1399,97 @@ impl Compressor { Some(ComponentValue::Ident(box Ident { value: second, .. })), ) = (declaration.value.get(0), declaration.value.get(1)) { - if first.eq_ignore_ascii_case(&js_word!("weight")) - && second.eq_ignore_ascii_case(&js_word!("style")) + if first.eq_ignore_ascii_case("weight") + && second.eq_ignore_ascii_case("style") && declaration.value.len() == 2 { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("initial"), + value: "initial".into(), raw: None, }))]; } } } - js_word!("image-orientation") => { + "image-orientation" => { if let Some(ComponentValue::Ident(box Ident { value, span, .. })) = declaration.value.get(0) { - if value.eq_ignore_ascii_case(&js_word!("from-image")) { + if value.eq_ignore_ascii_case("from-image") { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("initial"), + value: "initial".into(), raw: None, }))]; } } } - js_word!("mask-mode") => { + "mask-mode" => { if let Some(ComponentValue::Ident(box Ident { value, span, .. })) = declaration.value.get(0) { - if value.eq_ignore_ascii_case(&js_word!("match-source")) - && declaration.value.len() == 1 - { + if value.eq_ignore_ascii_case("match-source") && declaration.value.len() == 1 { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("initial"), + value: "initial".into(), raw: None, }))]; } } } - js_word!("mask-type") => { + "mask-type" => { if let Some(ComponentValue::Ident(box Ident { value, span, .. })) = declaration.value.get(0) { - if value.eq_ignore_ascii_case(&js_word!("luminance")) { + if value.eq_ignore_ascii_case("luminance") { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("initial"), + value: "initial".into(), raw: None, }))]; } } } - js_word!("ruby-align") => { + "ruby-align" => { if let Some(ComponentValue::Ident(box Ident { value, span, .. })) = declaration.value.get(0) { - if value.eq_ignore_ascii_case(&js_word!("space-around")) { + if value.eq_ignore_ascii_case("space-around") { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("initial"), + value: "initial".into(), raw: None, }))]; } } } - js_word!("ruby-merge") => { + "ruby-merge" => { if let Some(ComponentValue::Ident(box Ident { value, span, .. })) = declaration.value.get(0) { - if value.eq_ignore_ascii_case(&js_word!("separate")) { + if value.eq_ignore_ascii_case("separate") { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("initial"), + value: "initial".into(), raw: None, }))]; } } } - js_word!("ruby-position") => { + "ruby-position" => { if let Some(ComponentValue::Ident(box Ident { value, span, .. })) = declaration.value.get(0) { - if value.eq_ignore_ascii_case(&js_word!("alternate")) { + if value.eq_ignore_ascii_case("alternate") { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("initial"), + value: "initial".into(), raw: None, }))]; } } } - js_word!("text-emphasis-position") => { + "text-emphasis-position" => { if let ( Some(ComponentValue::Ident(box Ident { value: first, span, .. @@ -1511,31 +1497,29 @@ impl Compressor { Some(ComponentValue::Ident(box Ident { value: second, .. })), ) = (declaration.value.get(0), declaration.value.get(1)) { - if first.eq_ignore_ascii_case(&js_word!("over")) - && second.eq_ignore_ascii_case(&js_word!("right")) - { + if first.eq_ignore_ascii_case("over") && second.eq_ignore_ascii_case("right") { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("initial"), + value: "initial".into(), raw: None, }))]; } } } - js_word!("transform-box") => { + "transform-box" => { if let Some(ComponentValue::Ident(box Ident { value, span, .. })) = declaration.value.get(0) { - if value.eq_ignore_ascii_case(&js_word!("view-box")) { + if value.eq_ignore_ascii_case("view-box") { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("initial"), + value: "initial".into(), raw: None, }))]; } } } - js_word!("transform-origin") => { + "transform-origin" => { if let ( Some(ComponentValue::Percentage(box Percentage { value: Number { value: first, .. }, @@ -1559,33 +1543,33 @@ impl Compressor { { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("initial"), + value: "initial".into(), raw: None, }))]; } } } - js_word!("vertical-align") => { + "vertical-align" => { if let Some(ComponentValue::Ident(box Ident { value, span, .. })) = declaration.value.get(0) { - if value.eq_ignore_ascii_case(&js_word!("baseline")) { + if value.eq_ignore_ascii_case("baseline") { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("initial"), + value: "initial".into(), raw: None, }))]; } } } - js_word!("writing-mode") => { + "writing-mode" => { if let Some(ComponentValue::Ident(box Ident { value, span, .. })) = declaration.value.get(0) { - if value.eq_ignore_ascii_case(&js_word!("horizontal-tb")) { + if value.eq_ignore_ascii_case("horizontal-tb") { declaration.value = vec![ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("initial"), + value: "initial".into(), raw: None, }))]; } diff --git a/crates/swc_css_minifier/src/compressor/easing_function.rs b/crates/swc_css_minifier/src/compressor/easing_function.rs index e49950fc1c5c..13df11cf156f 100644 --- a/crates/swc_css_minifier/src/compressor/easing_function.rs +++ b/crates/swc_css_minifier/src/compressor/easing_function.rs @@ -1,4 +1,3 @@ -use swc_atoms::js_word; use swc_css_ast::*; use super::Compressor; @@ -10,7 +9,7 @@ impl Compressor { name, value: function_value, span, - }) if name == &js_word!("cubic-bezier") && function_value.len() == 7 => { + }) if name == "cubic-bezier" && function_value.len() == 7 => { if let ( first, second, @@ -29,7 +28,7 @@ impl Compressor { { *component_value = ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("linear"), + value: "linear".into(), raw: None, })) } else if matches!(first, ComponentValue::Number(box Number { value, .. }) if *value == 0.25) @@ -39,7 +38,7 @@ impl Compressor { { *component_value = ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("ease"), + value: "ease".into(), raw: None, })) } else if matches!(first, ComponentValue::Number(box Number { value: first, .. }) if *first == 0.42) @@ -49,7 +48,7 @@ impl Compressor { { *component_value = ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("ease-in"), + value: "ease-in".into(), raw: None, })) } else if matches!(first, ComponentValue::Integer(box Integer { value: first, .. }) if *first == 0) @@ -59,7 +58,7 @@ impl Compressor { { *component_value = ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("ease-out"), + value: "ease-out".into(), raw: None, })) } else if matches!(first, ComponentValue::Number(box Number { value: first, .. }) if *first == 0.42) @@ -69,7 +68,7 @@ impl Compressor { { *component_value = ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("ease-in-out"), + value: "ease-in-out".into(), raw: None, })) } @@ -79,7 +78,7 @@ impl Compressor { name, value: function_value, span, - }) if name == &js_word!("steps") && function_value.len() == 3 => { + }) if name == "steps" && function_value.len() == 3 => { match (&function_value[0], &function_value[2]) { ( ComponentValue::Integer(box Integer { @@ -89,18 +88,18 @@ impl Compressor { ComponentValue::Ident(box Ident { value: ident_value, .. }), - ) if *number_value == 1 => match ident_value.to_ascii_lowercase() { - js_word!("start") | js_word!("jump-start") => { + ) if *number_value == 1 => match &*ident_value.to_ascii_lowercase() { + "start" | "jump-start" => { *component_value = ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("step-start"), + value: "step-start".into(), raw: None, })) } - js_word!("end") | js_word!("jump-end") => { + "end" | "jump-end" => { *component_value = ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("step-end"), + value: "step-end".into(), raw: None, })) } @@ -111,10 +110,10 @@ impl Compressor { ComponentValue::Ident(box Ident { value: ident_value, .. }), - ) if ident_value.eq_ignore_ascii_case(&js_word!("jump-start")) => { + ) if ident_value.eq_ignore_ascii_case("jump-start") => { function_value[2] = ComponentValue::Ident(Box::new(Ident { span: *span, - value: js_word!("start"), + value: "start".into(), raw: None, })) } @@ -123,8 +122,8 @@ impl Compressor { ComponentValue::Ident(box Ident { value: ident_value, .. }), - ) => match ident_value.to_ascii_lowercase() { - js_word!("end") | js_word!("jump-end") => { + ) => match &*ident_value.to_ascii_lowercase() { + "end" | "jump-end" => { *function_value = vec![ComponentValue::Integer(number.clone())]; } _ => {} diff --git a/crates/swc_css_minifier/src/compressor/frequency.rs b/crates/swc_css_minifier/src/compressor/frequency.rs index 2b79bcd65acc..6fa398f4938d 100644 --- a/crates/swc_css_minifier/src/compressor/frequency.rs +++ b/crates/swc_css_minifier/src/compressor/frequency.rs @@ -1,14 +1,11 @@ -use swc_atoms::js_word; use swc_css_ast::*; use super::Compressor; impl Compressor { pub(super) fn compress_frequency(&mut self, frequency: &mut Frequency) { - match frequency.unit.value { - js_word!("hz") - if frequency.value.value > 0.0 && frequency.value.value % 1000.0 == 0.0 => - { + match &*frequency.unit.value { + "hz" if frequency.value.value > 0.0 && frequency.value.value % 1000.0 == 0.0 => { let new_value = frequency.value.value / 1000.0; frequency.value = Number { @@ -18,11 +15,11 @@ impl Compressor { }; frequency.unit = Ident { span: frequency.unit.span, - value: js_word!("khz"), + value: "khz".into(), raw: None, }; } - js_word!("khz") + "khz" if frequency.value.value == 0.0 || (frequency.value.value > 0.0 && frequency.value.value < 0.1) => { @@ -35,7 +32,7 @@ impl Compressor { }; frequency.unit = Ident { span: frequency.unit.span, - value: js_word!("hz"), + value: "hz".into(), raw: None, }; } diff --git a/crates/swc_css_minifier/src/compressor/import.rs b/crates/swc_css_minifier/src/compressor/import.rs index edf351502ff4..93f7e92e228b 100644 --- a/crates/swc_css_minifier/src/compressor/import.rs +++ b/crates/swc_css_minifier/src/compressor/import.rs @@ -24,7 +24,7 @@ impl Compressor { *import_href = ImportHref::Str(Str { span: *span, - value: (&*new_value).into(), + value: new_value.clone(), raw: None, }); } diff --git a/crates/swc_css_minifier/src/compressor/keyframes.rs b/crates/swc_css_minifier/src/compressor/keyframes.rs index bd34e12bd5b8..e18bbf2af1a6 100644 --- a/crates/swc_css_minifier/src/compressor/keyframes.rs +++ b/crates/swc_css_minifier/src/compressor/keyframes.rs @@ -1,4 +1,3 @@ -use swc_atoms::js_word; use swc_common::DUMMY_SP; use swc_css_ast::*; @@ -10,7 +9,7 @@ impl Compressor { match at_rule.prelude.as_deref() { Some(AtRulePrelude::KeyframesPrelude(KeyframesName::Str(string))) if !is_css_wide_keyword(&string.value) - && !string.value.eq_ignore_ascii_case(&js_word!("none")) => + && !string.value.eq_ignore_ascii_case("none") => { at_rule.prelude = Some(Box::new(AtRulePrelude::KeyframesPrelude( if self.is_ident_shorter_than_str(&string.value) { @@ -34,7 +33,7 @@ impl Compressor { pub(super) fn compress_keyframe_selector(&mut self, keyframe_selector: &mut KeyframeSelector) { match keyframe_selector { - KeyframeSelector::Ident(i) if i.value == js_word!("from") => { + KeyframeSelector::Ident(i) if i.value == "from" => { *keyframe_selector = KeyframeSelector::Percentage(Percentage { span: i.span, value: Number { @@ -47,7 +46,7 @@ impl Compressor { KeyframeSelector::Percentage(i) if i.value.value == 100.0 => { *keyframe_selector = KeyframeSelector::Ident(Ident { span: i.span, - value: js_word!("to"), + value: "to".into(), raw: None, }) } diff --git a/crates/swc_css_minifier/src/compressor/length.rs b/crates/swc_css_minifier/src/compressor/length.rs index 133b0c38386e..72b95ce282fa 100644 --- a/crates/swc_css_minifier/src/compressor/length.rs +++ b/crates/swc_css_minifier/src/compressor/length.rs @@ -1,91 +1,90 @@ -use swc_atoms::{js_word, JsWord}; use swc_css_ast::*; use super::Compressor; impl Compressor { - fn convert_length(&mut self, value: f64, from_unit: &JsWord, to_unit: &JsWord) -> f64 { - match *to_unit { - js_word!("cm") => match *from_unit { - js_word!("cm") => value, - js_word!("mm") => value / 10.0, - js_word!("q") => value / 40.0, - js_word!("in") => 2.54 * value, - js_word!("pc") => 2.54 / 6.0 * value, - js_word!("pt") => 2.54 / 72.0 * value, - js_word!("px") => 2.54 / 96.0 * value, + fn convert_length(&mut self, value: f64, from_unit: &str, to_unit: &str) -> f64 { + match to_unit { + "cm" => match from_unit { + "cm" => value, + "mm" => value / 10.0, + "q" => value / 40.0, + "in" => 2.54 * value, + "pc" => 2.54 / 6.0 * value, + "pt" => 2.54 / 72.0 * value, + "px" => 2.54 / 96.0 * value, _ => { unreachable!() } }, - js_word!("mm") => match *from_unit { - js_word!("cm") => 10.0 * value, - js_word!("mm") => value, - js_word!("q") => value / 4.0, - js_word!("in") => 25.4 * value, - js_word!("pc") => 25.4 / 6.0 * value, - js_word!("pt") => 25.4 / 72.0 * value, - js_word!("px") => 25.4 / 96.0 * value, + "mm" => match from_unit { + "cm" => 10.0 * value, + "mm" => value, + "q" => value / 4.0, + "in" => 25.4 * value, + "pc" => 25.4 / 6.0 * value, + "pt" => 25.4 / 72.0 * value, + "px" => 25.4 / 96.0 * value, _ => { unreachable!() } }, - js_word!("q") => match *from_unit { - js_word!("cm") => 40.0 * value, - js_word!("mm") => 4.0 * value, - js_word!("q") => value, - js_word!("in") => 101.6 * value, - js_word!("pc") => 101.6 / 6.0 * value, - js_word!("pt") => 101.6 / 72.0 * value, - js_word!("px") => 101.6 / 96.0 * value, + "q" => match from_unit { + "cm" => 40.0 * value, + "mm" => 4.0 * value, + "q" => value, + "in" => 101.6 * value, + "pc" => 101.6 / 6.0 * value, + "pt" => 101.6 / 72.0 * value, + "px" => 101.6 / 96.0 * value, _ => { unreachable!() } }, - js_word!("in") => match *from_unit { - js_word!("cm") => value / 2.54, - js_word!("mm") => value / 25.4, - js_word!("q") => value / 101.6, - js_word!("in") => value, - js_word!("pc") => value / 6.0, - js_word!("pt") => value / 72.0, - js_word!("px") => value / 96.0, + "in" => match from_unit { + "cm" => value / 2.54, + "mm" => value / 25.4, + "q" => value / 101.6, + "in" => value, + "pc" => value / 6.0, + "pt" => value / 72.0, + "px" => value / 96.0, _ => { unreachable!() } }, - js_word!("pc") => match *from_unit { - js_word!("cm") => 6.0 / 2.54 * value, - js_word!("mm") => 6.0 / 25.4 * value, - js_word!("q") => 6.0 / 101.6 * value, - js_word!("in") => 6.0 * value, - js_word!("pc") => value, - js_word!("pt") => 6.0 / 72.0 * value, - js_word!("px") => 6.0 / 96.0 * value, + "pc" => match from_unit { + "cm" => 6.0 / 2.54 * value, + "mm" => 6.0 / 25.4 * value, + "q" => 6.0 / 101.6 * value, + "in" => 6.0 * value, + "pc" => value, + "pt" => 6.0 / 72.0 * value, + "px" => 6.0 / 96.0 * value, _ => { unreachable!() } }, - js_word!("pt") => match *from_unit { - js_word!("cm") => 72.0 / 2.54 * value, - js_word!("mm") => 72.0 / 25.4 * value, - js_word!("q") => 72.0 / 101.6 * value, - js_word!("in") => 72.0 * value, - js_word!("pc") => 12.0 * value, - js_word!("pt") => value, - js_word!("px") => 0.75 * value, + "pt" => match from_unit { + "cm" => 72.0 / 2.54 * value, + "mm" => 72.0 / 25.4 * value, + "q" => 72.0 / 101.6 * value, + "in" => 72.0 * value, + "pc" => 12.0 * value, + "pt" => value, + "px" => 0.75 * value, _ => { unreachable!() } }, - js_word!("px") => match *from_unit { - js_word!("cm") => 96.0 / 2.54 * value, - js_word!("mm") => 96.0 / 25.4 * value, - js_word!("q") => 96.0 / 101.6 * value, - js_word!("in") => 96.0 * value, - js_word!("pc") => 16.0 * value, - js_word!("pt") => 96.0 / 72.0 * value, - js_word!("px") => value, + "px" => match from_unit { + "cm" => 96.0 / 2.54 * value, + "mm" => 96.0 / 25.4 * value, + "q" => 96.0 / 101.6 * value, + "in" => 96.0 * value, + "pc" => 16.0 * value, + "pt" => 96.0 / 72.0 * value, + "px" => value, _ => { unreachable!() } @@ -136,10 +135,10 @@ impl Compressor { pub(super) fn compress_length(&mut self, length: &mut Length) { let value = length.value.value; - match length.unit.value { - js_word!("cm") => { + match &*length.unit.value { + "cm" => { if value % 2.54 == 0.0 { - let new_value = self.convert_length(value, &length.unit.value, &js_word!("in")); + let new_value = self.convert_length(value, &length.unit.value, "in"); length.value = Number { span: length.value.span, @@ -148,11 +147,11 @@ impl Compressor { }; length.unit = Ident { span: length.unit.span, - value: js_word!("in"), + value: "in".into(), raw: None, }; } else if value <= 0.1 { - let new_value = self.convert_length(value, &length.unit.value, &js_word!("mm")); + let new_value = self.convert_length(value, &length.unit.value, "mm"); length.value = Number { span: length.value.span, @@ -161,14 +160,14 @@ impl Compressor { }; length.unit = Ident { span: length.unit.span, - value: js_word!("mm"), + value: "mm".into(), raw: None, }; } } - js_word!("mm") => { + "mm" => { if value % 25.4 == 0.0 { - let new_value = self.convert_length(value, &length.unit.value, &js_word!("in")); + let new_value = self.convert_length(value, &length.unit.value, "in"); length.value = Number { span: length.value.span, @@ -177,11 +176,11 @@ impl Compressor { }; length.unit = Ident { span: length.unit.span, - value: js_word!("in"), + value: "in".into(), raw: None, }; } else if value % 10.0 == 0.0 { - let new_value = self.convert_length(value, &length.unit.value, &js_word!("cm")); + let new_value = self.convert_length(value, &length.unit.value, "cm"); length.value = Number { span: length.value.span, @@ -190,14 +189,14 @@ impl Compressor { }; length.unit = Ident { span: length.unit.span, - value: js_word!("cm"), + value: "cm".into(), raw: None, }; } } - js_word!("q") => { + "q" => { if value > 80.0 && value % 40.0 == 0.0 { - let new_value = self.convert_length(value, &length.unit.value, &js_word!("cm")); + let new_value = self.convert_length(value, &length.unit.value, "cm"); length.value = Number { span: length.value.span, @@ -206,11 +205,11 @@ impl Compressor { }; length.unit = Ident { span: length.unit.span, - value: js_word!("cm"), + value: "cm".into(), raw: None, }; } else if value % 101.6 == 0.0 { - let new_value = self.convert_length(value, &length.unit.value, &js_word!("in")); + let new_value = self.convert_length(value, &length.unit.value, "in"); length.value = Number { span: length.value.span, @@ -219,14 +218,14 @@ impl Compressor { }; length.unit = Ident { span: length.unit.span, - value: js_word!("in"), + value: "in".into(), raw: None, }; } } - js_word!("pc") => { + "pc" => { if value % 6.0 == 0.0 { - let new_value = self.convert_length(value, &length.unit.value, &js_word!("in")); + let new_value = self.convert_length(value, &length.unit.value, "in"); length.value = Number { span: length.value.span, @@ -235,14 +234,14 @@ impl Compressor { }; length.unit = Ident { span: length.unit.span, - value: js_word!("in"), + value: "in".into(), raw: None, }; } } - js_word!("pt") => { + "pt" => { if value % 72.0 == 0.0 { - let new_value = self.convert_length(value, &length.unit.value, &js_word!("in")); + let new_value = self.convert_length(value, &length.unit.value, "in"); length.value = Number { span: length.value.span, @@ -251,11 +250,11 @@ impl Compressor { }; length.unit = Ident { span: length.unit.span, - value: js_word!("in"), + value: "in".into(), raw: None, }; } else if value % 12.0 == 0.0 { - let new_value = self.convert_length(value, &length.unit.value, &js_word!("pc")); + let new_value = self.convert_length(value, &length.unit.value, "pc"); length.value = Number { span: length.value.span, @@ -264,11 +263,11 @@ impl Compressor { }; length.unit = Ident { span: length.unit.span, - value: js_word!("pc"), + value: "pc".into(), raw: None, }; } else if value % 0.75 == 0.0 { - let new_value = self.convert_length(value, &length.unit.value, &js_word!("px")); + let new_value = self.convert_length(value, &length.unit.value, "px"); length.value = Number { span: length.value.span, @@ -277,7 +276,7 @@ impl Compressor { }; length.unit = Ident { span: length.unit.span, - value: js_word!("px"), + value: "px".into(), raw: None, }; } diff --git a/crates/swc_css_minifier/src/compressor/math/mod.rs b/crates/swc_css_minifier/src/compressor/math/mod.rs index 81572781006d..f45462827659 100644 --- a/crates/swc_css_minifier/src/compressor/math/mod.rs +++ b/crates/swc_css_minifier/src/compressor/math/mod.rs @@ -1,10 +1,7 @@ -use swc_atoms::js_word; use swc_css_ast::*; pub fn is_calc_function_name(function_name: &FunctionName) -> bool { - *function_name == js_word!("calc") - || *function_name == js_word!("-webkit-calc") - || *function_name == js_word!("-moz-calc") + *function_name == "calc" || *function_name == "-webkit-calc" || *function_name == "-moz-calc" } pub fn transform_calc_value_into_component_value(calc_value: &CalcValue) -> Option { diff --git a/crates/swc_css_minifier/src/compressor/media.rs b/crates/swc_css_minifier/src/compressor/media.rs index cb4cf2e0e6f9..b2c47ddb8b63 100644 --- a/crates/swc_css_minifier/src/compressor/media.rs +++ b/crates/swc_css_minifier/src/compressor/media.rs @@ -1,6 +1,5 @@ use std::mem::take; -use swc_atoms::js_word; use swc_common::DUMMY_SP; use swc_css_ast::*; @@ -396,10 +395,8 @@ impl Compressor { value: box MediaFeatureValue::Number(value), }) => { if matches!( - name.value, - js_word!("min-color") - | js_word!("min-color-index") - | js_word!("min-monochrome") + &*name.value, + "min-color" | "min-color-index" | "min-monochrome" ) && value.value == 1.0 { *n = MediaFeature::Boolean(MediaFeatureBoolean { @@ -414,10 +411,8 @@ impl Compressor { } MediaFeature::Range(range) => { if let MediaFeatureValue::Ident(name) = &*range.left { - if matches!( - name.value, - js_word!("color") | js_word!("color-index") | js_word!("monochrome") - ) && matches!(&*range.right, MediaFeatureValue::Number(number) if number.value == 1.0) + if matches!(&*name.value, "color" | "color-index" | "monochrome") + && matches!(&*range.right, MediaFeatureValue::Number(number) if number.value == 1.0) && range.comparison == MediaFeatureRangeComparison::Ge { *n = MediaFeature::Boolean(MediaFeatureBoolean { @@ -432,10 +427,8 @@ impl Compressor { }); } } else if let MediaFeatureValue::Ident(name) = &*range.right { - if matches!( - name.value, - js_word!("color") | js_word!("color-index") | js_word!("monochrome") - ) && matches!(&*range.left, MediaFeatureValue::Number(number) if number.value == 1.0) + if matches!(&*name.value, "color" | "color-index" | "monochrome") + && matches!(&*range.left, MediaFeatureValue::Number(number) if number.value == 1.0) && range.comparison == MediaFeatureRangeComparison::Le { *n = MediaFeature::Boolean(MediaFeatureBoolean { diff --git a/crates/swc_css_minifier/src/compressor/mod.rs b/crates/swc_css_minifier/src/compressor/mod.rs index 0cb2f7e2ee2d..f2acee9b24fa 100644 --- a/crates/swc_css_minifier/src/compressor/mod.rs +++ b/crates/swc_css_minifier/src/compressor/mod.rs @@ -1,4 +1,3 @@ -use swc_atoms::js_word; use swc_css_ast::*; use swc_css_utils::serialize_ident; use swc_css_visit::{VisitMut, VisitMutWith}; @@ -109,10 +108,10 @@ impl VisitMut for Compressor { if let DeclarationName::Ident(Ident { value, .. }) = &n.name { if matches_eq_ignore_ascii_case!( value, - js_word!("opacity"), - js_word!("fill-opacity"), - js_word!("stroke-opacity"), - js_word!("shape-image-threshold") + "opacity", + "fill-opacity", + "stroke-opacity", + "shape-image-threshold" ) { n.visit_mut_children_with(&mut *self.with_ctx(Ctx { preserve_alpha_value: false, @@ -261,13 +260,8 @@ impl VisitMut for Compressor { match &n.name { Ident { value, .. } if matches!( - *value, - js_word!("not") - | js_word!("is") - | js_word!("where") - | js_word!("matches") - | js_word!("-moz-any") - | js_word!("-webkit-any") + &**value, + "not" | "is" | "where" | "matches" | "-moz-any" | "-webkit-any" ) => { n.visit_mut_children_with(&mut *self.with_ctx(Ctx { @@ -341,15 +335,7 @@ impl VisitMut for Compressor { fn visit_mut_function(&mut self, n: &mut Function) { if matches_eq!( - n.name, - js_word!("rotate"), - js_word!("skew"), - js_word!("skewx"), - js_word!("skewy"), - js_word!("rotate3d"), - js_word!("rotatex"), - js_word!("rotatey"), - js_word!("rotatez") + n.name, "rotate", "skew", "skewx", "skewy", "rotate3d", "rotatex", "rotatey", "rotatez" ) { n.visit_mut_children_with(&mut *self.with_ctx(Ctx { in_transform_function: true, diff --git a/crates/swc_css_minifier/src/compressor/rules.rs b/crates/swc_css_minifier/src/compressor/rules.rs index 29c72cec18dd..3d4b77c7485c 100644 --- a/crates/swc_css_minifier/src/compressor/rules.rs +++ b/crates/swc_css_minifier/src/compressor/rules.rs @@ -1,6 +1,6 @@ use std::mem::take; -use swc_atoms::{js_word, JsWord}; +use swc_atoms::JsWord; use swc_common::{ collections::AHashMap, util::take::Take, EqIgnoreSpan, Span, Spanned, SyntaxContext, }; @@ -330,12 +330,8 @@ impl Compressor { }; matches!( - *name, - js_word!("media") - | js_word!("supports") - | js_word!("container") - | js_word!("layer") - | js_word!("nest") + &**name, + "media" | "supports" | "container" | "layer" | "nest" ) } @@ -645,5 +641,5 @@ impl Compressor { #[inline] fn need_keep_by_name(name: &JsWord) -> bool { - *name == js_word!("color-profile") + *name == "color-profile" } diff --git a/crates/swc_css_minifier/src/compressor/selector.rs b/crates/swc_css_minifier/src/compressor/selector.rs index 06d113473a76..d3a031b26cb6 100644 --- a/crates/swc_css_minifier/src/compressor/selector.rs +++ b/crates/swc_css_minifier/src/compressor/selector.rs @@ -1,4 +1,3 @@ -use swc_atoms::js_word; use swc_common::DUMMY_SP; use swc_css_ast::*; @@ -42,7 +41,7 @@ impl Compressor { }) if *a == 2 && (*b == 1 || b % 2 == -1) => { *an_plus_b = AnPlusB::Ident(Ident { span: *span, - value: js_word!("odd"), + value: "odd".into(), raw: None, }); } @@ -62,7 +61,7 @@ impl Compressor { }); } // `even` => `2n` - AnPlusB::Ident(Ident { value, span, .. }) if *value == js_word!("even") => { + AnPlusB::Ident(Ident { value, span, .. }) if *value == "even" => { *an_plus_b = AnPlusB::AnPlusBNotation(AnPlusBNotation { span: *span, a: Some(2), @@ -109,11 +108,8 @@ impl Compressor { match &subclass_selector { SubclassSelector::PseudoElement(PseudoElementSelector { name, span, .. }) => { if matches!( - name.value, - js_word!("before") - | js_word!("after") - | js_word!("first-letter") - | js_word!("first-line") + &*name.value, + "before" | "after" | "first-letter" | "first-line" ) { *subclass_selector = SubclassSelector::PseudoClass(PseudoClassSelector { span: *span, @@ -127,88 +123,82 @@ impl Compressor { children: Some(children), span, .. - }) if name.value == js_word!("nth-child") && children.len() == 1 => { - match children.get(0) { - Some(PseudoClassSelectorChildren::AnPlusB(AnPlusB::AnPlusBNotation( - AnPlusBNotation { - a: None, - b: Some(b), - .. + }) if name.value == "nth-child" && children.len() == 1 => match children.get(0) { + Some(PseudoClassSelectorChildren::AnPlusB(AnPlusB::AnPlusBNotation( + AnPlusBNotation { + a: None, + b: Some(b), + .. + }, + ))) if *b == 1 => { + *subclass_selector = SubclassSelector::PseudoClass(PseudoClassSelector { + span: *span, + name: Ident { + span: DUMMY_SP, + value: "first-child".into(), + raw: None, }, - ))) if *b == 1 => { - *subclass_selector = SubclassSelector::PseudoClass(PseudoClassSelector { - span: *span, - name: Ident { - span: DUMMY_SP, - value: js_word!("first-child"), - raw: None, - }, - children: None, - }) - } - _ => {} + children: None, + }) } - } + _ => {} + }, SubclassSelector::PseudoClass(PseudoClassSelector { name, children: Some(children), span, .. - }) if name.value == js_word!("nth-last-child") && children.len() == 1 => { - match children.get(0) { - Some(PseudoClassSelectorChildren::AnPlusB(AnPlusB::AnPlusBNotation( - AnPlusBNotation { - a: None, - b: Some(b), - .. + }) if name.value == "nth-last-child" && children.len() == 1 => match children.get(0) { + Some(PseudoClassSelectorChildren::AnPlusB(AnPlusB::AnPlusBNotation( + AnPlusBNotation { + a: None, + b: Some(b), + .. + }, + ))) if *b == 1 => { + *subclass_selector = SubclassSelector::PseudoClass(PseudoClassSelector { + span: *span, + name: Ident { + span: DUMMY_SP, + value: "last-child".into(), + raw: None, }, - ))) if *b == 1 => { - *subclass_selector = SubclassSelector::PseudoClass(PseudoClassSelector { - span: *span, - name: Ident { - span: DUMMY_SP, - value: js_word!("last-child"), - raw: None, - }, - children: None, - }) - } - _ => {} + children: None, + }) } - } + _ => {} + }, SubclassSelector::PseudoClass(PseudoClassSelector { name, children: Some(children), span, .. - }) if name.value == js_word!("nth-of-type") && children.len() == 1 => { - match children.get(0) { - Some(PseudoClassSelectorChildren::AnPlusB(AnPlusB::AnPlusBNotation( - AnPlusBNotation { - a: None, - b: Some(b), - .. + }) if name.value == "nth-of-type" && children.len() == 1 => match children.get(0) { + Some(PseudoClassSelectorChildren::AnPlusB(AnPlusB::AnPlusBNotation( + AnPlusBNotation { + a: None, + b: Some(b), + .. + }, + ))) if *b == 1 => { + *subclass_selector = SubclassSelector::PseudoClass(PseudoClassSelector { + span: *span, + name: Ident { + span: DUMMY_SP, + value: "first-of-type".into(), + raw: None, }, - ))) if *b == 1 => { - *subclass_selector = SubclassSelector::PseudoClass(PseudoClassSelector { - span: *span, - name: Ident { - span: DUMMY_SP, - value: js_word!("first-of-type"), - raw: None, - }, - children: None, - }) - } - _ => {} + children: None, + }) } - } + _ => {} + }, SubclassSelector::PseudoClass(PseudoClassSelector { name, children: Some(children), span, .. - }) if name.value == js_word!("nth-last-of-type") && children.len() == 1 => { + }) if name.value == "nth-last-of-type" && children.len() == 1 => { match children.get(0) { Some(PseudoClassSelectorChildren::AnPlusB(AnPlusB::AnPlusBNotation( AnPlusBNotation { @@ -221,7 +211,7 @@ impl Compressor { span: *span, name: Ident { span: DUMMY_SP, - value: js_word!("last-of-type"), + value: "last-of-type".into(), raw: None, }, children: None, diff --git a/crates/swc_css_minifier/src/compressor/time.rs b/crates/swc_css_minifier/src/compressor/time.rs index f6db5ddf6ba2..7623f144ef1f 100644 --- a/crates/swc_css_minifier/src/compressor/time.rs +++ b/crates/swc_css_minifier/src/compressor/time.rs @@ -1,12 +1,11 @@ -use swc_atoms::js_word; use swc_css_ast::*; use super::Compressor; impl Compressor { pub(super) fn compress_time(&self, time: &mut Time) { - match time.unit.value { - js_word!("ms") if time.value.value == 0.0 || time.value.value >= 100.0 => { + match &*time.unit.value { + "ms" if time.value.value == 0.0 || time.value.value >= 100.0 => { let new_value = time.value.value / 1000.0; time.value = Number { @@ -16,11 +15,11 @@ impl Compressor { }; time.unit = Ident { span: time.unit.span, - value: js_word!("s"), + value: "s".into(), raw: None, }; } - js_word!("s") if time.value.value > 0.0 && time.value.value < 0.1 => { + "s" if time.value.value > 0.0 && time.value.value < 0.1 => { let new_value = time.value.value * 1000.0; time.value = Number { @@ -30,7 +29,7 @@ impl Compressor { }; time.unit = Ident { span: time.unit.span, - value: js_word!("ms"), + value: "ms".into(), raw: None, }; } diff --git a/crates/swc_css_minifier/src/compressor/transform_function.rs b/crates/swc_css_minifier/src/compressor/transform_function.rs index d57ab4c2d7b1..099d7f0e14a7 100644 --- a/crates/swc_css_minifier/src/compressor/transform_function.rs +++ b/crates/swc_css_minifier/src/compressor/transform_function.rs @@ -1,4 +1,3 @@ -use swc_atoms::js_word; use swc_common::Spanned; use swc_css_ast::*; @@ -11,7 +10,7 @@ impl Compressor { name, value: function_value, .. - }) if name == &js_word!("translate") && function_value.len() == 3 => { + }) if name == "translate" && function_value.len() == 3 => { match (function_value.get(0), function_value.get(2)) { ( Some(first), @@ -31,7 +30,7 @@ impl Compressor { ) if *first_number == 0 => { *name = FunctionName::Ident(Ident { span: name.span(), - value: js_word!("translatey"), + value: "translatey".into(), raw: None, }); *function_value = vec![second.clone()]; @@ -43,7 +42,7 @@ impl Compressor { name, value: function_value, .. - }) if name == &js_word!("translate3d") && function_value.len() == 5 => { + }) if name == "translate3d" && function_value.len() == 5 => { match ( function_value.get(0), function_value.get(2), @@ -62,7 +61,7 @@ impl Compressor { ) if *first_number == 0 && *second_number == 0 => { *name = FunctionName::Ident(Ident { span: name.span(), - value: js_word!("translatez"), + value: "translatez".into(), raw: None, }); *function_value = vec![third.clone()]; @@ -74,7 +73,7 @@ impl Compressor { name, value: function_value, .. - }) if name == &js_word!("scale") && function_value.len() == 3 => { + }) if name == "scale" && function_value.len() == 3 => { match (function_value.get(0), function_value.get(2)) { ( Some( @@ -99,7 +98,7 @@ impl Compressor { ) if *second_number == 1 => { *name = FunctionName::Ident(Ident { span: name.span(), - value: js_word!("scalex"), + value: "scalex".into(), raw: None, }); *function_value = vec![first.clone()]; @@ -113,7 +112,7 @@ impl Compressor { ) if *first_number == 1 => { *name = FunctionName::Ident(Ident { span: name.span(), - value: js_word!("scaley"), + value: "scaley".into(), raw: None, }); *function_value = vec![second.clone()]; @@ -125,7 +124,7 @@ impl Compressor { name, value: function_value, .. - }) if name == &js_word!("scale3d") && function_value.len() == 5 => { + }) if name == "scale3d" && function_value.len() == 5 => { match ( function_value.get(0), function_value.get(2), @@ -144,7 +143,7 @@ impl Compressor { ) if *second_number == 1 && *third_number == 1 => { *name = FunctionName::Ident(Ident { span: name.span(), - value: js_word!("scalex"), + value: "scalex".into(), raw: None, }); *function_value = vec![first.clone()]; @@ -162,7 +161,7 @@ impl Compressor { ) if *first_number == 1 && *third_number == 1 => { *name = FunctionName::Ident(Ident { span: name.span(), - value: js_word!("scaley"), + value: "scaley".into(), raw: None, }); *function_value = vec![second.clone()]; @@ -180,7 +179,7 @@ impl Compressor { ) if *first_number == 1 && *second_number == 1 => { *name = FunctionName::Ident(Ident { span: name.span(), - value: js_word!("scalez"), + value: "scalez".into(), raw: None, }); *function_value = vec![third.clone()]; @@ -192,7 +191,7 @@ impl Compressor { name, value: function_value, .. - }) if name == &js_word!("matrix3d") && function_value.len() == 31 => { + }) if name == "matrix3d" && function_value.len() == 31 => { match ( function_value.get(0), function_value.get(1), @@ -281,7 +280,7 @@ impl Compressor { { *name = FunctionName::Ident(Ident { span: name.span(), - value: js_word!("matrix"), + value: "matrix".into(), raw: None, }); *function_value = vec![ @@ -305,7 +304,7 @@ impl Compressor { name, value: function_value, .. - }) if name == &js_word!("rotate3d") && function_value.len() == 7 => { + }) if name == "rotate3d" && function_value.len() == 7 => { match ( function_value.get(0), function_value.get(2), @@ -329,7 +328,7 @@ impl Compressor { ) if *first_number == 1 && *second_number == 0 && *third_number == 0 => { *name = FunctionName::Ident(Ident { span: name.span(), - value: js_word!("rotatex"), + value: "rotatex".into(), raw: None, }); *function_value = vec![fourth_value.clone()]; @@ -351,7 +350,7 @@ impl Compressor { ) if *first_number == 0 && *second_number == 1 && *third_number == 0 => { *name = FunctionName::Ident(Ident { span: name.span(), - value: js_word!("rotatey"), + value: "rotatey".into(), raw: None, }); *function_value = vec![fourth_value.clone()]; @@ -373,7 +372,7 @@ impl Compressor { ) if *first_number == 0 && *second_number == 0 && *third_number == 1 => { *name = FunctionName::Ident(Ident { span: name.span(), - value: js_word!("rotate"), + value: "rotate".into(), raw: None, }); *function_value = vec![fourth_value.clone()]; @@ -385,10 +384,10 @@ impl Compressor { name, value: function_value, .. - }) if name == &js_word!("rotatez") && function_value.len() == 1 => { + }) if name == "rotatez" && function_value.len() == 1 => { *name = FunctionName::Ident(Ident { span: name.span(), - value: js_word!("rotate"), + value: "rotate".into(), raw: None, }); } @@ -397,7 +396,7 @@ impl Compressor { name, value: function_value, .. - }) if name == &js_word!("skew") && function_value.len() == 3 => { + }) if name == "skew" && function_value.len() == 3 => { match (function_value.get(0), function_value.get(2)) { ( Some(first), @@ -408,7 +407,7 @@ impl Compressor { ) if *second_number == 0 => { *name = FunctionName::Ident(Ident { span: name.span(), - value: js_word!("skewx"), + value: "skewx".into(), raw: None, }); *function_value = vec![first.clone()]; @@ -423,7 +422,7 @@ impl Compressor { ) if *first_number == 0 => { *name = FunctionName::Ident(Ident { span: name.span(), - value: js_word!("skewy"), + value: "skewy".into(), raw: None, }); *function_value = vec![second.clone()]; diff --git a/crates/swc_css_minifier/src/compressor/url.rs b/crates/swc_css_minifier/src/compressor/url.rs index f5e700a25dbd..e606b2072c8e 100644 --- a/crates/swc_css_minifier/src/compressor/url.rs +++ b/crates/swc_css_minifier/src/compressor/url.rs @@ -1,11 +1,10 @@ -use swc_atoms::js_word; use swc_css_ast::*; use super::Compressor; impl Compressor { pub(super) fn compress_url(&self, url: &mut Url) { - if url.name.value != js_word!("url") { + if url.name.value != "url" { return; } diff --git a/crates/swc_css_minifier/src/lib.rs b/crates/swc_css_minifier/src/lib.rs index 5d246e243a1c..baa353cdb4f4 100644 --- a/crates/swc_css_minifier/src/lib.rs +++ b/crates/swc_css_minifier/src/lib.rs @@ -2,8 +2,9 @@ #![deny(clippy::all)] #![allow(clippy::match_like_matches_macro)] #![allow(clippy::needless_update)] +#![allow(clippy::mutable_key_type)] -use swc_atoms::{js_word, JsWord}; +use swc_atoms::JsWord; use swc_css_ast::*; use swc_css_visit::VisitMutWith; @@ -22,12 +23,12 @@ fn is_css_wide_keyword(ident: &JsWord) -> bool { matches_eq_ignore_ascii_case!( ident, // CSS Values and Units Level 3: https://drafts.csswg.org/css-values-3/#common-keywords - js_word!("initial"), - js_word!("inherit"), - js_word!("unset"), - js_word!("default"), + "initial", + "inherit", + "unset", + "default", // CSS Cascading and Inheritance Level 5: https://drafts.csswg.org/css-cascade-5/#defaulting-keywords - js_word!("revert"), - js_word!("revert-layer") + "revert", + "revert-layer" ) } diff --git a/crates/swc_css_modules/src/imports.rs b/crates/swc_css_modules/src/imports.rs index f7caa2c8377a..1ef96f9794ea 100644 --- a/crates/swc_css_modules/src/imports.rs +++ b/crates/swc_css_modules/src/imports.rs @@ -1,6 +1,6 @@ //! Import/export analyzer -use swc_atoms::{js_word, JsWord}; +use swc_atoms::JsWord; use swc_css_ast::{ ComponentValue, Declaration, DeclarationName, Ident, ImportHref, ImportPrelude, Stylesheet, UrlValue, @@ -51,15 +51,14 @@ impl Visit for Analyzer { if &*name.value == "composes" { // composes: name from 'foo.css' if d.value.len() >= 3 { - if let ( - ComponentValue::Ident(box Ident { - value: js_word!("from"), - .. - }), - ComponentValue::Str(s), - ) = (&d.value[d.value.len() - 2], &d.value[d.value.len() - 1]) - { - self.imports.push(s.value.clone()); + match (&d.value[d.value.len() - 2], &d.value[d.value.len() - 1]) { + ( + ComponentValue::Ident(box Ident { value: from, .. }), + ComponentValue::Str(s), + ) if &**from == "from" => { + self.imports.push(s.value.clone()); + } + _ => (), } } } diff --git a/crates/swc_css_modules/src/lib.rs b/crates/swc_css_modules/src/lib.rs index 49678021c426..7c113213d5dd 100644 --- a/crates/swc_css_modules/src/lib.rs +++ b/crates/swc_css_modules/src/lib.rs @@ -1,7 +1,7 @@ #![feature(box_patterns)] use rustc_hash::FxHashMap; -use swc_atoms::{js_word, JsWord}; +use swc_atoms::JsWord; use swc_common::{util::take::Take, Span}; use swc_css_ast::{ ComplexSelector, ComplexSelectorChildren, ComponentValue, Declaration, DeclarationName, @@ -119,7 +119,7 @@ where ); } KeyframesName::PseudoFunction(pseudo_function) - if pseudo_function.pseudo.value == js_word!("local") => + if pseudo_function.pseudo.value == "local" => { match &pseudo_function.name { KeyframesName::CustomIdent(custom_ident) => { @@ -137,9 +137,7 @@ where return; } - KeyframesName::PseudoPrefix(pseudo_prefix) - if pseudo_prefix.pseudo.value == js_word!("local") => - { + KeyframesName::PseudoPrefix(pseudo_prefix) if pseudo_prefix.pseudo.value == "local" => { match &pseudo_prefix.name { KeyframesName::CustomIdent(custom_ident) => { *n = KeyframesName::CustomIdent(custom_ident.clone()); @@ -157,7 +155,7 @@ where return; } KeyframesName::PseudoFunction(pseudo_function) - if pseudo_function.pseudo.value == js_word!("global") => + if pseudo_function.pseudo.value == "global" => { match &pseudo_function.name { KeyframesName::CustomIdent(custom_ident) => { @@ -174,7 +172,7 @@ where return; } KeyframesName::PseudoPrefix(pseudo_prefix) - if pseudo_prefix.pseudo.value == js_word!("global") => + if pseudo_prefix.pseudo.value == "global" => { match &pseudo_prefix.name { KeyframesName::CustomIdent(custom_ident) => { @@ -278,12 +276,9 @@ where if n.value.len() >= 3 { match (&n.value[n.value.len() - 2], &n.value[n.value.len() - 1]) { ( - ComponentValue::Ident(box Ident { - value: js_word!("from"), - .. - }), + ComponentValue::Ident(box Ident { value, .. }), ComponentValue::Str(import_source), - ) => { + ) if &**value == "from" => { for class_name in n.value.iter().take(n.value.len() - 2) { if let ComponentValue::Ident(value) = class_name { composes_for_current.push(CssClassName::Import { @@ -296,15 +291,9 @@ where return; } ( - ComponentValue::Ident(box Ident { - value: js_word!("from"), - .. - }), - ComponentValue::Ident(box Ident { - value: js_word!("global"), - .. - }), - ) => { + ComponentValue::Ident(box Ident { value: from, .. }), + ComponentValue::Ident(box Ident { value: global, .. }), + ) if &**from == "from" && &**global == "global" => { for class_name in n.value.iter().take(n.value.len() - 2) { if let ComponentValue::Ident(value) = class_name { composes_for_current.push(CssClassName::Global { @@ -336,8 +325,8 @@ where } if let DeclarationName::Ident(name) = &n.name { - match name.value { - js_word!("animation") => { + match &*name.value { + "animation" => { let mut can_change = true; let mut iteration_count_visited = false; @@ -355,9 +344,9 @@ where continue; } - match *value { + match &**value { // iteration-count - js_word!("infinite") => { + "infinite" => { if !iteration_count_visited { iteration_count_visited = true; continue; @@ -365,40 +354,29 @@ where } // fill-mode // NOTE: `animation: none:` will be trapped here - js_word!("none") - | js_word!("forwards") - | js_word!("backwards") - | js_word!("both") => { + "none" | "forwards" | "backwards" | "both" => { if !fill_mode_visited { fill_mode_visited = true; continue; } } // direction - js_word!("normal") - | js_word!("reverse") - | js_word!("alternate") - | js_word!("alternate-reverse") => { + "normal" | "reverse" | "alternate" | "alternate-reverse" => { if !direction_visited { direction_visited = true; continue; } } // easing-function - js_word!("linear") - | js_word!("ease") - | js_word!("ease-in") - | js_word!("ease-out") - | js_word!("ease-in-out") - | js_word!("step-start") - | js_word!("step-end") => { + "linear" | "ease" | "ease-in" | "ease-out" | "ease-in-out" + | "step-start" | "step-end" => { if !easing_function_visited { easing_function_visited = true; continue; } } // play-state - js_word!("running") | js_word!("paused") => { + "running" | "paused" => { if !play_state_visited { play_state_visited = true; continue; @@ -424,11 +402,9 @@ where } ComponentValue::Function(f) => { if let FunctionName::Ident(ident) = &f.name { - match ident.value { + match &*ident.value { // easing-function - js_word!("steps") - | js_word!("cubic-bezier") - | js_word!("linear") => { + "steps" | "cubic-bezier" | "linear" => { easing_function_visited = true; } _ => { @@ -459,7 +435,7 @@ where } } } - js_word!("animation-name") => { + "animation-name" => { for v in &mut n.value { if let ComponentValue::Ident(box Ident { span, value, raw, .. diff --git a/crates/swc_css_parser/src/lexer/mod.rs b/crates/swc_css_parser/src/lexer/mod.rs index ad05725ceb11..391b3c8640b6 100644 --- a/crates/swc_css_parser/src/lexer/mod.rs +++ b/crates/swc_css_parser/src/lexer/mod.rs @@ -1,6 +1,6 @@ use std::{cell::RefCell, char::REPLACEMENT_CHARACTER, rc::Rc}; -use swc_atoms::{js_word, Atom, JsWord}; +use swc_atoms::{Atom, JsWord}; use swc_common::{input::Input, BytePos, Span}; use swc_css_ast::{ matches_eq_ignore_ascii_case, DimensionToken, NumberType, Token, TokenAndSpan, UrlKeyValue, @@ -578,9 +578,7 @@ where // If string’s value is an ASCII case-insensitive match for "url", and the next // input code point is U+0028 LEFT PARENTHESIS ((), consume it. - if matches_eq_ignore_ascii_case!(ident_sequence.0, js_word!("url")) - && self.next() == Some('(') - { + if matches_eq_ignore_ascii_case!(ident_sequence.0, "url") && self.next() == Some('(') { self.consume(); let start_whitespace = self.input.last_pos(); diff --git a/crates/swc_css_parser/src/macros.rs b/crates/swc_css_parser/src/macros.rs index 4a8f21bb09eb..17e493771efe 100644 --- a/crates/swc_css_parser/src/macros.rs +++ b/crates/swc_css_parser/src/macros.rs @@ -148,6 +148,6 @@ macro_rules! tok { }; ("to") => { - swc_css_ast::Token::Ident { value: js_word!("to"), .. } + swc_css_ast::Token::Ident { value: "to", .. } }; } diff --git a/crates/swc_css_parser/src/parser/at_rules/mod.rs b/crates/swc_css_parser/src/parser/at_rules/mod.rs index fee6245cc592..438ad0ab8549 100644 --- a/crates/swc_css_parser/src/parser/at_rules/mod.rs +++ b/crates/swc_css_parser/src/parser/at_rules/mod.rs @@ -1,4 +1,3 @@ -use swc_atoms::{js_word, JsWord}; use swc_common::{Span, Spanned}; use swc_css_ast::*; @@ -13,12 +12,9 @@ impl Parser where I: ParserInput, { - pub(super) fn parse_at_rule_prelude( - &mut self, - name: &JsWord, - ) -> PResult> { - let prelude = match *name { - js_word!("charset") => { + pub(super) fn parse_at_rule_prelude(&mut self, name: &str) -> PResult> { + let prelude = match name { + "charset" => { self.input.skip_ws(); let prelude = AtRulePrelude::CharsetPrelude(self.parse()?); @@ -27,7 +23,7 @@ where Some(prelude) } - js_word!("color-profile") => { + "color-profile" => { self.input.skip_ws(); let name = match cur!(self) { @@ -55,7 +51,7 @@ where Some(prelude) } - js_word!("container") => { + "container" => { self.input.skip_ws(); let prelude = AtRulePrelude::ContainerPrelude(self.parse()?); @@ -64,7 +60,7 @@ where Some(prelude) } - js_word!("counter-style") => { + "counter-style" => { self.input.skip_ws(); let prelude = AtRulePrelude::CounterStylePrelude(self.parse()?); @@ -73,7 +69,7 @@ where Some(prelude) } - js_word!("custom-media") => { + "custom-media" => { self.input.skip_ws(); let prelude = AtRulePrelude::CustomMediaPrelude(self.parse()?); @@ -82,7 +78,7 @@ where Some(prelude) } - js_word!("document") | js_word!("-moz-document") => { + "document" | "-moz-document" => { self.input.skip_ws(); let span = self.input.cur_span(); @@ -110,7 +106,7 @@ where Some(prelude) } - js_word!("font-face") => { + "font-face" => { self.input.skip_ws(); if !is!(self, EOF) { @@ -121,7 +117,7 @@ where None } - js_word!("font-feature-values") => { + "font-feature-values" => { self.input.skip_ws(); let prelude = AtRulePrelude::FontFeatureValuesPrelude(self.parse()?); @@ -130,7 +126,7 @@ where Some(prelude) } - js_word!("font-palette-values") => { + "font-palette-values" => { self.input.skip_ws(); let prelude = AtRulePrelude::FontPaletteValuesPrelude(self.parse()?); @@ -139,13 +135,8 @@ where Some(prelude) } - js_word!("stylistic") - | js_word!("historical-forms") - | js_word!("styleset") - | js_word!("character-variant") - | js_word!("swash") - | js_word!("ornaments") - | js_word!("annotation") + "stylistic" | "historical-forms" | "styleset" | "character-variant" | "swash" + | "ornaments" | "annotation" if self.ctx.in_font_feature_values_at_rule => { self.input.skip_ws(); @@ -158,7 +149,7 @@ where None } - js_word!("import") => { + "import" => { self.input.skip_ws(); let span = self.input.cur_span(); @@ -180,7 +171,7 @@ where let layer_name = if !is!(self, EOF) { match cur!(self) { Token::Ident { value, .. } - if matches_eq_ignore_ascii_case!(value, js_word!("layer")) => + if matches_eq_ignore_ascii_case!(value, "layer") => { let name = ImportLayerName::Ident(self.parse()?); @@ -189,7 +180,7 @@ where Some(Box::new(name)) } Token::Function { value, .. } - if matches_eq_ignore_ascii_case!(value, js_word!("layer")) => + if matches_eq_ignore_ascii_case!(value, "layer") => { let ctx = Ctx { in_import_at_rule: true, @@ -222,11 +213,8 @@ where Some(prelude) } - js_word!("keyframes") - | js_word!("-webkit-keyframes") - | js_word!("-moz-keyframes") - | js_word!("-o-keyframes") - | js_word!("-ms-keyframes") => { + "keyframes" | "-webkit-keyframes" | "-moz-keyframes" | "-o-keyframes" + | "-ms-keyframes" => { self.input.skip_ws(); let prelude = AtRulePrelude::KeyframesPrelude(self.parse()?); @@ -235,7 +223,7 @@ where Some(prelude) } - js_word!("layer") => { + "layer" => { self.input.skip_ws(); if is!(self, Ident) { @@ -278,7 +266,7 @@ where None } } - js_word!("media") => { + "media" => { self.input.skip_ws(); let media = if !is!(self, EOF) { @@ -293,7 +281,7 @@ where media } - js_word!("namespace") => { + "namespace" => { self.input.skip_ws(); let span = self.input.cur_span(); @@ -334,7 +322,7 @@ where Some(prelude) } - js_word!("nest") => { + "nest" => { self.input.skip_ws(); let prelude = AtRulePrelude::NestPrelude(self.parse()?); @@ -343,7 +331,7 @@ where Some(prelude) } - js_word!("page") => { + "page" => { self.input.skip_ws(); let prelude = if !is!(self, EOF) { @@ -356,22 +344,22 @@ where prelude } - js_word!("top-left-corner") - | js_word!("top-left") - | js_word!("top-center") - | js_word!("top-right") - | js_word!("top-right-corner") - | js_word!("bottom-left-corner") - | js_word!("bottom-left") - | js_word!("bottom-center") - | js_word!("bottom-right") - | js_word!("bottom-right-corner") - | js_word!("left-top") - | js_word!("left-middle") - | js_word!("left-bottom") - | js_word!("right-top") - | js_word!("right-middle") - | js_word!("right-bottom") + "top-left-corner" + | "top-left" + | "top-center" + | "top-right" + | "top-right-corner" + | "bottom-left-corner" + | "bottom-left" + | "bottom-center" + | "bottom-right" + | "bottom-right-corner" + | "left-top" + | "left-middle" + | "left-bottom" + | "right-top" + | "right-middle" + | "right-bottom" if self.ctx.in_page_at_rule => { self.input.skip_ws(); @@ -384,7 +372,7 @@ where None } - js_word!("property") => { + "property" => { self.input.skip_ws(); let prelude = AtRulePrelude::PropertyPrelude(self.parse()?); @@ -393,7 +381,7 @@ where Some(prelude) } - js_word!("supports") => { + "supports" => { self.input.skip_ws(); let prelude = AtRulePrelude::SupportsPrelude(self.parse()?); @@ -402,7 +390,7 @@ where Some(prelude) } - js_word!("viewport") | js_word!("-ms-viewport") | js_word!("-o-viewport") => { + "viewport" | "-ms-viewport" | "-o-viewport" => { self.input.skip_ws(); if !is!(self, EOF) { @@ -413,7 +401,7 @@ where None } - js_word!("starting-style") => { + "starting-style" => { self.input.skip_ws(); if !is!(self, EOF) { @@ -424,7 +412,7 @@ where None } - js_word!("scope") => { + "scope" => { self.input.skip_ws(); let prelude = AtRulePrelude::ScopePrelude(self.parse()?); @@ -450,14 +438,14 @@ where Ok(prelude) } - pub(super) fn parse_at_rule_block(&mut self, name: &JsWord) -> PResult> { - let block_contents = match *name { - js_word!("charset") => { + pub(super) fn parse_at_rule_block(&mut self, name: &str) -> PResult> { + let block_contents = match name { + "charset" => { let span = self.input.cur_span(); return Err(Error::new(span, ErrorKind::Unexpected("'{' token"))); } - js_word!("color-profile") => { + "color-profile" => { let declaration_list: Vec = self.parse()?; let declaration_list: Vec = declaration_list .into_iter() @@ -466,7 +454,7 @@ where declaration_list } - js_word!("container") => match self.ctx.block_contents_grammar { + "container" => match self.ctx.block_contents_grammar { BlockContentsGrammar::StyleBlock => { let ctx = Ctx { in_container_at_rule: true, @@ -490,7 +478,7 @@ where rule_list } }, - js_word!("counter-style") => { + "counter-style" => { let declaration_list: Vec = self.parse()?; let declaration_list: Vec = declaration_list .into_iter() @@ -499,30 +487,28 @@ where declaration_list } - js_word!("custom-media") => { + "custom-media" => { let span = self.input.cur_span(); return Err(Error::new(span, ErrorKind::Unexpected("'{' token"))); } - js_word!("document") | js_word!("-moz-document") => { - match self.ctx.block_contents_grammar { - BlockContentsGrammar::StyleBlock => { - let style_blocks: Vec = self.parse()?; - let style_blocks: Vec = - style_blocks.into_iter().map(ComponentValue::from).collect(); + "document" | "-moz-document" => match self.ctx.block_contents_grammar { + BlockContentsGrammar::StyleBlock => { + let style_blocks: Vec = self.parse()?; + let style_blocks: Vec = + style_blocks.into_iter().map(ComponentValue::from).collect(); - style_blocks - } - _ => { - let rule_list = self.parse_as::>()?; - let rule_list: Vec = - rule_list.into_iter().map(ComponentValue::from).collect(); + style_blocks + } + _ => { + let rule_list = self.parse_as::>()?; + let rule_list: Vec = + rule_list.into_iter().map(ComponentValue::from).collect(); - rule_list - } + rule_list } - } - js_word!("font-face") => { + }, + "font-face" => { let declaration_list: Vec = self.parse()?; let declaration_list: Vec = declaration_list .into_iter() @@ -531,7 +517,7 @@ where declaration_list } - js_word!("font-feature-values") => { + "font-feature-values" => { let ctx = Ctx { in_font_feature_values_at_rule: true, ..self.ctx @@ -544,13 +530,8 @@ where declaration_list } - js_word!("stylistic") - | js_word!("historical-forms") - | js_word!("styleset") - | js_word!("character-variant") - | js_word!("swash") - | js_word!("ornaments") - | js_word!("annotation") + "stylistic" | "historical-forms" | "styleset" | "character-variant" | "swash" + | "ornaments" | "annotation" if self.ctx.in_font_feature_values_at_rule => { let declaration_list: Vec = self.parse()?; @@ -561,7 +542,7 @@ where declaration_list } - js_word!("font-palette-values") => { + "font-palette-values" => { let declaration_list: Vec = self.parse()?; let declaration_list: Vec = declaration_list .into_iter() @@ -570,16 +551,13 @@ where declaration_list } - js_word!("import") => { + "import" => { let span = self.input.cur_span(); return Err(Error::new(span, ErrorKind::Unexpected("'{' token"))); } - js_word!("keyframes") - | js_word!("-webkit-keyframes") - | js_word!("-moz-keyframes") - | js_word!("-o-keyframes") - | js_word!("-ms-keyframes") => { + "keyframes" | "-webkit-keyframes" | "-moz-keyframes" | "-o-keyframes" + | "-ms-keyframes" => { let ctx = Ctx { block_contents_grammar: BlockContentsGrammar::RuleList, in_keyframes_at_rule: true, @@ -649,14 +627,14 @@ where rule_list } - js_word!("layer") => { + "layer" => { let rule_list = self.parse_as::>()?; let rule_list: Vec = rule_list.into_iter().map(ComponentValue::from).collect(); rule_list } - js_word!("media") => match self.ctx.block_contents_grammar { + "media" => match self.ctx.block_contents_grammar { BlockContentsGrammar::StyleBlock => { let style_blocks: Vec = self.parse()?; let style_blocks: Vec = @@ -672,19 +650,19 @@ where rule_list } }, - js_word!("namespace") => { + "namespace" => { let span = self.input.cur_span(); return Err(Error::new(span, ErrorKind::Unexpected(""))); } - js_word!("nest") => { + "nest" => { let style_blocks: Vec = self.parse()?; let style_blocks: Vec = style_blocks.into_iter().map(ComponentValue::from).collect(); style_blocks } - js_word!("page") => { + "page" => { let declaration_list = self .with_ctx(Ctx { in_page_at_rule: true, @@ -698,22 +676,22 @@ where declaration_list } - js_word!("top-left-corner") - | js_word!("top-left") - | js_word!("top-center") - | js_word!("top-right") - | js_word!("top-right-corner") - | js_word!("bottom-left-corner") - | js_word!("bottom-left") - | js_word!("bottom-center") - | js_word!("bottom-right") - | js_word!("bottom-right-corner") - | js_word!("left-top") - | js_word!("left-middle") - | js_word!("left-bottom") - | js_word!("right-top") - | js_word!("right-middle") - | js_word!("right-bottom") + "top-left-corner" + | "top-left" + | "top-center" + | "top-right" + | "top-right-corner" + | "bottom-left-corner" + | "bottom-left" + | "bottom-center" + | "bottom-right" + | "bottom-right-corner" + | "left-top" + | "left-middle" + | "left-bottom" + | "right-top" + | "right-middle" + | "right-bottom" if self.ctx.in_page_at_rule => { let declaration_list: Vec = self.parse()?; @@ -724,7 +702,7 @@ where declaration_list } - js_word!("property") => { + "property" => { let declaration_list: Vec = self.parse()?; let declaration_list: Vec = declaration_list .into_iter() @@ -733,7 +711,7 @@ where declaration_list } - js_word!("supports") => match self.ctx.block_contents_grammar { + "supports" => match self.ctx.block_contents_grammar { BlockContentsGrammar::StyleBlock => { let style_blocks: Vec = self.parse()?; let style_blocks: Vec = @@ -749,7 +727,7 @@ where rule_list } }, - js_word!("viewport") | js_word!("-ms-viewport") | js_word!("-o-viewport") => { + "viewport" | "-ms-viewport" | "-o-viewport" => { let declaration_list: Vec = self.parse()?; let declaration_list: Vec = declaration_list .into_iter() @@ -758,14 +736,14 @@ where declaration_list } - js_word!("starting-style") => { + "starting-style" => { let rule_list = self.parse_as::>()?; let rule_list: Vec = rule_list.into_iter().map(ComponentValue::from).collect(); rule_list } - js_word!("scope") => { + "scope" => { let rule_list = self.parse_as::>()?; let rule_list: Vec = rule_list.into_iter().map(ComponentValue::from).collect(); @@ -791,7 +769,7 @@ where let supports = if !is!(self, EOF) { match cur!(self) { Token::Function { value, .. } - if matches_eq_ignore_ascii_case!(value, js_word!("supports")) => + if matches_eq_ignore_ascii_case!(value, "supports") => { let ctx = Ctx { in_import_at_rule: true, @@ -840,11 +818,7 @@ where match cur!(self) { Token::Function { value, .. } - if matches_eq_ignore_ascii_case!( - value, - js_word!("local"), - js_word!("global") - ) => + if matches_eq_ignore_ascii_case!(value, "local", "global") => { let span = self.input.cur_span(); let pseudo = match bump!(self) { @@ -875,11 +849,7 @@ where ))) } Token::Ident { value, .. } - if matches_eq_ignore_ascii_case!( - value, - js_word!("local"), - js_word!("global") - ) => + if matches_eq_ignore_ascii_case!(value, "local", "global") => { let pseudo = self.parse()?; @@ -908,7 +878,7 @@ where tok!("ident") => { let custom_ident: CustomIdent = self.parse()?; - if matches_eq_ignore_ascii_case!(custom_ident.value, js_word!("none")) { + if matches_eq_ignore_ascii_case!(custom_ident.value, "none") { return Err(Error::new( custom_ident.span, ErrorKind::InvalidCustomIdent(custom_ident.value), @@ -938,7 +908,7 @@ where ident.value = ident.value.to_ascii_lowercase(); - if ident.value != js_word!("from") && ident.value != js_word!("to") { + if ident.value != "from" && ident.value != "to" { return Err(Error::new( ident.span, ErrorKind::Expected("'from' or 'to' idents"), @@ -1321,7 +1291,7 @@ where value: function_name, .. } => { - if matches_eq_ignore_ascii_case!(function_name, js_word!("url"), js_word!("src")) { + if matches_eq_ignore_ascii_case!(function_name, "url", "src") { Ok(DocumentPreludeMatchingFunction::Url(self.parse()?)) } else { // TODO improve me @@ -2064,13 +2034,7 @@ where let value = match cur!(self) { Token::Ident { value, .. } - if matches_eq_ignore_ascii_case!( - value, - js_word!("left"), - js_word!("right"), - js_word!("first"), - js_word!("blank") - ) => + if matches_eq_ignore_ascii_case!(value, "left", "right", "first", "blank") => { let mut name: Ident = self.parse()?; diff --git a/crates/swc_css_parser/src/parser/input.rs b/crates/swc_css_parser/src/parser/input.rs index 96634ea0a5cb..fc6c02a22472 100644 --- a/crates/swc_css_parser/src/parser/input.rs +++ b/crates/swc_css_parser/src/parser/input.rs @@ -1,6 +1,5 @@ use std::{borrow::Cow, fmt::Debug, mem::take}; -use swc_atoms::Atom; use swc_common::{BytePos, Span, Spanned, SyntaxContext}; use swc_css_ast::{ComponentValue, FunctionName, ListOfComponentValues, Token, TokenAndSpan}; @@ -381,11 +380,11 @@ impl<'a> Input<'a> { let name = match function.1 { FunctionName::Ident(name) => match name.raw { Some(raw) => (name.value, raw), - _ => (name.value.clone(), Atom::from(name.value)), + _ => (name.value.clone(), name.value), }, FunctionName::DashedIdent(name) => match name.raw { Some(raw) => (format!("--{}", name.value).into(), raw), - _ => (name.value.clone(), Atom::from(name.value)), + _ => (name.value.clone(), name.value), }, }; diff --git a/crates/swc_css_parser/src/parser/selectors/mod.rs b/crates/swc_css_parser/src/parser/selectors/mod.rs index b3ee3e8a359e..69d885767a5a 100644 --- a/crates/swc_css_parser/src/parser/selectors/mod.rs +++ b/crates/swc_css_parser/src/parser/selectors/mod.rs @@ -1,4 +1,4 @@ -use swc_atoms::js_word; +use swc_atoms::Atom; use swc_common::{BytePos, Span, Spanned}; use swc_css_ast::*; @@ -854,7 +854,7 @@ where if is!(self, Function) { let fn_span = self.input.cur_span(); let name = bump!(self); - let names = match name { + let names: (Atom, _) = match name { Token::Function { value, raw } => (value.to_ascii_lowercase(), raw), _ => unreachable!(), }; @@ -863,8 +863,8 @@ where || -> PResult> { let mut children = vec![]; - match names.0 { - js_word!("local") | js_word!("global") if self.config.css_modules => { + match &*names.0 { + "local" | "global" if self.config.css_modules => { self.input.skip_ws(); let ctx = Ctx { @@ -878,7 +878,7 @@ where children .push(PseudoClassSelectorChildren::ComplexSelector(selector_list)); } - js_word!("-moz-any") | js_word!("-webkit-any") => { + "-moz-any" | "-webkit-any" => { self.input.skip_ws(); let compound_selector_list = self.parse()?; @@ -889,7 +889,7 @@ where compound_selector_list, )); } - js_word!("dir") => { + "dir" => { self.input.skip_ws(); let mut ident: Ident = self.parse()?; @@ -900,7 +900,7 @@ where children.push(PseudoClassSelectorChildren::Ident(ident)); } - js_word!("lang") => { + "lang" => { self.input.skip_ws(); let child = match cur!(self) { @@ -947,7 +947,7 @@ where children.push(child); } } - js_word!("current") | js_word!("past") | js_word!("future") => { + "current" | "past" | "future" => { self.input.skip_ws(); let compound_selector_list = self.parse()?; @@ -958,7 +958,7 @@ where compound_selector_list, )); } - js_word!("not") | js_word!("matches") => { + "not" | "matches" => { self.input.skip_ws(); let selector_list = self.parse()?; @@ -967,14 +967,14 @@ where children.push(PseudoClassSelectorChildren::SelectorList(selector_list)); } - js_word!("is") | js_word!("where") => { + "is" | "where" => { let forgiving_selector_list = self.parse()?; children.push(PseudoClassSelectorChildren::ForgivingSelectorList( forgiving_selector_list, )); } - js_word!("has") => { + "has" => { let forgiving_relative_selector_list = self.parse()?; children.push( @@ -983,12 +983,8 @@ where ), ); } - js_word!("nth-child") - | js_word!("nth-last-child") - | js_word!("nth-of-type") - | js_word!("nth-last-of-type") - | js_word!("nth-col") - | js_word!("nth-last-col") => { + "nth-child" | "nth-last-child" | "nth-of-type" | "nth-last-of-type" + | "nth-col" | "nth-last-col" => { self.input.skip_ws(); let an_plus_b = self.parse()?; @@ -1014,7 +1010,7 @@ where .push(PseudoClassSelectorChildren::SelectorList(selector_list)); } } - js_word!("host") | js_word!("host-context") => { + "host" | "host-context" => { self.input.skip_ws(); let compound_selector = self.parse()?; @@ -1096,7 +1092,7 @@ where if is!(self, Function) { let fn_span = self.input.cur_span(); let name = bump!(self); - let names = match name { + let names: (Atom, _) = match name { Token::Function { value, raw } => (value.to_ascii_lowercase(), raw), _ => unreachable!(), }; @@ -1106,8 +1102,8 @@ where || -> PResult> { let mut children = vec![]; - match names.0 { - js_word!("cue") | js_word!("cue-region") => { + match &*names.0 { + "cue" | "cue-region" => { self.input.skip_ws(); let compound_selector = self.parse()?; @@ -1118,7 +1114,7 @@ where self.input.skip_ws(); } - js_word!("part") => { + "part" => { self.input.skip_ws(); let ident = self.parse()?; @@ -1127,7 +1123,7 @@ where self.input.skip_ws(); } - js_word!("slotted") => { + "slotted" => { self.input.skip_ws(); let compound_selector = self.parse()?; @@ -1138,7 +1134,7 @@ where self.input.skip_ws(); } - js_word!("highlight") => { + "highlight" => { self.input.skip_ws(); let custom_highlight_name = self.parse()?; @@ -1214,7 +1210,7 @@ where match cur!(self) { // odd | even Token::Ident { value, .. } - if matches_eq_ignore_ascii_case!(value, js_word!("odd"), js_word!("even")) => + if matches_eq_ignore_ascii_case!(value, "odd", "even") => { let mut ident: Ident = self.parse()?; diff --git a/crates/swc_css_parser/src/parser/syntax/mod.rs b/crates/swc_css_parser/src/parser/syntax/mod.rs index d5ac775d6263..97bbc989bc7f 100644 --- a/crates/swc_css_parser/src/parser/syntax/mod.rs +++ b/crates/swc_css_parser/src/parser/syntax/mod.rs @@ -1,4 +1,3 @@ -use swc_atoms::js_word; use swc_common::{BytePos, Span, Spanned}; use swc_css_ast::*; @@ -700,7 +699,7 @@ where .. }, ) if exclamation_point_span.is_some() - && matches_eq_ignore_ascii_case!(value, js_word!("important")) => + && matches_eq_ignore_ascii_case!(value, "important") => { important_ident = Some(token_and_span.clone()); } diff --git a/crates/swc_css_parser/src/parser/util.rs b/crates/swc_css_parser/src/parser/util.rs index 5c172ddf52eb..cf98a0b1d7f2 100644 --- a/crates/swc_css_parser/src/parser/util.rs +++ b/crates/swc_css_parser/src/parser/util.rs @@ -1,6 +1,5 @@ use std::ops::{Deref, DerefMut}; -use swc_atoms::js_word; use swc_common::{Span, Spanned, SyntaxContext, DUMMY_SP}; use swc_css_ast::*; @@ -112,9 +111,7 @@ where list_of_component_values, ))) } - None if *normalized_at_rule_name == js_word!("layer") - && at_rule.block.is_none() => - { + None if normalized_at_rule_name == "layer" && at_rule.block.is_none() => { self.errors.push(Error::new( at_rule.span, ErrorKind::Expected("at least one name"), diff --git a/crates/swc_css_parser/src/parser/values_and_units/mod.rs b/crates/swc_css_parser/src/parser/values_and_units/mod.rs index edb4d67d9d7e..6e810a858a67 100644 --- a/crates/swc_css_parser/src/parser/values_and_units/mod.rs +++ b/crates/swc_css_parser/src/parser/values_and_units/mod.rs @@ -1,4 +1,4 @@ -use swc_atoms::{js_word, JsWord}; +use swc_atoms::JsWord; use swc_common::{BytePos, Span}; use swc_css_ast::*; @@ -48,23 +48,12 @@ where return Ok(ComponentValue::Url(self.parse()?)); } - Token::Function { value, .. } => match value.to_ascii_lowercase() { - js_word!("url") | js_word!("src") => { + Token::Function { value, .. } => match &*value.to_ascii_lowercase() { + "url" | "src" => { return Ok(ComponentValue::Url(self.parse()?)); } - js_word!("rgb") - | js_word!("rgba") - | js_word!("hsl") - | js_word!("hsla") - | js_word!("hwb") - | js_word!("lab") - | js_word!("lch") - | js_word!("oklab") - | js_word!("oklch") - | js_word!("color") - | js_word!("device-cmyk") - | js_word!("color-mix") - | js_word!("color-contrast") => { + "rgb" | "rgba" | "hsl" | "hsla" | "hwb" | "lab" | "lch" | "oklab" | "oklch" + | "color" | "device-cmyk" | "color-mix" | "color-contrast" => { return Ok(ComponentValue::Color(self.parse()?)); } _ => { @@ -89,7 +78,7 @@ where Token::Ident { value, .. } => { if value.starts_with("--") { return Ok(ComponentValue::DashedIdent(self.parse()?)); - } else if matches_eq_ignore_ascii_case!(value, js_word!("u")) + } else if matches_eq_ignore_ascii_case!(value, "u") && peeked_is_one_of!(self, "+", "number", "dimension") { return Ok(ComponentValue::UnicodeRange(self.parse()?)); @@ -208,20 +197,9 @@ where let mut values = vec![]; - match *function_name { - js_word!("calc") - | js_word!("-moz-calc") - | js_word!("-webkit-calc") - | js_word!("sin") - | js_word!("cos") - | js_word!("tan") - | js_word!("asin") - | js_word!("acos") - | js_word!("atan") - | js_word!("sqrt") - | js_word!("exp") - | js_word!("abs") - | js_word!("sign") => { + match &**function_name { + "calc" | "-moz-calc" | "-webkit-calc" | "sin" | "cos" | "tan" | "asin" | "acos" + | "atan" | "sqrt" | "exp" | "abs" | "sign" => { self.input.skip_ws(); let calc_sum = ComponentValue::CalcSum(self.parse()?); @@ -236,7 +214,7 @@ where return Err(Error::new(span, ErrorKind::Unexpected("value"))); } } - js_word!("min") | js_word!("max") | js_word!("hypot") => { + "min" | "max" | "hypot" => { self.input.skip_ws(); let calc_sum = ComponentValue::CalcSum(self.parse()?); @@ -265,7 +243,7 @@ where return Err(Error::new(span, ErrorKind::Unexpected("value"))); } } - js_word!("clamp") => { + "clamp" => { self.input.skip_ws(); let calc_sum = ComponentValue::CalcSum(self.parse()?); @@ -306,7 +284,7 @@ where self.input.skip_ws(); } - js_word!("round") => { + "round" => { self.input.skip_ws(); if is!(self, "ident") { @@ -350,7 +328,7 @@ where self.input.skip_ws(); } - js_word!("mod") | js_word!("rem") | js_word!("atan2") | js_word!("pow") => { + "mod" | "rem" | "atan2" | "pow" => { self.input.skip_ws(); let calc_sum = ComponentValue::CalcSum(self.parse()?); @@ -375,7 +353,7 @@ where self.input.skip_ws(); } - js_word!("log") => { + "log" => { self.input.skip_ws(); let calc_sum = ComponentValue::CalcSum(self.parse()?); @@ -396,16 +374,14 @@ where self.input.skip_ws(); } } - js_word!("rgb") | js_word!("rgba") | js_word!("hsl") | js_word!("hsla") => { + "rgb" | "rgba" | "hsl" | "hsla" => { self.input.skip_ws(); let mut has_variable = false; let mut is_legacy_syntax = true; match cur!(self) { - Token::Ident { value, .. } - if matches_eq_ignore_ascii_case!(value, js_word!("from")) => - { + Token::Ident { value, .. } if matches_eq_ignore_ascii_case!(value, "from") => { is_legacy_syntax = false; values.push(ComponentValue::Ident(self.parse()?)); @@ -426,8 +402,8 @@ where _ => {} } - match *function_name { - js_word!("rgb") | js_word!("rgba") => { + match &**function_name { + "rgb" | "rgba" => { let percentage_or_number_or_none = self.try_parse_variable_function( |parser, has_variable_before| match cur!(parser) { tok!("percentage") => { @@ -442,7 +418,7 @@ where let ident: Box = parser.parse()?; - if ident.value.eq_str_ignore_ascii_case("none") { + if ident.value.eq_ignore_ascii_case("none") { Ok(Some(ComponentValue::Ident(ident))) } else { Err(Error::new( @@ -474,7 +450,7 @@ where self.input.skip_ws(); } - js_word!("hsl") | js_word!("hsla") => { + "hsl" | "hsla" => { let hue_or_none = self.try_parse_variable_function( |parser, has_variable_before| match cur!(parser) { tok!("number") | tok!("dimension") => { @@ -483,7 +459,7 @@ where tok!("ident") => { let ident: Box = parser.parse()?; - if ident.value.eq_str_ignore_ascii_case("none") { + if ident.value.eq_ignore_ascii_case("none") { Ok(Some(ComponentValue::Ident(ident))) } else { Err(Error::new( @@ -539,8 +515,8 @@ where is_legacy_syntax = false; } - match *function_name { - js_word!("rgb") | js_word!("rgba") => { + match &**function_name { + "rgb" | "rgba" => { let percentage_or_number = self.try_parse_variable_function( |parser, has_variable_before| match cur!(parser) { tok!("percentage") => { @@ -553,7 +529,7 @@ where tok!("ident") if !is_legacy_syntax => { let ident: Box = parser.parse()?; - if ident.value.eq_str_ignore_ascii_case("none") { + if ident.value.eq_ignore_ascii_case("none") { Ok(Some(ComponentValue::Ident(ident))) } else { Err(Error::new( @@ -585,7 +561,7 @@ where self.input.skip_ws(); } - js_word!("hsl") | js_word!("hsla") => { + "hsl" | "hsla" => { let percentage_or_none = self.try_parse_variable_function( |parser, has_variable_before| match cur!(parser) { tok!("percentage") => { @@ -597,7 +573,7 @@ where tok!("ident") => { let ident: Box = parser.parse()?; - if ident.value.eq_str_ignore_ascii_case("none") { + if ident.value.eq_ignore_ascii_case("none") { Ok(Some(ComponentValue::Ident(ident))) } else { Err(Error::new( @@ -655,8 +631,8 @@ where } } - match *function_name { - js_word!("rgb") | js_word!("rgba") => { + match &**function_name { + "rgb" | "rgba" => { let percentage_or_number = self.try_parse_variable_function( |parser, has_variable_before| match cur!(parser) { tok!("percentage") => { @@ -669,7 +645,7 @@ where tok!("ident") if !is_legacy_syntax => { let ident: Box = parser.parse()?; - if ident.value.eq_str_ignore_ascii_case("none") { + if ident.value.eq_ignore_ascii_case("none") { Ok(Some(ComponentValue::Ident(ident))) } else { Err(Error::new( @@ -701,7 +677,7 @@ where self.input.skip_ws(); } - js_word!("hsl") | js_word!("hsla") => { + "hsl" | "hsla" => { let percentage_or_none = self.try_parse_variable_function( |parser, has_variable_before| match cur!(parser) { tok!("percentage") => { @@ -713,7 +689,7 @@ where tok!("ident") => { let ident: Box = parser.parse()?; - if ident.value.eq_str_ignore_ascii_case("none") { + if ident.value.eq_ignore_ascii_case("none") { Ok(Some(ComponentValue::Ident(ident))) } else { Err(Error::new( @@ -800,7 +776,7 @@ where tok!("ident") => { let ident: Box = parser.parse()?; - if ident.value.eq_str_ignore_ascii_case("none") { + if ident.value.eq_ignore_ascii_case("none") { Ok(Some(ComponentValue::Ident(ident))) } else { Err(Error::new( @@ -833,20 +809,15 @@ where self.input.skip_ws(); } } - js_word!("hwb") - | js_word!("lab") - | js_word!("lch") - | js_word!("oklab") - | js_word!("oklch") - | js_word!("device-cmyk") => { + "hwb" | "lab" | "lch" | "oklab" | "oklch" | "device-cmyk" => { self.input.skip_ws(); let mut has_variable = false; match cur!(self) { Token::Ident { value, .. } - if matches_eq_ignore_ascii_case!(value, js_word!("from")) - && *function_name != js_word!("device-cmyk") => + if matches_eq_ignore_ascii_case!(value, "from") + && *function_name != "device-cmyk" => { values.push(ComponentValue::Ident(self.parse()?)); @@ -866,8 +837,8 @@ where _ => {} } - match *function_name { - js_word!("hwb") => { + match &**function_name { + "hwb" => { let hue_or_none = self.try_parse_variable_function( |parser, has_variable_before| match cur!(parser) { tok!("number") | tok!("dimension") => { @@ -879,7 +850,7 @@ where tok!("ident") => { let ident: Box = parser.parse()?; - if ident.value.eq_str_ignore_ascii_case("none") { + if ident.value.eq_ignore_ascii_case("none") { Ok(Some(ComponentValue::Ident(ident))) } else { Err(Error::new( @@ -911,7 +882,7 @@ where self.input.skip_ws(); } - js_word!("lab") | js_word!("lch") | js_word!("oklab") | js_word!("oklch") => { + "lab" | "lch" | "oklab" | "oklch" => { let percentage_or_none = self.try_parse_variable_function( |parser, has_variable_before| match cur!(parser) { tok!("percentage") => { @@ -924,7 +895,7 @@ where tok!("ident") => { let ident: Box = parser.parse()?; - if ident.value.eq_str_ignore_ascii_case("none") { + if ident.value.eq_ignore_ascii_case("none") { Ok(Some(ComponentValue::Ident(ident))) } else { Err(Error::new( @@ -956,7 +927,7 @@ where self.input.skip_ws(); } - js_word!("device-cmyk") => { + "device-cmyk" => { let cmyk_component = self.try_parse_variable_function( |parser, _| Ok(Some(ComponentValue::CmykComponent(parser.parse()?))), &mut has_variable, @@ -974,8 +945,8 @@ where } if !is_one_of!(self, EOF, "/") { - match *function_name { - js_word!("hwb") => { + match &**function_name { + "hwb" => { let percentage_or_none = self.try_parse_variable_function( |parser, has_variable_before| match cur!(parser) { tok!("percentage") => { @@ -987,7 +958,7 @@ where tok!("ident") => { let ident: Box = parser.parse()?; - if ident.value.eq_str_ignore_ascii_case("none") { + if ident.value.eq_ignore_ascii_case("none") { Ok(Some(ComponentValue::Ident(ident))) } else { Err(Error::new( @@ -1021,10 +992,7 @@ where self.input.skip_ws(); } - js_word!("lab") - | js_word!("lch") - | js_word!("oklab") - | js_word!("oklch") => { + "lab" | "lch" | "oklab" | "oklch" => { let number_or_none = self.try_parse_variable_function( |parser, has_variable_before| match cur!(parser) { tok!("percentage") => { @@ -1039,7 +1007,7 @@ where tok!("ident") => { let ident: Box = parser.parse()?; - if ident.value.eq_str_ignore_ascii_case("none") { + if ident.value.eq_ignore_ascii_case("none") { Ok(Some(ComponentValue::Ident(ident))) } else { Err(Error::new( @@ -1073,7 +1041,7 @@ where self.input.skip_ws(); } - js_word!("device-cmyk") => { + "device-cmyk" => { let cmyk_component = self.try_parse_variable_function( |parser, _| { Ok(Some(ComponentValue::CmykComponent(parser.parse()?))) @@ -1094,8 +1062,8 @@ where } if !is_one_of!(self, EOF, "/") { - match *function_name { - js_word!("hwb") => { + match &**function_name { + "hwb" => { let percentage_or_none = self.try_parse_variable_function( |parser, has_variable_before| match cur!(parser) { tok!("percentage") => { @@ -1107,7 +1075,7 @@ where tok!("ident") => { let ident: Box = parser.parse()?; - if ident.value.eq_str_ignore_ascii_case("none") { + if ident.value.eq_ignore_ascii_case("none") { Ok(Some(ComponentValue::Ident(ident))) } else { Err(Error::new( @@ -1141,7 +1109,7 @@ where self.input.skip_ws(); } - js_word!("lab") | js_word!("oklab") => { + "lab" | "oklab" => { let number_or_none = self.try_parse_variable_function( |parser, has_variable_before| match cur!(parser) { tok!("percentage") => { @@ -1156,7 +1124,7 @@ where tok!("ident") => { let ident: Box = parser.parse()?; - if ident.value.eq_str_ignore_ascii_case("none") { + if ident.value.eq_ignore_ascii_case("none") { Ok(Some(ComponentValue::Ident(ident))) } else { Err(Error::new( @@ -1190,7 +1158,7 @@ where self.input.skip_ws(); } - js_word!("lch") | js_word!("oklch") => { + "lch" | "oklch" => { let hue_or_none = self.try_parse_variable_function( |parser, has_variable_before| match cur!(parser) { tok!("number") | tok!("dimension") => { @@ -1202,7 +1170,7 @@ where tok!("ident") => { let ident: Box = parser.parse()?; - if ident.value.eq_str_ignore_ascii_case("none") { + if ident.value.eq_ignore_ascii_case("none") { Ok(Some(ComponentValue::Ident(ident))) } else { Err(Error::new( @@ -1236,7 +1204,7 @@ where self.input.skip_ws(); } - js_word!("device-cmyk") => { + "device-cmyk" => { let cmyk_component = self.try_parse_variable_function( |parser, _| { Ok(Some(ComponentValue::CmykComponent(parser.parse()?))) @@ -1282,10 +1250,10 @@ where Token::Function { value, .. } if is_math_function(value) => { Ok(Some(ComponentValue::Function(parser.parse()?))) } - tok!("ident") if !matches!(*function_name, js_word!("device-cmyk")) => { + tok!("ident") if !matches!(&**function_name, "device-cmyk") => { let ident: Box = parser.parse()?; - if ident.value.eq_str_ignore_ascii_case("none") { + if ident.value.eq_ignore_ascii_case("none") { Ok(Some(ComponentValue::Ident(ident))) } else { Err(Error::new( @@ -1318,15 +1286,13 @@ where self.input.skip_ws(); } } - js_word!("color") => { + "color" => { self.input.skip_ws(); let mut has_variable = false; match cur!(self) { - Token::Ident { value, .. } - if matches_eq_ignore_ascii_case!(value, js_word!("from")) => - { + Token::Ident { value, .. } if matches_eq_ignore_ascii_case!(value, "from") => { values.push(ComponentValue::Ident(self.parse()?)); self.input.skip_ws(); @@ -1356,12 +1322,8 @@ where Ok(Some(ComponentValue::DashedIdent(parser.parse()?))) } else { - if matches_eq_ignore_ascii_case!( - value, - js_word!("xyz"), - js_word!("xyz-d50"), - js_word!("xyz-d65") - ) { + if matches_eq_ignore_ascii_case!(value, "xyz", "xyz-d50", "xyz-d65") + { is_xyz = true } else { // There are predefined-rgb-params , but @@ -1400,7 +1362,7 @@ where tok!("ident") => { let ident: Box = parser.parse()?; - if ident.value.eq_str_ignore_ascii_case("none") { + if ident.value.eq_ignore_ascii_case("none") { Ok(Some(ComponentValue::Ident(ident))) } else { Err(Error::new( @@ -1446,10 +1408,7 @@ where Token::Function { value, .. } if is_math_function(value) || matches_eq_ignore_ascii_case!( - value, - js_word!("var"), - js_word!("env"), - js_word!("constant") + value, "var", "env", "constant" ) => { ComponentValue::Function(self.parse()?) @@ -1457,7 +1416,7 @@ where tok!("ident") => { let ident: Box = self.parse()?; - if ident.value.eq_str_ignore_ascii_case("none") { + if ident.value.eq_ignore_ascii_case("none") { ComponentValue::Ident(ident) } else { return Err(Error::new( @@ -1488,7 +1447,7 @@ where tok!("ident") => { let ident: Box = parser.parse()?; - if ident.value.eq_str_ignore_ascii_case("none") { + if ident.value.eq_ignore_ascii_case("none") { Ok(Some(ComponentValue::Ident(ident))) } else { Err(Error::new( @@ -1529,7 +1488,7 @@ where tok!("ident") => { let ident: Box = parser.parse()?; - if ident.value.eq_str_ignore_ascii_case("none") { + if ident.value.eq_ignore_ascii_case("none") { Ok(Some(ComponentValue::Ident(ident))) } else { Err(Error::new( @@ -1578,10 +1537,10 @@ where Token::Function { value, .. } if is_math_function(value) => { Ok(Some(ComponentValue::Function(parser.parse()?))) } - tok!("ident") if !matches!(*function_name, js_word!("device-cmyk")) => { + tok!("ident") if !matches!(&**function_name, "device-cmyk") => { let ident: Box = parser.parse()?; - if ident.value.eq_str_ignore_ascii_case("none") { + if ident.value.eq_ignore_ascii_case("none") { Ok(Some(ComponentValue::Ident(ident))) } else { Err(Error::new( @@ -1616,7 +1575,7 @@ where self.input.skip_ws(); } - js_word!("element") | js_word!("-moz-element") => { + "element" | "-moz-element" => { self.input.skip_ws(); let id_selector = self.try_parse_variable_function( @@ -1630,7 +1589,7 @@ where self.input.skip_ws(); } } - js_word!("selector") if self.ctx.in_supports_at_rule => { + "selector" if self.ctx.in_supports_at_rule => { self.input.skip_ws(); let selector = ComponentValue::ComplexSelector(self.parse()?); @@ -1639,7 +1598,7 @@ where self.input.skip_ws(); } - js_word!("layer") if self.ctx.in_import_at_rule => { + "layer" if self.ctx.in_import_at_rule => { self.input.skip_ws(); if is!(self, EOF) { @@ -1672,7 +1631,7 @@ where )); } } - js_word!("supports") if self.ctx.in_import_at_rule => { + "supports" if self.ctx.in_import_at_rule => { self.input.skip_ws(); if !is!(self, EOF) { @@ -1738,12 +1697,7 @@ where match cur!(self) { Token::Function { value, .. } - if matches_eq_ignore_ascii_case!( - value, - js_word!("var"), - js_word!("env"), - js_word!("constant") - ) => + if matches_eq_ignore_ascii_case!(value, "var", "env", "constant") => { *has_before_variable = true; @@ -1877,12 +1831,7 @@ where match bump!(self) { Token::Ident { value, raw, .. } => { if matches_eq_ignore_ascii_case!( - value, - js_word!("initial"), - js_word!("inherit"), - js_word!("unset"), - js_word!("revert"), - js_word!("default") + value, "initial", "inherit", "unset", "revert", "default" ) { return Err(Error::new(span, ErrorKind::InvalidCustomIdent(value))); } @@ -2622,7 +2571,7 @@ where let name_length = raw.0.len() as u32; let name = Ident { span: Span::new(span.lo, span.lo + BytePos(name_length), Default::default()), - value: js_word!("url"), + value: "url".into(), raw: Some(raw.0), }; let value = Some(Box::new(UrlValue::Raw(UrlValueRaw { @@ -2646,7 +2595,7 @@ where value: function_name, raw: raw_function_name, } => { - if !matches_eq_ignore_ascii_case!(function_name, js_word!("url"), js_word!("src")) { + if !matches_eq_ignore_ascii_case!(function_name, "url", "src") { return Err(Error::new( span, ErrorKind::Expected("'url' or 'src' name of a function token"), @@ -2725,7 +2674,7 @@ where // should start with `u` or `U` match cur!(self) { - Token::Ident { value, .. } if matches_eq_ignore_ascii_case!(value, js_word!("u")) => { + Token::Ident { value, .. } if matches_eq_ignore_ascii_case!(value, "u") => { let u = match bump!(self) { Token::Ident { value, .. } => value, _ => { @@ -3284,12 +3233,8 @@ where tok!("dimension") => Ok(CalcValue::Dimension(self.parse()?)), tok!("percentage") => Ok(CalcValue::Percentage(self.parse()?)), Token::Ident { value, .. } => { - match value.to_ascii_lowercase() { - js_word!("e") - | js_word!("pi") - | js_word!("infinity") - | js_word!("-infinity") - | js_word!("nan") => {} + match &*value.to_ascii_lowercase() { + "e" | "pi" | "infinity" | "-infinity" | "nan" => {} _ => { let span = self.input.cur_span(); @@ -3378,386 +3323,325 @@ where pub(crate) fn is_math_function(name: &JsWord) -> bool { matches_eq_ignore_ascii_case!( name, - js_word!("calc"), - js_word!("-moz-calc"), - js_word!("-webkit-calc"), - js_word!("sin"), - js_word!("cos"), - js_word!("tan"), - js_word!("asin"), - js_word!("acos"), - js_word!("atan"), - js_word!("sqrt"), - js_word!("exp"), - js_word!("abs"), - js_word!("sign"), - js_word!("min"), - js_word!("max"), - js_word!("hypot"), - js_word!("clamp"), - js_word!("round"), - js_word!("mod"), - js_word!("rem"), - js_word!("atan2"), - js_word!("pow"), - js_word!("log") + "calc", + "-moz-calc", + "-webkit-calc", + "sin", + "cos", + "tan", + "asin", + "acos", + "atan", + "sqrt", + "exp", + "abs", + "sign", + "min", + "max", + "hypot", + "clamp", + "round", + "mod", + "rem", + "atan2", + "pow", + "log" ) } fn is_absolute_color_base_function(name: &JsWord) -> bool { matches_eq_ignore_ascii_case!( name, - js_word!("rgb"), - js_word!("rgba"), - js_word!("hsl"), - js_word!("hsla"), - js_word!("hwb"), - js_word!("lab"), - js_word!("lch"), - js_word!("oklab"), - js_word!("oklch"), - js_word!("color"), - js_word!("color-mix"), - js_word!("color-contrast") + "rgb", + "rgba", + "hsl", + "hsla", + "hwb", + "lab", + "lch", + "oklab", + "oklch", + "color", + "color-mix", + "color-contrast" ) } fn is_system_color(name: &JsWord) -> bool { matches_eq_ignore_ascii_case!( name, - js_word!("canvas"), - js_word!("canvastext"), - js_word!("linktext"), - js_word!("visitedtext"), - js_word!("activetext"), - js_word!("buttonface"), - js_word!("buttontext"), - js_word!("buttonborder"), - js_word!("field"), - js_word!("fieldtext"), - js_word!("highlight"), - js_word!("highlighttext"), - js_word!("selecteditem"), - js_word!("selecteditemtext"), - js_word!("mark"), - js_word!("marktext"), - js_word!("graytext"), + "canvas", + "canvastext", + "linktext", + "visitedtext", + "activetext", + "buttonface", + "buttontext", + "buttonborder", + "field", + "fieldtext", + "highlight", + "highlighttext", + "selecteditem", + "selecteditemtext", + "mark", + "marktext", + "graytext", // Deprecated - js_word!("activeborder"), - js_word!("activecaption"), - js_word!("appWorkspace"), - js_word!("background"), - js_word!("buttonhighlight"), - js_word!("buttonshadow"), - js_word!("captiontext"), - js_word!("inactiveborder"), - js_word!("inactivecaption"), - js_word!("inactivecaptiontext"), - js_word!("infobackground"), - js_word!("infotext"), - js_word!("menu"), - js_word!("menutext"), - js_word!("scrollbar"), - js_word!("threeddarkshadow"), - js_word!("threedface"), - js_word!("threedhighlight"), - js_word!("threedlightshadow"), - js_word!("threedshadow"), - js_word!("window"), - js_word!("windowframe"), - js_word!("windowtext"), + "activeborder", + "activecaption", + "appWorkspace", + "background", + "buttonhighlight", + "buttonshadow", + "captiontext", + "inactiveborder", + "inactivecaption", + "inactivecaptiontext", + "infobackground", + "infotext", + "menu", + "menutext", + "scrollbar", + "threeddarkshadow", + "threedface", + "threedhighlight", + "threedlightshadow", + "threedshadow", + "window", + "windowframe", + "windowtext", // Mozilla System Color Extensions - js_word!("-moz-buttondefault"), - js_word!("-moz-buttonhoverface"), - js_word!("-moz-buttonhovertext"), - js_word!("-moz-cellhighlight"), - js_word!("-moz-cellhighlighttext"), - js_word!("-moz-combobox"), - js_word!("-moz-comboboxtext"), - js_word!("-moz-dialog"), - js_word!("-moz-dialogtext"), - js_word!("-moz-dragtargetzone"), - js_word!("-moz-eventreerow"), - js_word!("-moz-html-cellhighlight"), - js_word!("-moz-html-cellhighlighttext"), - js_word!("-moz-mac-accentdarkestshadow"), - js_word!("-moz-mac-accentdarkshadow"), - js_word!("-moz-mac-accentface"), - js_word!("-moz-mac-accentlightesthighlight"), - js_word!("-moz-mac-accentlightshadow"), - js_word!("-moz-mac-accentregularhighlight"), - js_word!("-moz-mac-accentregularshadow"), - js_word!("-moz-mac-chrome-active"), - js_word!("-moz-mac-chrome-inactive"), - js_word!("-moz-mac-focusring"), - js_word!("-moz-mac-menuselect"), - js_word!("-moz-mac-menushadow"), - js_word!("-moz-mac-menutextselect"), - js_word!("-moz-menuhover"), - js_word!("-moz-menuhovertext"), - js_word!("-moz-menubartext"), - js_word!("-moz-menubarhovertext"), - js_word!("-moz-nativehyperlinktext"), - js_word!("-moz-oddtreerow"), - js_word!("-moz-win-communicationstext"), - js_word!("-moz-win-mediatext"), - js_word!("-moz-win-accentcolor"), - js_word!("-moz-win-accentcolortext"), + "-moz-buttondefault", + "-moz-buttonhoverface", + "-moz-buttonhovertext", + "-moz-cellhighlight", + "-moz-cellhighlighttext", + "-moz-combobox", + "-moz-comboboxtext", + "-moz-dialog", + "-moz-dialogtext", + "-moz-dragtargetzone", + "-moz-eventreerow", + "-moz-html-cellhighlight", + "-moz-html-cellhighlighttext", + "-moz-mac-accentdarkestshadow", + "-moz-mac-accentdarkshadow", + "-moz-mac-accentface", + "-moz-mac-accentlightesthighlight", + "-moz-mac-accentlightshadow", + "-moz-mac-accentregularhighlight", + "-moz-mac-accentregularshadow", + "-moz-mac-chrome-active", + "-moz-mac-chrome-inactive", + "-moz-mac-focusring", + "-moz-mac-menuselect", + "-moz-mac-menushadow", + "-moz-mac-menutextselect", + "-moz-menuhover", + "-moz-menuhovertext", + "-moz-menubartext", + "-moz-menubarhovertext", + "-moz-nativehyperlinktext", + "-moz-oddtreerow", + "-moz-win-communicationstext", + "-moz-win-mediatext", + "-moz-win-accentcolor", + "-moz-win-accentcolortext", // Mozilla Color Preference Extensions - js_word!("-moz-activehyperlinktext"), - js_word!("-moz-default-background-color"), - js_word!("-moz-default-color"), - js_word!("-moz-hyperlinktext"), - js_word!("-moz-visitedhyperlinktext") + "-moz-activehyperlinktext", + "-moz-default-background-color", + "-moz-default-color", + "-moz-hyperlinktext", + "-moz-visitedhyperlinktext" ) } fn is_named_color(name: &JsWord) -> bool { matches_eq_ignore_ascii_case!( name, - js_word!("aliceblue"), - js_word!("antiquewhite"), - js_word!("aqua"), - js_word!("aquamarine"), - js_word!("azure"), - js_word!("beige"), - js_word!("bisque"), - js_word!("black"), - js_word!("blanchedalmond"), - js_word!("blue"), - js_word!("blueviolet"), - js_word!("brown"), - js_word!("burlywood"), - js_word!("cadetblue"), - js_word!("chartreuse"), - js_word!("chocolate"), - js_word!("coral"), - js_word!("cornflowerblue"), - js_word!("cornsilk"), - js_word!("crimson"), - js_word!("cyan"), - js_word!("darkblue"), - js_word!("darkcyan"), - js_word!("darkgoldenrod"), - js_word!("darkgray"), - js_word!("darkgreen"), - js_word!("darkgrey"), - js_word!("darkkhaki"), - js_word!("darkmagenta"), - js_word!("darkolivegreen"), - js_word!("darkorange"), - js_word!("darkorchid"), - js_word!("darkred"), - js_word!("darksalmon"), - js_word!("darkseagreen"), - js_word!("darkslateblue"), - js_word!("darkslategray"), - js_word!("darkslategrey"), - js_word!("darkturquoise"), - js_word!("darkviolet"), - js_word!("deeppink"), - js_word!("deepskyblue"), - js_word!("dimgray"), - js_word!("dimgrey"), - js_word!("dodgerblue"), - js_word!("firebrick"), - js_word!("floralwhite"), - js_word!("forestgreen"), - js_word!("fuchsia"), - js_word!("gainsboro"), - js_word!("ghostwhite"), - js_word!("gold"), - js_word!("goldenrod"), - js_word!("gray"), - js_word!("green"), - js_word!("greenyellow"), - js_word!("grey"), - js_word!("honeydew"), - js_word!("hotpink"), - js_word!("indianred"), - js_word!("indigo"), - js_word!("ivory"), - js_word!("khaki"), - js_word!("lavender"), - js_word!("lavenderblush"), - js_word!("lawngreen"), - js_word!("lemonchiffon"), - js_word!("lightblue"), - js_word!("lightcoral"), - js_word!("lightcyan"), - js_word!("lightgoldenrodyellow"), - js_word!("lightgray"), - js_word!("lightgreen"), - js_word!("lightgrey"), - js_word!("lightpink"), - js_word!("lightsalmon"), - js_word!("lightseagreen"), - js_word!("lightskyblue"), - js_word!("lightslategray"), - js_word!("lightslategrey"), - js_word!("lightsteelblue"), - js_word!("lightyellow"), - js_word!("lime"), - js_word!("limegreen"), - js_word!("linen"), - js_word!("magenta"), - js_word!("maroon"), - js_word!("mediumaquamarine"), - js_word!("mediumblue"), - js_word!("mediumorchid"), - js_word!("mediumpurple"), - js_word!("mediumseagreen"), - js_word!("mediumslateblue"), - js_word!("mediumspringgreen"), - js_word!("mediumturquoise"), - js_word!("mediumvioletred"), - js_word!("midnightblue"), - js_word!("mintcream"), - js_word!("mistyrose"), - js_word!("moccasin"), - js_word!("navajowhite"), - js_word!("navy"), - js_word!("oldlace"), - js_word!("olive"), - js_word!("olivedrab"), - js_word!("orange"), - js_word!("orangered"), - js_word!("orchid"), - js_word!("palegoldenrod"), - js_word!("palegreen"), - js_word!("paleturquoise"), - js_word!("palevioletred"), - js_word!("papayawhip"), - js_word!("peachpuff"), - js_word!("peru"), - js_word!("pink"), - js_word!("plum"), - js_word!("powderblue"), - js_word!("purple"), - js_word!("rebeccapurple"), - js_word!("red"), - js_word!("rosybrown"), - js_word!("royalblue"), - js_word!("saddlebrown"), - js_word!("salmon"), - js_word!("sandybrown"), - js_word!("seagreen"), - js_word!("seashell"), - js_word!("sienna"), - js_word!("silver"), - js_word!("skyblue"), - js_word!("slateblue"), - js_word!("slategray"), - js_word!("slategrey"), - js_word!("snow"), - js_word!("springgreen"), - js_word!("steelblue"), - js_word!("tan"), - js_word!("teal"), - js_word!("thistle"), - js_word!("tomato"), - js_word!("turquoise"), - js_word!("violet"), - js_word!("wheat"), - js_word!("white"), - js_word!("whitesmoke"), - js_word!("yellow"), - js_word!("yellowgreen") + "aliceblue", + "antiquewhite", + "aqua", + "aquamarine", + "azure", + "beige", + "bisque", + "black", + "blanchedalmond", + "blue", + "blueviolet", + "brown", + "burlywood", + "cadetblue", + "chartreuse", + "chocolate", + "coral", + "cornflowerblue", + "cornsilk", + "crimson", + "cyan", + "darkblue", + "darkcyan", + "darkgoldenrod", + "darkgray", + "darkgreen", + "darkgrey", + "darkkhaki", + "darkmagenta", + "darkolivegreen", + "darkorange", + "darkorchid", + "darkred", + "darksalmon", + "darkseagreen", + "darkslateblue", + "darkslategray", + "darkslategrey", + "darkturquoise", + "darkviolet", + "deeppink", + "deepskyblue", + "dimgray", + "dimgrey", + "dodgerblue", + "firebrick", + "floralwhite", + "forestgreen", + "fuchsia", + "gainsboro", + "ghostwhite", + "gold", + "goldenrod", + "gray", + "green", + "greenyellow", + "grey", + "honeydew", + "hotpink", + "indianred", + "indigo", + "ivory", + "khaki", + "lavender", + "lavenderblush", + "lawngreen", + "lemonchiffon", + "lightblue", + "lightcoral", + "lightcyan", + "lightgoldenrodyellow", + "lightgray", + "lightgreen", + "lightgrey", + "lightpink", + "lightsalmon", + "lightseagreen", + "lightskyblue", + "lightslategray", + "lightslategrey", + "lightsteelblue", + "lightyellow", + "lime", + "limegreen", + "linen", + "magenta", + "maroon", + "mediumaquamarine", + "mediumblue", + "mediumorchid", + "mediumpurple", + "mediumseagreen", + "mediumslateblue", + "mediumspringgreen", + "mediumturquoise", + "mediumvioletred", + "midnightblue", + "mintcream", + "mistyrose", + "moccasin", + "navajowhite", + "navy", + "oldlace", + "olive", + "olivedrab", + "orange", + "orangered", + "orchid", + "palegoldenrod", + "palegreen", + "paleturquoise", + "palevioletred", + "papayawhip", + "peachpuff", + "peru", + "pink", + "plum", + "powderblue", + "purple", + "rebeccapurple", + "red", + "rosybrown", + "royalblue", + "saddlebrown", + "salmon", + "sandybrown", + "seagreen", + "seashell", + "sienna", + "silver", + "skyblue", + "slateblue", + "slategray", + "slategrey", + "snow", + "springgreen", + "steelblue", + "tan", + "teal", + "thistle", + "tomato", + "turquoise", + "violet", + "wheat", + "white", + "whitesmoke", + "yellow", + "yellowgreen" ) } fn is_length_unit(unit: &JsWord) -> bool { matches_eq_ignore_ascii_case!( - unit, - js_word!("em"), - js_word!("rem"), - js_word!("ex"), - js_word!("rex"), - js_word!("cap"), - js_word!("rcap"), - js_word!("ch"), - js_word!("rch"), - js_word!("ic"), - js_word!("ric"), - js_word!("lh"), - js_word!("rlh"), + unit, "em", "rem", "ex", "rex", "cap", "rcap", "ch", "rch", "ic", "ric", "lh", "rlh", // Viewport-percentage Lengths - js_word!("vw"), - js_word!("svw"), - js_word!("lvw"), - js_word!("dvw"), - js_word!("vh"), - js_word!("svh"), - js_word!("lvh"), - js_word!("dvh"), - js_word!("vi"), - js_word!("svi"), - js_word!("lvi"), - js_word!("dvi"), - js_word!("vb"), - js_word!("svb"), - js_word!("lvb"), - js_word!("dvb"), - js_word!("vmin"), - js_word!("svmin"), - js_word!("lvmin"), - js_word!("dvmin"), - js_word!("vmax"), - js_word!("svmax"), - js_word!("lvmax"), - js_word!("dvmax"), + "vw", "svw", "lvw", "dvw", "vh", "svh", "lvh", "dvh", "vi", "svi", "lvi", "dvi", "vb", + "svb", "lvb", "dvb", "vmin", "svmin", "lvmin", "dvmin", "vmax", "svmax", "lvmax", "dvmax", // Absolute lengths - js_word!("cm"), - js_word!("mm"), - js_word!("q"), - js_word!("in"), - js_word!("pc"), - js_word!("pt"), - js_word!("px"), - js_word!("mozmm") + "cm", "mm", "q", "in", "pc", "pt", "px", "mozmm" ) } fn is_container_lengths_unit(unit: &JsWord) -> bool { - matches_eq_ignore_ascii_case!( - unit, - js_word!("cqw"), - js_word!("cqh"), - js_word!("cqi"), - js_word!("cqb"), - js_word!("cqmin"), - js_word!("cqmax") - ) + matches_eq_ignore_ascii_case!(unit, "cqw", "cqh", "cqi", "cqb", "cqmin", "cqmax") } fn is_angle_unit(unit: &JsWord) -> bool { - matches_eq_ignore_ascii_case!( - unit, - js_word!("deg"), - js_word!("grad"), - js_word!("rad"), - js_word!("turn") - ) + matches_eq_ignore_ascii_case!(unit, "deg", "grad", "rad", "turn") } fn is_time_unit(unit: &JsWord) -> bool { - matches_eq_ignore_ascii_case!(unit, js_word!("s"), js_word!("ms")) + matches_eq_ignore_ascii_case!(unit, "s", "ms") } fn is_frequency_unit(unit: &JsWord) -> bool { - matches_eq_ignore_ascii_case!(unit, js_word!("hz"), js_word!("khz")) + matches_eq_ignore_ascii_case!(unit, "hz", "khz") } fn is_resolution_unit(unit: &JsWord) -> bool { - matches_eq_ignore_ascii_case!( - unit, - js_word!("dpi"), - js_word!("dpcm"), - js_word!("dppx"), - js_word!("x") - ) + matches_eq_ignore_ascii_case!(unit, "dpi", "dpcm", "dppx", "x") } fn is_flex_unit(unit: &JsWord) -> bool { - matches_eq_ignore_ascii_case!(unit, js_word!("fr")) + matches_eq_ignore_ascii_case!(unit, "fr") } diff --git a/crates/swc_css_parser/tests/fixture/at-rule/container/span.swc-stderr b/crates/swc_css_parser/tests/fixture/at-rule/container/span.swc-stderr index df1c39553f43..9b89e425a4d1 100644 --- a/crates/swc_css_parser/tests/fixture/at-rule/container/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/at-rule/container/span.swc-stderr @@ -2106,7 +2106,7 @@ 43 | .card { margin-block: 2em; } `---- - x Ident { value: Atom('--responsive' type=dynamic), raw: "--responsive" } + x Ident { value: "--responsive", raw: "--responsive" } ,-[$DIR/tests/fixture/at-rule/container/input.css:41:1] 41 | 42 | @container card (inline-size > 30em) and style(--responsive: true) { @@ -2154,7 +2154,7 @@ 43 | .card { margin-block: 2em; } `---- - x Ident { value: Atom('true' type=static), raw: "true" } + x Ident { value: "true", raw: "true" } ,-[$DIR/tests/fixture/at-rule/container/input.css:41:1] 41 | 42 | @container card (inline-size > 30em) and style(--responsive: true) { @@ -2442,7 +2442,7 @@ 47 | .card { margin-block: 2em; } `---- - x Ident { value: Atom('--responsive' type=dynamic), raw: "--responsive" } + x Ident { value: "--responsive", raw: "--responsive" } ,-[$DIR/tests/fixture/at-rule/container/input.css:45:1] 45 | 46 | @container card (inline-size > 30em) or style(--responsive: true) { @@ -2490,7 +2490,7 @@ 47 | .card { margin-block: 2em; } `---- - x Ident { value: Atom('true' type=static), raw: "true" } + x Ident { value: "true", raw: "true" } ,-[$DIR/tests/fixture/at-rule/container/input.css:45:1] 45 | 46 | @container card (inline-size > 30em) or style(--responsive: true) { @@ -7032,7 +7032,7 @@ 114 | #inner { `---- - x Ident { value: Atom('--responsive' type=dynamic), raw: "--responsive" } + x Ident { value: "--responsive", raw: "--responsive" } ,-[$DIR/tests/fixture/at-rule/container/input.css:112:1] 112 | 113 | @container test style(--responsive: true) { @@ -7080,7 +7080,7 @@ 114 | #inner { `---- - x Ident { value: Atom('true' type=static), raw: "true" } + x Ident { value: "true", raw: "true" } ,-[$DIR/tests/fixture/at-rule/container/input.css:112:1] 112 | 113 | @container test style(--responsive: true) { @@ -7297,7 +7297,7 @@ 120 | #inner { `---- - x Ident { value: Atom('--responsive' type=dynamic), raw: "--responsive" } + x Ident { value: "--responsive", raw: "--responsive" } ,-[$DIR/tests/fixture/at-rule/container/input.css:118:1] 118 | 119 | @container style(--responsive: true) { @@ -7345,7 +7345,7 @@ 120 | #inner { `---- - x Ident { value: Atom('true' type=static), raw: "true" } + x Ident { value: "true", raw: "true" } ,-[$DIR/tests/fixture/at-rule/container/input.css:118:1] 118 | 119 | @container style(--responsive: true) { @@ -7672,7 +7672,7 @@ 127 | #inner { `---- - x Ident { value: Atom('--responsive' type=dynamic), raw: "--responsive" } + x Ident { value: "--responsive", raw: "--responsive" } ,-[$DIR/tests/fixture/at-rule/container/input.css:125:1] 125 | @container card (inline-size > 30em) { 126 | @container style(--responsive: true) { @@ -7720,7 +7720,7 @@ 127 | #inner { `---- - x Ident { value: Atom('true' type=static), raw: "true" } + x Ident { value: "true", raw: "true" } ,-[$DIR/tests/fixture/at-rule/container/input.css:125:1] 125 | @container card (inline-size > 30em) { 126 | @container style(--responsive: true) { diff --git a/crates/swc_css_parser/tests/fixture/at-rule/media/span.swc-stderr b/crates/swc_css_parser/tests/fixture/at-rule/media/span.swc-stderr index 2d83294af054..f5f545c59df5 100644 --- a/crates/swc_css_parser/tests/fixture/at-rule/media/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/at-rule/media/span.swc-stderr @@ -21342,7 +21342,7 @@ 143 | @media (height foo bar) {} `---- - x Ident { value: Atom('height' type=static), raw: "height" } + x Ident { value: "height", raw: "height" } ,-[$DIR/tests/fixture/at-rule/media/input.css:141:1] 141 | 142 | @media (height << 600px) {} @@ -21422,7 +21422,7 @@ 143 | @media (height foo bar) {} `---- - x Dimension(DimensionToken { value: 600.0, raw_value: "600", unit: Atom('px' type=static), type_flag: Integer, raw_unit: "px" }) + x Dimension(DimensionToken { value: 600.0, raw_value: "600", unit: "px", type_flag: Integer, raw_unit: "px" }) ,-[$DIR/tests/fixture/at-rule/media/input.css:141:1] 141 | 142 | @media (height << 600px) {} @@ -21542,7 +21542,7 @@ 144 | @media (height foo("bar")) {} `---- - x Ident { value: Atom('height' type=static), raw: "height" } + x Ident { value: "height", raw: "height" } ,-[$DIR/tests/fixture/at-rule/media/input.css:142:1] 142 | @media (height << 600px) {} 143 | @media (height foo bar) {} @@ -21574,7 +21574,7 @@ 144 | @media (height foo("bar")) {} `---- - x Ident { value: Atom('foo' type=inline), raw: "foo" } + x Ident { value: "foo", raw: "foo" } ,-[$DIR/tests/fixture/at-rule/media/input.css:142:1] 142 | @media (height << 600px) {} 143 | @media (height foo bar) {} @@ -21606,7 +21606,7 @@ 144 | @media (height foo("bar")) {} `---- - x Ident { value: Atom('bar' type=inline), raw: "bar" } + x Ident { value: "bar", raw: "bar" } ,-[$DIR/tests/fixture/at-rule/media/input.css:142:1] 142 | @media (height << 600px) {} 143 | @media (height foo bar) {} @@ -21726,7 +21726,7 @@ 145 | @media (height + 600px) {} `---- - x Ident { value: Atom('height' type=static), raw: "height" } + x Ident { value: "height", raw: "height" } ,-[$DIR/tests/fixture/at-rule/media/input.css:143:1] 143 | @media (height foo bar) {} 144 | @media (height foo("bar")) {} @@ -21782,7 +21782,7 @@ 145 | @media (height + 600px) {} `---- - x String { value: Atom('bar' type=inline), raw: "\"bar\"" } + x String { value: "bar", raw: "\"bar\"" } ,-[$DIR/tests/fixture/at-rule/media/input.css:143:1] 143 | @media (height foo bar) {} 144 | @media (height foo("bar")) {} @@ -21902,7 +21902,7 @@ 146 | @media screen and (min-width: ) {} `---- - x Ident { value: Atom('height' type=static), raw: "height" } + x Ident { value: "height", raw: "height" } ,-[$DIR/tests/fixture/at-rule/media/input.css:144:1] 144 | @media (height foo("bar")) {} 145 | @media (height + 600px) {} @@ -21966,7 +21966,7 @@ 146 | @media screen and (min-width: ) {} `---- - x Dimension(DimensionToken { value: 600.0, raw_value: "600", unit: Atom('px' type=static), type_flag: Integer, raw_unit: "px" }) + x Dimension(DimensionToken { value: 600.0, raw_value: "600", unit: "px", type_flag: Integer, raw_unit: "px" }) ,-[$DIR/tests/fixture/at-rule/media/input.css:144:1] 144 | @media (height foo("bar")) {} 145 | @media (height + 600px) {} @@ -22110,7 +22110,7 @@ 147 | @media (aspect-ratio: 12/) {} `---- - x Ident { value: Atom('min-width' type=static), raw: "min-width" } + x Ident { value: "min-width", raw: "min-width" } ,-[$DIR/tests/fixture/at-rule/media/input.css:145:1] 145 | @media (height + 600px) {} 146 | @media screen and (min-width: ) {} @@ -22262,7 +22262,7 @@ 148 | @media func(100px) {} `---- - x Ident { value: Atom('aspect-ratio' type=static), raw: "aspect-ratio" } + x Ident { value: "aspect-ratio", raw: "aspect-ratio" } ,-[$DIR/tests/fixture/at-rule/media/input.css:146:1] 146 | @media screen and (min-width: ) {} 147 | @media (aspect-ratio: 12/) {} @@ -22446,7 +22446,7 @@ 149 | @media screen and func(100px) {} `---- - x Dimension(DimensionToken { value: 100.0, raw_value: "100", unit: Atom('px' type=static), type_flag: Integer, raw_unit: "px" }) + x Dimension(DimensionToken { value: 100.0, raw_value: "100", unit: "px", type_flag: Integer, raw_unit: "px" }) ,-[$DIR/tests/fixture/at-rule/media/input.css:147:1] 147 | @media (aspect-ratio: 12/) {} 148 | @media func(100px) {} @@ -22590,7 +22590,7 @@ 150 | @media(min-width:calc(10px + 10px)) {} `---- - x Dimension(DimensionToken { value: 100.0, raw_value: "100", unit: Atom('px' type=static), type_flag: Integer, raw_unit: "px" }) + x Dimension(DimensionToken { value: 100.0, raw_value: "100", unit: "px", type_flag: Integer, raw_unit: "px" }) ,-[$DIR/tests/fixture/at-rule/media/input.css:148:1] 148 | @media func(100px) {} 149 | @media screen and func(100px) {} diff --git a/crates/swc_css_parser/tests/fixture/at-rule/supports/span.swc-stderr b/crates/swc_css_parser/tests/fixture/at-rule/supports/span.swc-stderr index faabc5086200..7ff4e7112961 100644 --- a/crates/swc_css_parser/tests/fixture/at-rule/supports/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/at-rule/supports/span.swc-stderr @@ -6347,7 +6347,7 @@ 52 | [--self] { `---- - x String { value: Atom('.minwidth' type=dynamic), raw: "\".minwidth\"" } + x String { value: ".minwidth", raw: "\".minwidth\"" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:50:1] 50 | 51 | @supports (--element(".minwidth")) { @@ -7096,7 +7096,7 @@ 66 | * { background: red; } `---- - x Ident { value: Atom('ident' type=inline), raw: "ident" } + x Ident { value: "ident", raw: "ident" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:64:1] 64 | 65 | @supports (ident "str") { @@ -7128,7 +7128,7 @@ 66 | * { background: red; } `---- - x String { value: Atom('str' type=inline), raw: "\"str\"" } + x String { value: "str", raw: "\"str\"" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:64:1] 64 | 65 | @supports (ident "str") { @@ -7360,7 +7360,7 @@ 70 | * { background: red; } `---- - x Ident { value: Atom('ident' type=inline), raw: "ident" } + x Ident { value: "ident", raw: "ident" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:68:1] 68 | 69 | @supports ((ident "str")) { @@ -7392,7 +7392,7 @@ 70 | * { background: red; } `---- - x String { value: Atom('str' type=inline), raw: "\"str\"" } + x String { value: "str", raw: "\"str\"" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:68:1] 68 | 69 | @supports ((ident "str")) { @@ -8785,7 +8785,7 @@ 87 | from { `---- - x Ident { value: Atom('anim' type=inline), raw: "anim" } + x Ident { value: "anim", raw: "anim" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:85:1] 85 | @supports (animation-name: test) { 86 | @-custom-keyframe anim { @@ -8855,7 +8855,7 @@ 88 | color: black; `---- - x Ident { value: Atom('from' type=static), raw: "from" } + x Ident { value: "from", raw: "from" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:86:1] 86 | @-custom-keyframe anim { 87 | from { @@ -8929,7 +8929,7 @@ 89 | } `---- - x Ident { value: Atom('color' type=static), raw: "color" } + x Ident { value: "color", raw: "color" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:87:1] 87 | from { 88 | color: black; @@ -8977,7 +8977,7 @@ 89 | } `---- - x Ident { value: Atom('black' type=static), raw: "black" } + x Ident { value: "black", raw: "black" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:87:1] 87 | from { 88 | color: black; @@ -9041,7 +9041,7 @@ 91 | color: white `---- - x Ident { value: Atom('to' type=static), raw: "to" } + x Ident { value: "to", raw: "to" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:89:1] 89 | } 90 | to { @@ -9115,7 +9115,7 @@ 92 | } `---- - x Ident { value: Atom('color' type=static), raw: "color" } + x Ident { value: "color", raw: "color" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:90:1] 90 | to { 91 | color: white @@ -9163,7 +9163,7 @@ 92 | } `---- - x Ident { value: Atom('white' type=static), raw: "white" } + x Ident { value: "white", raw: "white" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:90:1] 90 | to { 91 | color: white @@ -9283,7 +9283,7 @@ 97 | * { background: red; } `---- - x Ident { value: Atom('--var' type=inline), raw: "--var" } + x Ident { value: "--var", raw: "--var" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:95:1] 95 | 96 | @supports (--var) { @@ -9527,7 +9527,7 @@ 101 | body { `---- - x Ident { value: Atom('green' type=static), raw: "green" } + x Ident { value: "green", raw: "green" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:99:1] 99 | 100 | @supports (--foo: green) { @@ -11301,7 +11301,7 @@ 124 | from { `---- - x Ident { value: Atom('anim' type=inline), raw: "anim" } + x Ident { value: "anim", raw: "anim" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:122:1] 122 | @supports (animation-name: test) { 123 | @-custom-keyframe anim { @@ -11371,7 +11371,7 @@ 125 | color: black; `---- - x Ident { value: Atom('from' type=static), raw: "from" } + x Ident { value: "from", raw: "from" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:123:1] 123 | @-custom-keyframe anim { 124 | from { @@ -11445,7 +11445,7 @@ 126 | } `---- - x Ident { value: Atom('color' type=static), raw: "color" } + x Ident { value: "color", raw: "color" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:124:1] 124 | from { 125 | color: black; @@ -11493,7 +11493,7 @@ 126 | } `---- - x Ident { value: Atom('black' type=static), raw: "black" } + x Ident { value: "black", raw: "black" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:124:1] 124 | from { 125 | color: black; @@ -11557,7 +11557,7 @@ 128 | color: white `---- - x Ident { value: Atom('to' type=static), raw: "to" } + x Ident { value: "to", raw: "to" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:126:1] 126 | } 127 | to { @@ -11631,7 +11631,7 @@ 129 | } `---- - x Ident { value: Atom('color' type=static), raw: "color" } + x Ident { value: "color", raw: "color" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:127:1] 127 | to { 128 | color: white @@ -11679,7 +11679,7 @@ 129 | } `---- - x Ident { value: Atom('white' type=static), raw: "white" } + x Ident { value: "white", raw: "white" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:127:1] 127 | to { 128 | color: white @@ -12553,7 +12553,7 @@ 146 | * { background: red; } `---- - x String { value: Atom('example' type=inline), raw: "\"example\"" } + x String { value: "example", raw: "\"example\"" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:144:1] 144 | 145 | @supports (func("example": 1)) { @@ -12825,7 +12825,7 @@ 150 | * { background: red; } `---- - x Ident { value: Atom('--var' type=inline), raw: "--var" } + x Ident { value: "--var", raw: "--var" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:148:1] 148 | 149 | @supports (--var) { @@ -13482,7 +13482,7 @@ 160 | * { background: red; } `---- - x String { value: Atom('example' type=inline), raw: "\"example\"" } + x String { value: "example", raw: "\"example\"" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:158:1] 158 | 159 | @supports ( func("example": 1) ) { @@ -13770,7 +13770,7 @@ 164 | * { background: red; } `---- - x Ident { value: Atom('--var' type=inline), raw: "--var" } + x Ident { value: "--var", raw: "--var" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:162:1] 162 | 163 | @supports ( --var ) { @@ -14026,7 +14026,7 @@ 168 | * { background: red; } `---- - x Ident { value: Atom('--var' type=inline), raw: "--var" } + x Ident { value: "--var", raw: "--var" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:166:1] 166 | 167 | @supports ( --var "test" ) { @@ -14058,7 +14058,7 @@ 168 | * { background: red; } `---- - x String { value: Atom('test' type=inline), raw: "\"test\"" } + x String { value: "test", raw: "\"test\"" } ,-[$DIR/tests/fixture/at-rule/supports/input.css:166:1] 166 | 167 | @supports ( --var "test" ) { diff --git a/crates/swc_css_parser/tests/fixture/at-rule/unknown/span.swc-stderr b/crates/swc_css_parser/tests/fixture/at-rule/unknown/span.swc-stderr index 2c976df68a55..edd1682be7ee 100644 --- a/crates/swc_css_parser/tests/fixture/at-rule/unknown/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/at-rule/unknown/span.swc-stderr @@ -152,7 +152,7 @@ 3 | @unknown "blah"; `---- - x Ident { value: Atom('x' type=static), raw: "x" } + x Ident { value: "x", raw: "x" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:1:1] 1 | @unknown; 2 | @unknown x y; @@ -184,7 +184,7 @@ 3 | @unknown "blah"; `---- - x Ident { value: Atom('y' type=inline), raw: "y" } + x Ident { value: "y", raw: "y" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:1:1] 1 | @unknown; 2 | @unknown x y; @@ -248,7 +248,7 @@ 4 | @unknown \"blah\"; `---- - x String { value: Atom('blah' type=inline), raw: "\"blah\"" } + x String { value: "blah", raw: "\"blah\"" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:2:1] 2 | @unknown x y; 3 | @unknown "blah"; @@ -312,7 +312,7 @@ 5 | @unknown /*test*/; `---- - x Ident { value: Atom('"blah"' type=inline), raw: "\\\"blah\\\"" } + x Ident { value: "\"blah\"", raw: "\\\"blah\\\"" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:3:1] 3 | @unknown "blah"; 4 | @unknown \"blah\"; @@ -424,7 +424,7 @@ 7 | @unknown ; `---- - x Ident { value: Atom('x' type=static), raw: "x" } + x Ident { value: "x", raw: "x" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:5:1] 5 | @unknown /*test*/; 6 | @unknown /*test*/x/*test*/ y; @@ -456,7 +456,7 @@ 7 | @unknown ; `---- - x Ident { value: Atom('y' type=inline), raw: "y" } + x Ident { value: "y", raw: "y" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:5:1] 5 | @unknown /*test*/; 6 | @unknown /*test*/x/*test*/ y; @@ -561,7 +561,7 @@ : ^ `---- - x Ident { value: Atom('x' type=static), raw: "x" } + x Ident { value: "x", raw: "x" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:7:1] 7 | @unknown ; 8 | @unknown x y; @@ -589,7 +589,7 @@ : ^ `---- - x Ident { value: Atom('y' type=inline), raw: "y" } + x Ident { value: "y", raw: "y" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:7:1] 7 | @unknown ; 8 | @unknown x y; @@ -780,7 +780,7 @@ 13 | @unknown {p:v} `---- - x Ident { value: Atom('a' type=static), raw: "a" } + x Ident { value: "a", raw: "a" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:11:1] 11 | @\unknown {} 12 | @unknown a b {} @@ -812,7 +812,7 @@ 13 | @unknown {p:v} `---- - x Ident { value: Atom('b' type=static), raw: "b" } + x Ident { value: "b", raw: "b" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:11:1] 11 | @\unknown {} 12 | @unknown a b {} @@ -924,7 +924,7 @@ 14 | @unknown x y {p:v} `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:12:1] 12 | @unknown a b {} 13 | @unknown {p:v} @@ -956,7 +956,7 @@ 14 | @unknown x y {p:v} `---- - x Ident { value: Atom('v' type=inline), raw: "v" } + x Ident { value: "v", raw: "v" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:12:1] 12 | @unknown a b {} 13 | @unknown {p:v} @@ -1020,7 +1020,7 @@ 15 | @unknown x, y x(1) {p:v} `---- - x Ident { value: Atom('x' type=static), raw: "x" } + x Ident { value: "x", raw: "x" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:13:1] 13 | @unknown {p:v} 14 | @unknown x y {p:v} @@ -1052,7 +1052,7 @@ 15 | @unknown x, y x(1) {p:v} `---- - x Ident { value: Atom('y' type=inline), raw: "y" } + x Ident { value: "y", raw: "y" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:13:1] 13 | @unknown {p:v} 14 | @unknown x y {p:v} @@ -1100,7 +1100,7 @@ 15 | @unknown x, y x(1) {p:v} `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:13:1] 13 | @unknown {p:v} 14 | @unknown x y {p:v} @@ -1132,7 +1132,7 @@ 15 | @unknown x, y x(1) {p:v} `---- - x Ident { value: Atom('v' type=inline), raw: "v" } + x Ident { value: "v", raw: "v" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:13:1] 13 | @unknown {p:v} 14 | @unknown x y {p:v} @@ -1196,7 +1196,7 @@ 16 | @unknown x, y x(1+2) {p:v} `---- - x Ident { value: Atom('x' type=static), raw: "x" } + x Ident { value: "x", raw: "x" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:14:1] 14 | @unknown x y {p:v} 15 | @unknown x, y x(1) {p:v} @@ -1244,7 +1244,7 @@ 16 | @unknown x, y x(1+2) {p:v} `---- - x Ident { value: Atom('y' type=inline), raw: "y" } + x Ident { value: "y", raw: "y" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:14:1] 14 | @unknown x y {p:v} 15 | @unknown x, y x(1) {p:v} @@ -1348,7 +1348,7 @@ 16 | @unknown x, y x(1+2) {p:v} `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:14:1] 14 | @unknown x y {p:v} 15 | @unknown x, y x(1) {p:v} @@ -1380,7 +1380,7 @@ 16 | @unknown x, y x(1+2) {p:v} `---- - x Ident { value: Atom('v' type=inline), raw: "v" } + x Ident { value: "v", raw: "v" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:14:1] 14 | @unknown x y {p:v} 15 | @unknown x, y x(1) {p:v} @@ -1444,7 +1444,7 @@ 17 | @unknown/*test*/{/*test*/p/*test*/:/*test*/v/*test*/} `---- - x Ident { value: Atom('x' type=static), raw: "x" } + x Ident { value: "x", raw: "x" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:15:1] 15 | @unknown x, y x(1) {p:v} 16 | @unknown x, y x(1+2) {p:v} @@ -1492,7 +1492,7 @@ 17 | @unknown/*test*/{/*test*/p/*test*/:/*test*/v/*test*/} `---- - x Ident { value: Atom('y' type=inline), raw: "y" } + x Ident { value: "y", raw: "y" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:15:1] 15 | @unknown x, y x(1) {p:v} 16 | @unknown x, y x(1+2) {p:v} @@ -1612,7 +1612,7 @@ 17 | @unknown/*test*/{/*test*/p/*test*/:/*test*/v/*test*/} `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:15:1] 15 | @unknown x, y x(1) {p:v} 16 | @unknown x, y x(1+2) {p:v} @@ -1644,7 +1644,7 @@ 17 | @unknown/*test*/{/*test*/p/*test*/:/*test*/v/*test*/} `---- - x Ident { value: Atom('v' type=inline), raw: "v" } + x Ident { value: "v", raw: "v" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:15:1] 15 | @unknown x, y x(1) {p:v} 16 | @unknown x, y x(1+2) {p:v} @@ -1708,7 +1708,7 @@ 18 | @unknown /*test*/x/*test*/ y/*test*/{/*test*/p/*test*/:/*test*/v/*test*/} `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:16:1] 16 | @unknown x, y x(1+2) {p:v} 17 | @unknown/*test*/{/*test*/p/*test*/:/*test*/v/*test*/} @@ -1740,7 +1740,7 @@ 18 | @unknown /*test*/x/*test*/ y/*test*/{/*test*/p/*test*/:/*test*/v/*test*/} `---- - x Ident { value: Atom('v' type=inline), raw: "v" } + x Ident { value: "v", raw: "v" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:16:1] 16 | @unknown x, y x(1+2) {p:v} 17 | @unknown/*test*/{/*test*/p/*test*/:/*test*/v/*test*/} @@ -1804,7 +1804,7 @@ 19 | /*@unknown !*test*!x!*test*!,!*test*!y!*test*! x(!*test*!1!*test*!+!*test*!2!*test*!)!*test*!{!*test*!p!*test*!:!*test*!v!*test*!}*/ `---- - x Ident { value: Atom('x' type=static), raw: "x" } + x Ident { value: "x", raw: "x" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:17:1] 17 | @unknown/*test*/{/*test*/p/*test*/:/*test*/v/*test*/} 18 | @unknown /*test*/x/*test*/ y/*test*/{/*test*/p/*test*/:/*test*/v/*test*/} @@ -1836,7 +1836,7 @@ 19 | /*@unknown !*test*!x!*test*!,!*test*!y!*test*! x(!*test*!1!*test*!+!*test*!2!*test*!)!*test*!{!*test*!p!*test*!:!*test*!v!*test*!}*/ `---- - x Ident { value: Atom('y' type=inline), raw: "y" } + x Ident { value: "y", raw: "y" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:17:1] 17 | @unknown/*test*/{/*test*/p/*test*/:/*test*/v/*test*/} 18 | @unknown /*test*/x/*test*/ y/*test*/{/*test*/p/*test*/:/*test*/v/*test*/} @@ -1868,7 +1868,7 @@ 19 | /*@unknown !*test*!x!*test*!,!*test*!y!*test*! x(!*test*!1!*test*!+!*test*!2!*test*!)!*test*!{!*test*!p!*test*!:!*test*!v!*test*!}*/ `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:17:1] 17 | @unknown/*test*/{/*test*/p/*test*/:/*test*/v/*test*/} 18 | @unknown /*test*/x/*test*/ y/*test*/{/*test*/p/*test*/:/*test*/v/*test*/} @@ -1900,7 +1900,7 @@ 19 | /*@unknown !*test*!x!*test*!,!*test*!y!*test*! x(!*test*!1!*test*!+!*test*!2!*test*!)!*test*!{!*test*!p!*test*!:!*test*!v!*test*!}*/ `---- - x Ident { value: Atom('v' type=inline), raw: "v" } + x Ident { value: "v", raw: "v" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:17:1] 17 | @unknown/*test*/{/*test*/p/*test*/:/*test*/v/*test*/} 18 | @unknown /*test*/x/*test*/ y/*test*/{/*test*/p/*test*/:/*test*/v/*test*/} @@ -1996,7 +1996,7 @@ 21 | @unknown x y { p : v } `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:19:1] 19 | /*@unknown !*test*!x!*test*!,!*test*!y!*test*! x(!*test*!1!*test*!+!*test*!2!*test*!)!*test*!{!*test*!p!*test*!:!*test*!v!*test*!}*/ 20 | @unknown { p : v } @@ -2060,7 +2060,7 @@ 21 | @unknown x y { p : v } `---- - x Ident { value: Atom('v' type=inline), raw: "v" } + x Ident { value: "v", raw: "v" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:19:1] 19 | /*@unknown !*test*!x!*test*!,!*test*!y!*test*! x(!*test*!1!*test*!+!*test*!2!*test*!)!*test*!{!*test*!p!*test*!:!*test*!v!*test*!}*/ 20 | @unknown { p : v } @@ -2140,7 +2140,7 @@ 22 | @unknown x , y x( 1 + 2 ) { p : v } `---- - x Ident { value: Atom('x' type=static), raw: "x" } + x Ident { value: "x", raw: "x" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:20:1] 20 | @unknown { p : v } 21 | @unknown x y { p : v } @@ -2172,7 +2172,7 @@ 22 | @unknown x , y x( 1 + 2 ) { p : v } `---- - x Ident { value: Atom('y' type=inline), raw: "y" } + x Ident { value: "y", raw: "y" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:20:1] 20 | @unknown { p : v } 21 | @unknown x y { p : v } @@ -2236,7 +2236,7 @@ 22 | @unknown x , y x( 1 + 2 ) { p : v } `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:20:1] 20 | @unknown { p : v } 21 | @unknown x y { p : v } @@ -2300,7 +2300,7 @@ 22 | @unknown x , y x( 1 + 2 ) { p : v } `---- - x Ident { value: Atom('v' type=inline), raw: "v" } + x Ident { value: "v", raw: "v" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:20:1] 20 | @unknown { p : v } 21 | @unknown x y { p : v } @@ -2373,7 +2373,7 @@ : ^ `---- - x Ident { value: Atom('x' type=static), raw: "x" } + x Ident { value: "x", raw: "x" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:21:1] 21 | @unknown x y { p : v } 22 | @unknown x , y x( 1 + 2 ) { p : v } @@ -2429,7 +2429,7 @@ : ^ `---- - x Ident { value: Atom('y' type=inline), raw: "y" } + x Ident { value: "y", raw: "y" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:21:1] 21 | @unknown x y { p : v } 22 | @unknown x , y x( 1 + 2 ) { p : v } @@ -2618,7 +2618,7 @@ : ^ `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:21:1] 21 | @unknown x y { p : v } 22 | @unknown x , y x( 1 + 2 ) { p : v } @@ -2674,7 +2674,7 @@ : ^ `---- - x Ident { value: Atom('v' type=inline), raw: "v" } + x Ident { value: "v", raw: "v" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:21:1] 21 | @unknown x y { p : v } 22 | @unknown x , y x( 1 + 2 ) { p : v } @@ -2767,7 +2767,7 @@ 25 | @unknown x y {s{p:v}} `---- - x Ident { value: Atom('s' type=static), raw: "s" } + x Ident { value: "s", raw: "s" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:23:1] 23 | 24 | @unknown {s{p:v}} @@ -2807,7 +2807,7 @@ 25 | @unknown x y {s{p:v}} `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:23:1] 23 | 24 | @unknown {s{p:v}} @@ -2839,7 +2839,7 @@ 25 | @unknown x y {s{p:v}} `---- - x Ident { value: Atom('v' type=inline), raw: "v" } + x Ident { value: "v", raw: "v" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:23:1] 23 | 24 | @unknown {s{p:v}} @@ -2903,7 +2903,7 @@ 26 | @unknown x, y f(1) {s{p:v}} `---- - x Ident { value: Atom('x' type=static), raw: "x" } + x Ident { value: "x", raw: "x" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:24:1] 24 | @unknown {s{p:v}} 25 | @unknown x y {s{p:v}} @@ -2935,7 +2935,7 @@ 26 | @unknown x, y f(1) {s{p:v}} `---- - x Ident { value: Atom('y' type=inline), raw: "y" } + x Ident { value: "y", raw: "y" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:24:1] 24 | @unknown {s{p:v}} 25 | @unknown x y {s{p:v}} @@ -2983,7 +2983,7 @@ 26 | @unknown x, y f(1) {s{p:v}} `---- - x Ident { value: Atom('s' type=static), raw: "s" } + x Ident { value: "s", raw: "s" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:24:1] 24 | @unknown {s{p:v}} 25 | @unknown x y {s{p:v}} @@ -3023,7 +3023,7 @@ 26 | @unknown x, y f(1) {s{p:v}} `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:24:1] 24 | @unknown {s{p:v}} 25 | @unknown x y {s{p:v}} @@ -3055,7 +3055,7 @@ 26 | @unknown x, y f(1) {s{p:v}} `---- - x Ident { value: Atom('v' type=inline), raw: "v" } + x Ident { value: "v", raw: "v" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:24:1] 24 | @unknown {s{p:v}} 25 | @unknown x y {s{p:v}} @@ -3119,7 +3119,7 @@ 27 | @unknown x, y f(1+2) {s{p:v}} `---- - x Ident { value: Atom('x' type=static), raw: "x" } + x Ident { value: "x", raw: "x" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:25:1] 25 | @unknown x y {s{p:v}} 26 | @unknown x, y f(1) {s{p:v}} @@ -3167,7 +3167,7 @@ 27 | @unknown x, y f(1+2) {s{p:v}} `---- - x Ident { value: Atom('y' type=inline), raw: "y" } + x Ident { value: "y", raw: "y" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:25:1] 25 | @unknown x y {s{p:v}} 26 | @unknown x, y f(1) {s{p:v}} @@ -3271,7 +3271,7 @@ 27 | @unknown x, y f(1+2) {s{p:v}} `---- - x Ident { value: Atom('s' type=static), raw: "s" } + x Ident { value: "s", raw: "s" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:25:1] 25 | @unknown x y {s{p:v}} 26 | @unknown x, y f(1) {s{p:v}} @@ -3311,7 +3311,7 @@ 27 | @unknown x, y f(1+2) {s{p:v}} `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:25:1] 25 | @unknown x y {s{p:v}} 26 | @unknown x, y f(1) {s{p:v}} @@ -3343,7 +3343,7 @@ 27 | @unknown x, y f(1+2) {s{p:v}} `---- - x Ident { value: Atom('v' type=inline), raw: "v" } + x Ident { value: "v", raw: "v" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:25:1] 25 | @unknown x y {s{p:v}} 26 | @unknown x, y f(1) {s{p:v}} @@ -3407,7 +3407,7 @@ 28 | @unknown { .a { p: v; } .b { p: v } } `---- - x Ident { value: Atom('x' type=static), raw: "x" } + x Ident { value: "x", raw: "x" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:26:1] 26 | @unknown x, y f(1) {s{p:v}} 27 | @unknown x, y f(1+2) {s{p:v}} @@ -3455,7 +3455,7 @@ 28 | @unknown { .a { p: v; } .b { p: v } } `---- - x Ident { value: Atom('y' type=inline), raw: "y" } + x Ident { value: "y", raw: "y" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:26:1] 26 | @unknown x, y f(1) {s{p:v}} 27 | @unknown x, y f(1+2) {s{p:v}} @@ -3575,7 +3575,7 @@ 28 | @unknown { .a { p: v; } .b { p: v } } `---- - x Ident { value: Atom('s' type=static), raw: "s" } + x Ident { value: "s", raw: "s" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:26:1] 26 | @unknown x, y f(1) {s{p:v}} 27 | @unknown x, y f(1+2) {s{p:v}} @@ -3615,7 +3615,7 @@ 28 | @unknown { .a { p: v; } .b { p: v } } `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:26:1] 26 | @unknown x, y f(1) {s{p:v}} 27 | @unknown x, y f(1+2) {s{p:v}} @@ -3647,7 +3647,7 @@ 28 | @unknown { .a { p: v; } .b { p: v } } `---- - x Ident { value: Atom('v' type=inline), raw: "v" } + x Ident { value: "v", raw: "v" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:26:1] 26 | @unknown x, y f(1) {s{p:v}} 27 | @unknown x, y f(1+2) {s{p:v}} @@ -3759,7 +3759,7 @@ 29 | @unknown/*test*/{/*test*/s/*test*/{/*test*/p/*test*/:/*test*/v/*test*/}/*test*/} `---- - x Ident { value: Atom('a' type=static), raw: "a" } + x Ident { value: "a", raw: "a" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:27:1] 27 | @unknown x, y f(1+2) {s{p:v}} 28 | @unknown { .a { p: v; } .b { p: v } } @@ -3831,7 +3831,7 @@ 29 | @unknown/*test*/{/*test*/s/*test*/{/*test*/p/*test*/:/*test*/v/*test*/}/*test*/} `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:27:1] 27 | @unknown x, y f(1+2) {s{p:v}} 28 | @unknown { .a { p: v; } .b { p: v } } @@ -3879,7 +3879,7 @@ 29 | @unknown/*test*/{/*test*/s/*test*/{/*test*/p/*test*/:/*test*/v/*test*/}/*test*/} `---- - x Ident { value: Atom('v' type=inline), raw: "v" } + x Ident { value: "v", raw: "v" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:27:1] 27 | @unknown x, y f(1+2) {s{p:v}} 28 | @unknown { .a { p: v; } .b { p: v } } @@ -3959,7 +3959,7 @@ 29 | @unknown/*test*/{/*test*/s/*test*/{/*test*/p/*test*/:/*test*/v/*test*/}/*test*/} `---- - x Ident { value: Atom('b' type=static), raw: "b" } + x Ident { value: "b", raw: "b" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:27:1] 27 | @unknown x, y f(1+2) {s{p:v}} 28 | @unknown { .a { p: v; } .b { p: v } } @@ -4031,7 +4031,7 @@ 29 | @unknown/*test*/{/*test*/s/*test*/{/*test*/p/*test*/:/*test*/v/*test*/}/*test*/} `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:27:1] 27 | @unknown x, y f(1+2) {s{p:v}} 28 | @unknown { .a { p: v; } .b { p: v } } @@ -4079,7 +4079,7 @@ 29 | @unknown/*test*/{/*test*/s/*test*/{/*test*/p/*test*/:/*test*/v/*test*/}/*test*/} `---- - x Ident { value: Atom('v' type=inline), raw: "v" } + x Ident { value: "v", raw: "v" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:27:1] 27 | @unknown x, y f(1+2) {s{p:v}} 28 | @unknown { .a { p: v; } .b { p: v } } @@ -4175,7 +4175,7 @@ 30 | @unknown /*test*/x/*test*/ y/*test*/{/*test*/s/*test*/{/*test*/p/*test*/:/*test*/v/*test*/}/*test*/} `---- - x Ident { value: Atom('s' type=static), raw: "s" } + x Ident { value: "s", raw: "s" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:28:1] 28 | @unknown { .a { p: v; } .b { p: v } } 29 | @unknown/*test*/{/*test*/s/*test*/{/*test*/p/*test*/:/*test*/v/*test*/}/*test*/} @@ -4215,7 +4215,7 @@ 30 | @unknown /*test*/x/*test*/ y/*test*/{/*test*/s/*test*/{/*test*/p/*test*/:/*test*/v/*test*/}/*test*/} `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:28:1] 28 | @unknown { .a { p: v; } .b { p: v } } 29 | @unknown/*test*/{/*test*/s/*test*/{/*test*/p/*test*/:/*test*/v/*test*/}/*test*/} @@ -4247,7 +4247,7 @@ 30 | @unknown /*test*/x/*test*/ y/*test*/{/*test*/s/*test*/{/*test*/p/*test*/:/*test*/v/*test*/}/*test*/} `---- - x Ident { value: Atom('v' type=inline), raw: "v" } + x Ident { value: "v", raw: "v" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:28:1] 28 | @unknown { .a { p: v; } .b { p: v } } 29 | @unknown/*test*/{/*test*/s/*test*/{/*test*/p/*test*/:/*test*/v/*test*/}/*test*/} @@ -4311,7 +4311,7 @@ 31 | /*@unknown !*test*!x!*test*!,!*test*!y!*test*! f(!*test*!1!*test*!+!*test*!2!*test*!)!*test*!{!*test*!s!*test*!{!*test*!p!*test*!:!*test*!v!*test*!}!*test*!}*/ `---- - x Ident { value: Atom('x' type=static), raw: "x" } + x Ident { value: "x", raw: "x" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:29:1] 29 | @unknown/*test*/{/*test*/s/*test*/{/*test*/p/*test*/:/*test*/v/*test*/}/*test*/} 30 | @unknown /*test*/x/*test*/ y/*test*/{/*test*/s/*test*/{/*test*/p/*test*/:/*test*/v/*test*/}/*test*/} @@ -4343,7 +4343,7 @@ 31 | /*@unknown !*test*!x!*test*!,!*test*!y!*test*! f(!*test*!1!*test*!+!*test*!2!*test*!)!*test*!{!*test*!s!*test*!{!*test*!p!*test*!:!*test*!v!*test*!}!*test*!}*/ `---- - x Ident { value: Atom('y' type=inline), raw: "y" } + x Ident { value: "y", raw: "y" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:29:1] 29 | @unknown/*test*/{/*test*/s/*test*/{/*test*/p/*test*/:/*test*/v/*test*/}/*test*/} 30 | @unknown /*test*/x/*test*/ y/*test*/{/*test*/s/*test*/{/*test*/p/*test*/:/*test*/v/*test*/}/*test*/} @@ -4375,7 +4375,7 @@ 31 | /*@unknown !*test*!x!*test*!,!*test*!y!*test*! f(!*test*!1!*test*!+!*test*!2!*test*!)!*test*!{!*test*!s!*test*!{!*test*!p!*test*!:!*test*!v!*test*!}!*test*!}*/ `---- - x Ident { value: Atom('s' type=static), raw: "s" } + x Ident { value: "s", raw: "s" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:29:1] 29 | @unknown/*test*/{/*test*/s/*test*/{/*test*/p/*test*/:/*test*/v/*test*/}/*test*/} 30 | @unknown /*test*/x/*test*/ y/*test*/{/*test*/s/*test*/{/*test*/p/*test*/:/*test*/v/*test*/}/*test*/} @@ -4415,7 +4415,7 @@ 31 | /*@unknown !*test*!x!*test*!,!*test*!y!*test*! f(!*test*!1!*test*!+!*test*!2!*test*!)!*test*!{!*test*!s!*test*!{!*test*!p!*test*!:!*test*!v!*test*!}!*test*!}*/ `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:29:1] 29 | @unknown/*test*/{/*test*/s/*test*/{/*test*/p/*test*/:/*test*/v/*test*/}/*test*/} 30 | @unknown /*test*/x/*test*/ y/*test*/{/*test*/s/*test*/{/*test*/p/*test*/:/*test*/v/*test*/}/*test*/} @@ -4447,7 +4447,7 @@ 31 | /*@unknown !*test*!x!*test*!,!*test*!y!*test*! f(!*test*!1!*test*!+!*test*!2!*test*!)!*test*!{!*test*!s!*test*!{!*test*!p!*test*!:!*test*!v!*test*!}!*test*!}*/ `---- - x Ident { value: Atom('v' type=inline), raw: "v" } + x Ident { value: "v", raw: "v" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:29:1] 29 | @unknown/*test*/{/*test*/s/*test*/{/*test*/p/*test*/:/*test*/v/*test*/}/*test*/} 30 | @unknown /*test*/x/*test*/ y/*test*/{/*test*/s/*test*/{/*test*/p/*test*/:/*test*/v/*test*/}/*test*/} @@ -4543,7 +4543,7 @@ 33 | @unknown x y { s { p : v } } `---- - x Ident { value: Atom('s' type=static), raw: "s" } + x Ident { value: "s", raw: "s" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:31:1] 31 | /*@unknown !*test*!x!*test*!,!*test*!y!*test*! f(!*test*!1!*test*!+!*test*!2!*test*!)!*test*!{!*test*!s!*test*!{!*test*!p!*test*!:!*test*!v!*test*!}!*test*!}*/ 32 | @unknown { s { p : v } } @@ -4615,7 +4615,7 @@ 33 | @unknown x y { s { p : v } } `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:31:1] 31 | /*@unknown !*test*!x!*test*!,!*test*!y!*test*! f(!*test*!1!*test*!+!*test*!2!*test*!)!*test*!{!*test*!s!*test*!{!*test*!p!*test*!:!*test*!v!*test*!}!*test*!}*/ 32 | @unknown { s { p : v } } @@ -4679,7 +4679,7 @@ 33 | @unknown x y { s { p : v } } `---- - x Ident { value: Atom('v' type=inline), raw: "v" } + x Ident { value: "v", raw: "v" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:31:1] 31 | /*@unknown !*test*!x!*test*!,!*test*!y!*test*! f(!*test*!1!*test*!+!*test*!2!*test*!)!*test*!{!*test*!s!*test*!{!*test*!p!*test*!:!*test*!v!*test*!}!*test*!}*/ 32 | @unknown { s { p : v } } @@ -4775,7 +4775,7 @@ 34 | @unknown x , y f( 1 ) { s { p : v } } `---- - x Ident { value: Atom('x' type=static), raw: "x" } + x Ident { value: "x", raw: "x" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:32:1] 32 | @unknown { s { p : v } } 33 | @unknown x y { s { p : v } } @@ -4807,7 +4807,7 @@ 34 | @unknown x , y f( 1 ) { s { p : v } } `---- - x Ident { value: Atom('y' type=inline), raw: "y" } + x Ident { value: "y", raw: "y" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:32:1] 32 | @unknown { s { p : v } } 33 | @unknown x y { s { p : v } } @@ -4871,7 +4871,7 @@ 34 | @unknown x , y f( 1 ) { s { p : v } } `---- - x Ident { value: Atom('s' type=static), raw: "s" } + x Ident { value: "s", raw: "s" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:32:1] 32 | @unknown { s { p : v } } 33 | @unknown x y { s { p : v } } @@ -4943,7 +4943,7 @@ 34 | @unknown x , y f( 1 ) { s { p : v } } `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:32:1] 32 | @unknown { s { p : v } } 33 | @unknown x y { s { p : v } } @@ -5007,7 +5007,7 @@ 34 | @unknown x , y f( 1 ) { s { p : v } } `---- - x Ident { value: Atom('v' type=inline), raw: "v" } + x Ident { value: "v", raw: "v" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:32:1] 32 | @unknown { s { p : v } } 33 | @unknown x y { s { p : v } } @@ -5103,7 +5103,7 @@ 35 | @unknown x , y f( 1 2 ) { s { p : v } } `---- - x Ident { value: Atom('x' type=static), raw: "x" } + x Ident { value: "x", raw: "x" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:33:1] 33 | @unknown x y { s { p : v } } 34 | @unknown x , y f( 1 ) { s { p : v } } @@ -5167,7 +5167,7 @@ 35 | @unknown x , y f( 1 2 ) { s { p : v } } `---- - x Ident { value: Atom('y' type=inline), raw: "y" } + x Ident { value: "y", raw: "y" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:33:1] 33 | @unknown x y { s { p : v } } 34 | @unknown x , y f( 1 ) { s { p : v } } @@ -5319,7 +5319,7 @@ 35 | @unknown x , y f( 1 2 ) { s { p : v } } `---- - x Ident { value: Atom('s' type=static), raw: "s" } + x Ident { value: "s", raw: "s" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:33:1] 33 | @unknown x y { s { p : v } } 34 | @unknown x , y f( 1 ) { s { p : v } } @@ -5391,7 +5391,7 @@ 35 | @unknown x , y f( 1 2 ) { s { p : v } } `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:33:1] 33 | @unknown x y { s { p : v } } 34 | @unknown x , y f( 1 ) { s { p : v } } @@ -5455,7 +5455,7 @@ 35 | @unknown x , y f( 1 2 ) { s { p : v } } `---- - x Ident { value: Atom('v' type=inline), raw: "v" } + x Ident { value: "v", raw: "v" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:33:1] 33 | @unknown x y { s { p : v } } 34 | @unknown x , y f( 1 ) { s { p : v } } @@ -5544,7 +5544,7 @@ : ^ `---- - x Ident { value: Atom('x' type=static), raw: "x" } + x Ident { value: "x", raw: "x" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:34:1] 34 | @unknown x , y f( 1 ) { s { p : v } } 35 | @unknown x , y f( 1 2 ) { s { p : v } } @@ -5600,7 +5600,7 @@ : ^ `---- - x Ident { value: Atom('y' type=inline), raw: "y" } + x Ident { value: "y", raw: "y" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:34:1] 34 | @unknown x , y f( 1 ) { s { p : v } } 35 | @unknown x , y f( 1 2 ) { s { p : v } } @@ -5761,7 +5761,7 @@ : ^ `---- - x Ident { value: Atom('s' type=static), raw: "s" } + x Ident { value: "s", raw: "s" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:34:1] 34 | @unknown x , y f( 1 ) { s { p : v } } 35 | @unknown x , y f( 1 2 ) { s { p : v } } @@ -5824,7 +5824,7 @@ : ^ `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:34:1] 34 | @unknown x , y f( 1 ) { s { p : v } } 35 | @unknown x , y f( 1 2 ) { s { p : v } } @@ -5880,7 +5880,7 @@ : ^ `---- - x Ident { value: Atom('v' type=inline), raw: "v" } + x Ident { value: "v", raw: "v" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:34:1] 34 | @unknown x , y f( 1 ) { s { p : v } } 35 | @unknown x , y f( 1 2 ) { s { p : v } } @@ -6230,7 +6230,7 @@ 44 | } `---- - x AtKeyword { value: Atom('unknown' type=static), raw: "unknown" } + x AtKeyword { value: "unknown", raw: "unknown" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:42:1] 42 | @unknown { 43 | @unknown {s{p:v}} @@ -6286,7 +6286,7 @@ 44 | } `---- - x Ident { value: Atom('s' type=static), raw: "s" } + x Ident { value: "s", raw: "s" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:42:1] 42 | @unknown { 43 | @unknown {s{p:v}} @@ -6326,7 +6326,7 @@ 44 | } `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:42:1] 42 | @unknown { 43 | @unknown {s{p:v}} @@ -6358,7 +6358,7 @@ 44 | } `---- - x Ident { value: Atom('v' type=inline), raw: "v" } + x Ident { value: "v", raw: "v" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:42:1] 42 | @unknown { 43 | @unknown {s{p:v}} @@ -6476,7 +6476,7 @@ 48 | `---- - x AtKeyword { value: Atom('unknown' type=static), raw: "unknown" } + x AtKeyword { value: "unknown", raw: "unknown" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:46:1] 46 | @unknown { 47 | @unknown {s{p:v}} @@ -6532,7 +6532,7 @@ 48 | `---- - x Ident { value: Atom('s' type=static), raw: "s" } + x Ident { value: "s", raw: "s" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:46:1] 46 | @unknown { 47 | @unknown {s{p:v}} @@ -6572,7 +6572,7 @@ 48 | `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:46:1] 46 | @unknown { 47 | @unknown {s{p:v}} @@ -6604,7 +6604,7 @@ 48 | `---- - x Ident { value: Atom('v' type=inline), raw: "v" } + x Ident { value: "v", raw: "v" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:46:1] 46 | @unknown { 47 | @unknown {s{p:v}} @@ -6638,7 +6638,7 @@ 50 | } `---- - x Ident { value: Atom('color' type=static), raw: "color" } + x Ident { value: "color", raw: "color" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:48:1] 48 | 49 | color: red; @@ -6686,7 +6686,7 @@ 50 | } `---- - x Ident { value: Atom('red' type=static), raw: "red" } + x Ident { value: "red", raw: "red" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:48:1] 48 | 49 | color: red; @@ -6923,7 +6923,7 @@ : ^ `---- - x Ident { value: Atom('s' type=static), raw: "s" } + x Ident { value: "s", raw: "s" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:52:1] 52 | .foo { 53 | @unknown {s{p:v}} @@ -6958,7 +6958,7 @@ : ^ `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:52:1] 52 | .foo { 53 | @unknown {s{p:v}} @@ -6986,7 +6986,7 @@ : ^ `---- - x Ident { value: Atom('v' type=inline), raw: "v" } + x Ident { value: "v", raw: "v" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:52:1] 52 | .foo { 53 | @unknown {s{p:v}} @@ -7049,7 +7049,7 @@ 59 | @unknown x ( a , b ) { foo: bar } `---- - x Ident { value: Atom('x' type=static), raw: "x" } + x Ident { value: "x", raw: "x" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:57:1] 57 | 58 | @unknown x ( a , b ) ; @@ -7121,7 +7121,7 @@ 59 | @unknown x ( a , b ) { foo: bar } `---- - x Ident { value: Atom('a' type=static), raw: "a" } + x Ident { value: "a", raw: "a" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:57:1] 57 | 58 | @unknown x ( a , b ) ; @@ -7185,7 +7185,7 @@ 59 | @unknown x ( a , b ) { foo: bar } `---- - x Ident { value: Atom('b' type=static), raw: "b" } + x Ident { value: "b", raw: "b" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:57:1] 57 | 58 | @unknown x ( a , b ) ; @@ -7281,7 +7281,7 @@ 60 | @unknown x( a, b ) { foo: bar } `---- - x Ident { value: Atom('x' type=static), raw: "x" } + x Ident { value: "x", raw: "x" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:58:1] 58 | @unknown x ( a , b ) ; 59 | @unknown x ( a , b ) { foo: bar } @@ -7353,7 +7353,7 @@ 60 | @unknown x( a, b ) { foo: bar } `---- - x Ident { value: Atom('a' type=static), raw: "a" } + x Ident { value: "a", raw: "a" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:58:1] 58 | @unknown x ( a , b ) ; 59 | @unknown x ( a , b ) { foo: bar } @@ -7417,7 +7417,7 @@ 60 | @unknown x( a, b ) { foo: bar } `---- - x Ident { value: Atom('b' type=static), raw: "b" } + x Ident { value: "b", raw: "b" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:58:1] 58 | @unknown x ( a , b ) ; 59 | @unknown x ( a , b ) { foo: bar } @@ -7497,7 +7497,7 @@ 60 | @unknown x( a, b ) { foo: bar } `---- - x Ident { value: Atom('foo' type=inline), raw: "foo" } + x Ident { value: "foo", raw: "foo" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:58:1] 58 | @unknown x ( a , b ) ; 59 | @unknown x ( a , b ) { foo: bar } @@ -7545,7 +7545,7 @@ 60 | @unknown x( a, b ) { foo: bar } `---- - x Ident { value: Atom('bar' type=inline), raw: "bar" } + x Ident { value: "bar", raw: "bar" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:58:1] 58 | @unknown x ( a , b ) ; 59 | @unknown x ( a , b ) { foo: bar } @@ -7665,7 +7665,7 @@ 61 | @unknown x ( a + b ) ; `---- - x Ident { value: Atom('a' type=static), raw: "a" } + x Ident { value: "a", raw: "a" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:59:1] 59 | @unknown x ( a , b ) { foo: bar } 60 | @unknown x( a, b ) { foo: bar } @@ -7713,7 +7713,7 @@ 61 | @unknown x ( a + b ) ; `---- - x Ident { value: Atom('b' type=static), raw: "b" } + x Ident { value: "b", raw: "b" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:59:1] 59 | @unknown x ( a , b ) { foo: bar } 60 | @unknown x( a, b ) { foo: bar } @@ -7793,7 +7793,7 @@ 61 | @unknown x ( a + b ) ; `---- - x Ident { value: Atom('foo' type=inline), raw: "foo" } + x Ident { value: "foo", raw: "foo" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:59:1] 59 | @unknown x ( a , b ) { foo: bar } 60 | @unknown x( a, b ) { foo: bar } @@ -7841,7 +7841,7 @@ 61 | @unknown x ( a + b ) ; `---- - x Ident { value: Atom('bar' type=inline), raw: "bar" } + x Ident { value: "bar", raw: "bar" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:59:1] 59 | @unknown x ( a , b ) { foo: bar } 60 | @unknown x( a, b ) { foo: bar } @@ -7921,7 +7921,7 @@ 62 | @unknown x ( a - b ) ; `---- - x Ident { value: Atom('x' type=static), raw: "x" } + x Ident { value: "x", raw: "x" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:60:1] 60 | @unknown x( a, b ) { foo: bar } 61 | @unknown x ( a + b ) ; @@ -7993,7 +7993,7 @@ 62 | @unknown x ( a - b ) ; `---- - x Ident { value: Atom('a' type=static), raw: "a" } + x Ident { value: "a", raw: "a" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:60:1] 60 | @unknown x( a, b ) { foo: bar } 61 | @unknown x ( a + b ) ; @@ -8057,7 +8057,7 @@ 62 | @unknown x ( a - b ) ; `---- - x Ident { value: Atom('b' type=static), raw: "b" } + x Ident { value: "b", raw: "b" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:60:1] 60 | @unknown x( a, b ) { foo: bar } 61 | @unknown x ( a + b ) ; @@ -8153,7 +8153,7 @@ 63 | @unknown x ( a * b ) ; `---- - x Ident { value: Atom('x' type=static), raw: "x" } + x Ident { value: "x", raw: "x" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:61:1] 61 | @unknown x ( a + b ) ; 62 | @unknown x ( a - b ) ; @@ -8225,7 +8225,7 @@ 63 | @unknown x ( a * b ) ; `---- - x Ident { value: Atom('a' type=static), raw: "a" } + x Ident { value: "a", raw: "a" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:61:1] 61 | @unknown x ( a + b ) ; 62 | @unknown x ( a - b ) ; @@ -8289,7 +8289,7 @@ 63 | @unknown x ( a * b ) ; `---- - x Ident { value: Atom('b' type=static), raw: "b" } + x Ident { value: "b", raw: "b" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:61:1] 61 | @unknown x ( a + b ) ; 62 | @unknown x ( a - b ) ; @@ -8385,7 +8385,7 @@ 64 | @unknown x ( a / b ) ; `---- - x Ident { value: Atom('x' type=static), raw: "x" } + x Ident { value: "x", raw: "x" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:62:1] 62 | @unknown x ( a - b ) ; 63 | @unknown x ( a * b ) ; @@ -8457,7 +8457,7 @@ 64 | @unknown x ( a / b ) ; `---- - x Ident { value: Atom('a' type=static), raw: "a" } + x Ident { value: "a", raw: "a" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:62:1] 62 | @unknown x ( a - b ) ; 63 | @unknown x ( a * b ) ; @@ -8521,7 +8521,7 @@ 64 | @unknown x ( a / b ) ; `---- - x Ident { value: Atom('b' type=static), raw: "b" } + x Ident { value: "b", raw: "b" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:62:1] 62 | @unknown x ( a - b ) ; 63 | @unknown x ( a * b ) ; @@ -8617,7 +8617,7 @@ 65 | @unknown{} `---- - x Ident { value: Atom('x' type=static), raw: "x" } + x Ident { value: "x", raw: "x" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:63:1] 63 | @unknown x ( a * b ) ; 64 | @unknown x ( a / b ) ; @@ -8689,7 +8689,7 @@ 65 | @unknown{} `---- - x Ident { value: Atom('a' type=static), raw: "a" } + x Ident { value: "a", raw: "a" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:63:1] 63 | @unknown x ( a * b ) ; 64 | @unknown x ( a / b ) ; @@ -8753,7 +8753,7 @@ 65 | @unknown{} `---- - x Ident { value: Atom('b' type=static), raw: "b" } + x Ident { value: "b", raw: "b" } ,-[$DIR/tests/fixture/at-rule/unknown/input.css:63:1] 63 | @unknown x ( a * b ) ; 64 | @unknown x ( a / b ) ; diff --git a/crates/swc_css_parser/tests/fixture/dashed-ident/span.swc-stderr b/crates/swc_css_parser/tests/fixture/dashed-ident/span.swc-stderr index 1fde1c51f008..f2bc5856a8cc 100644 --- a/crates/swc_css_parser/tests/fixture/dashed-ident/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/dashed-ident/span.swc-stderr @@ -135,7 +135,7 @@ 3 | --accent-color: #006; `---- - x Hash { is_id: false, value: Atom('06c' type=inline), raw: "06c" } + x Hash { is_id: false, value: "06c", raw: "06c" } ,-[$DIR/tests/fixture/dashed-ident/input.css:1:1] 1 | :root { 2 | --main-color: #06c; @@ -183,7 +183,7 @@ 4 | } `---- - x Hash { is_id: false, value: Atom('006' type=inline), raw: "006" } + x Hash { is_id: false, value: "006", raw: "006" } ,-[$DIR/tests/fixture/dashed-ident/input.css:2:1] 2 | --main-color: #06c; 3 | --accent-color: #006; @@ -311,7 +311,7 @@ 8 | } `---- - x Ident { value: Atom('blue' type=static), raw: "blue" } + x Ident { value: "blue", raw: "blue" } ,-[$DIR/tests/fixture/dashed-ident/input.css:6:1] 6 | .foo { 7 | --fg-color: blue; @@ -783,7 +783,7 @@ 19 | } `---- - x String { value: Atom('test' type=inline), raw: "\"test\"" } + x String { value: "test", raw: "\"test\"" } ,-[$DIR/tests/fixture/dashed-ident/input.css:17:1] 17 | .class { 18 | --vendor-property: --vendor-function("test"); diff --git a/crates/swc_css_parser/tests/fixture/function/calc/span.swc-stderr b/crates/swc_css_parser/tests/fixture/function/calc/span.swc-stderr index f116a875c8aa..eda44cbb09e1 100644 --- a/crates/swc_css_parser/tests/fixture/function/calc/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/function/calc/span.swc-stderr @@ -670,7 +670,7 @@ : ^^^^ `---- - x Dimension(DimensionToken { value: 30.0, raw_value: "30", unit: Atom('px' type=static), type_flag: Integer, raw_unit: "px" }) + x Dimension(DimensionToken { value: 30.0, raw_value: "30", unit: "px", type_flag: Integer, raw_unit: "px" }) ,-[$DIR/tests/fixture/function/calc/input.css:5:1] 5 | div { 6 | --width: calc(10% + 30px); diff --git a/crates/swc_css_parser/tests/fixture/function/unknown/span.swc-stderr b/crates/swc_css_parser/tests/fixture/function/unknown/span.swc-stderr index f68d505f0b51..279eb93b4645 100644 --- a/crates/swc_css_parser/tests/fixture/function/unknown/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/function/unknown/span.swc-stderr @@ -251,7 +251,7 @@ 4 | prod: --fn--fn(100px); `---- - x Dimension(DimensionToken { value: 100.0, raw_value: "100", unit: Atom('px' type=static), type_flag: Integer, raw_unit: "px" }) + x Dimension(DimensionToken { value: 100.0, raw_value: "100", unit: "px", type_flag: Integer, raw_unit: "px" }) ,-[$DIR/tests/fixture/function/unknown/input.css:2:1] 2 | prod: fn(100px); 3 | prod: --fn(100px); @@ -323,7 +323,7 @@ 5 | } `---- - x Dimension(DimensionToken { value: 100.0, raw_value: "100", unit: Atom('px' type=static), type_flag: Integer, raw_unit: "px" }) + x Dimension(DimensionToken { value: 100.0, raw_value: "100", unit: "px", type_flag: Integer, raw_unit: "px" }) ,-[$DIR/tests/fixture/function/unknown/input.css:3:1] 3 | prod: --fn(100px); 4 | prod: --fn--fn(100px); diff --git a/crates/swc_css_parser/tests/fixture/selector/pseudo-class/has/span.swc-stderr b/crates/swc_css_parser/tests/fixture/selector/pseudo-class/has/span.swc-stderr index 90d5095e6da5..cf1515ab7865 100644 --- a/crates/swc_css_parser/tests/fixture/selector/pseudo-class/has/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/selector/pseudo-class/has/span.swc-stderr @@ -2830,7 +2830,7 @@ 14 | a:has( <> img, > img) {} `---- - x Ident { value: Atom('img' type=static), raw: "img" } + x Ident { value: "img", raw: "img" } ,-[$DIR/tests/fixture/selector/pseudo-class/has/input.css:12:1] 12 | /* Forgiving */ 13 | a:has(<> img, > img) {} @@ -3102,7 +3102,7 @@ 15 | a:has(> img, <> img) {} `---- - x Ident { value: Atom('img' type=static), raw: "img" } + x Ident { value: "img", raw: "img" } ,-[$DIR/tests/fixture/selector/pseudo-class/has/input.css:13:1] 13 | a:has(<> img, > img) {} 14 | a:has( <> img, > img) {} @@ -3438,7 +3438,7 @@ 16 | a:has(> img, <> img ) {} `---- - x Ident { value: Atom('img' type=static), raw: "img" } + x Ident { value: "img", raw: "img" } ,-[$DIR/tests/fixture/selector/pseudo-class/has/input.css:14:1] 14 | a:has( <> img, > img) {} 15 | a:has(> img, <> img) {} @@ -3679,7 +3679,7 @@ : ^^^ `---- - x Ident { value: Atom('img' type=static), raw: "img" } + x Ident { value: "img", raw: "img" } ,-[$DIR/tests/fixture/selector/pseudo-class/has/input.css:15:1] 15 | a:has(> img, <> img) {} 16 | a:has(> img, <> img ) {} @@ -3931,7 +3931,7 @@ : ^^^ `---- - x Ident { value: Atom('img' type=static), raw: "img" } + x Ident { value: "img", raw: "img" } ,-[$DIR/tests/fixture/selector/pseudo-class/has/input.css:17:1] 17 | 18 | a:has(> img, <> img , > img) {} diff --git a/crates/swc_css_parser/tests/fixture/selector/pseudo-class/is/span.swc-stderr b/crates/swc_css_parser/tests/fixture/selector/pseudo-class/is/span.swc-stderr index aa01d8fc41aa..38fe76eb700d 100644 --- a/crates/swc_css_parser/tests/fixture/selector/pseudo-class/is/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/selector/pseudo-class/is/span.swc-stderr @@ -5307,7 +5307,7 @@ 26 | :is( a >< b, a > b, d > c) {} `---- - x Ident { value: Atom('a' type=static), raw: "a" } + x Ident { value: "a", raw: "a" } ,-[$DIR/tests/fixture/selector/pseudo-class/is/input.css:24:1] 24 | /* Forgiving */ 25 | :is(a >< b, a > b, d > c) {} @@ -5387,7 +5387,7 @@ 26 | :is( a >< b, a > b, d > c) {} `---- - x Ident { value: Atom('b' type=static), raw: "b" } + x Ident { value: "b", raw: "b" } ,-[$DIR/tests/fixture/selector/pseudo-class/is/input.css:24:1] 24 | /* Forgiving */ 25 | :is(a >< b, a > b, d > c) {} @@ -5707,7 +5707,7 @@ 27 | :is(a > b, d > c, a >< b) {} `---- - x Ident { value: Atom('a' type=static), raw: "a" } + x Ident { value: "a", raw: "a" } ,-[$DIR/tests/fixture/selector/pseudo-class/is/input.css:25:1] 25 | :is(a >< b, a > b, d > c) {} 26 | :is( a >< b, a > b, d > c) {} @@ -5787,7 +5787,7 @@ 27 | :is(a > b, d > c, a >< b) {} `---- - x Ident { value: Atom('b' type=static), raw: "b" } + x Ident { value: "b", raw: "b" } ,-[$DIR/tests/fixture/selector/pseudo-class/is/input.css:25:1] 25 | :is(a >< b, a > b, d > c) {} 26 | :is( a >< b, a > b, d > c) {} @@ -6299,7 +6299,7 @@ 28 | :is(a > b, d > c, a >< b ) {} `---- - x Ident { value: Atom('a' type=static), raw: "a" } + x Ident { value: "a", raw: "a" } ,-[$DIR/tests/fixture/selector/pseudo-class/is/input.css:26:1] 26 | :is( a >< b, a > b, d > c) {} 27 | :is(a > b, d > c, a >< b) {} @@ -6379,7 +6379,7 @@ 28 | :is(a > b, d > c, a >< b ) {} `---- - x Ident { value: Atom('b' type=static), raw: "b" } + x Ident { value: "b", raw: "b" } ,-[$DIR/tests/fixture/selector/pseudo-class/is/input.css:26:1] 26 | :is( a >< b, a > b, d > c) {} 27 | :is(a > b, d > c, a >< b) {} @@ -6699,7 +6699,7 @@ 29 | :is(a > b, a >< b , d > c) {} `---- - x Ident { value: Atom('a' type=static), raw: "a" } + x Ident { value: "a", raw: "a" } ,-[$DIR/tests/fixture/selector/pseudo-class/is/input.css:27:1] 27 | :is(a > b, d > c, a >< b) {} 28 | :is(a > b, d > c, a >< b ) {} @@ -6779,7 +6779,7 @@ 29 | :is(a > b, a >< b , d > c) {} `---- - x Ident { value: Atom('b' type=static), raw: "b" } + x Ident { value: "b", raw: "b" } ,-[$DIR/tests/fixture/selector/pseudo-class/is/input.css:27:1] 27 | :is(a > b, d > c, a >< b) {} 28 | :is(a > b, d > c, a >< b ) {} @@ -6994,7 +6994,7 @@ : ^ `---- - x Ident { value: Atom('a' type=static), raw: "a" } + x Ident { value: "a", raw: "a" } ,-[$DIR/tests/fixture/selector/pseudo-class/is/input.css:28:1] 28 | :is(a > b, d > c, a >< b ) {} 29 | :is(a > b, a >< b , d > c) {} @@ -7064,7 +7064,7 @@ : ^ `---- - x Ident { value: Atom('b' type=static), raw: "b" } + x Ident { value: "b", raw: "b" } ,-[$DIR/tests/fixture/selector/pseudo-class/is/input.css:28:1] 28 | :is(a > b, d > c, a >< b ) {} 29 | :is(a > b, a >< b , d > c) {} diff --git a/crates/swc_css_parser/tests/fixture/selector/pseudo-class/unknown/span.swc-stderr b/crates/swc_css_parser/tests/fixture/selector/pseudo-class/unknown/span.swc-stderr index bb1099b40bb2..8195f653e6c8 100644 --- a/crates/swc_css_parser/tests/fixture/selector/pseudo-class/unknown/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/selector/pseudo-class/unknown/span.swc-stderr @@ -245,7 +245,7 @@ 4 | :unknown(foo bar) {} `---- - x Ident { value: Atom('foo' type=inline), raw: "foo" } + x Ident { value: "foo", raw: "foo" } ,-[$DIR/tests/fixture/selector/pseudo-class/unknown/input.css:2:1] 2 | :unknown() {} 3 | :unknown(foo) {} @@ -341,7 +341,7 @@ 5 | :unknown(foo, bar) {} `---- - x Ident { value: Atom('foo' type=inline), raw: "foo" } + x Ident { value: "foo", raw: "foo" } ,-[$DIR/tests/fixture/selector/pseudo-class/unknown/input.css:3:1] 3 | :unknown(foo) {} 4 | :unknown(foo bar) {} @@ -373,7 +373,7 @@ 5 | :unknown(foo, bar) {} `---- - x Ident { value: Atom('bar' type=inline), raw: "bar" } + x Ident { value: "bar", raw: "bar" } ,-[$DIR/tests/fixture/selector/pseudo-class/unknown/input.css:3:1] 3 | :unknown(foo) {} 4 | :unknown(foo bar) {} @@ -469,7 +469,7 @@ 6 | :unknown([foo]) {} `---- - x Ident { value: Atom('foo' type=inline), raw: "foo" } + x Ident { value: "foo", raw: "foo" } ,-[$DIR/tests/fixture/selector/pseudo-class/unknown/input.css:4:1] 4 | :unknown(foo bar) {} 5 | :unknown(foo, bar) {} @@ -517,7 +517,7 @@ 6 | :unknown([foo]) {} `---- - x Ident { value: Atom('bar' type=inline), raw: "bar" } + x Ident { value: "bar", raw: "bar" } ,-[$DIR/tests/fixture/selector/pseudo-class/unknown/input.css:4:1] 4 | :unknown(foo bar) {} 5 | :unknown(foo, bar) {} @@ -629,7 +629,7 @@ 7 | :unknown((foo bar)) {} `---- - x Ident { value: Atom('foo' type=inline), raw: "foo" } + x Ident { value: "foo", raw: "foo" } ,-[$DIR/tests/fixture/selector/pseudo-class/unknown/input.css:5:1] 5 | :unknown(foo, bar) {} 6 | :unknown([foo]) {} @@ -757,7 +757,7 @@ 8 | :unknown(((foo bar))) {} `---- - x Ident { value: Atom('foo' type=inline), raw: "foo" } + x Ident { value: "foo", raw: "foo" } ,-[$DIR/tests/fixture/selector/pseudo-class/unknown/input.css:6:1] 6 | :unknown([foo]) {} 7 | :unknown((foo bar)) {} @@ -789,7 +789,7 @@ 8 | :unknown(((foo bar))) {} `---- - x Ident { value: Atom('bar' type=inline), raw: "bar" } + x Ident { value: "bar", raw: "bar" } ,-[$DIR/tests/fixture/selector/pseudo-class/unknown/input.css:6:1] 6 | :unknown([foo]) {} 7 | :unknown((foo bar)) {} @@ -933,7 +933,7 @@ 9 | :unknown({foo: bar}) {} `---- - x Ident { value: Atom('foo' type=inline), raw: "foo" } + x Ident { value: "foo", raw: "foo" } ,-[$DIR/tests/fixture/selector/pseudo-class/unknown/input.css:7:1] 7 | :unknown((foo bar)) {} 8 | :unknown(((foo bar))) {} @@ -965,7 +965,7 @@ 9 | :unknown({foo: bar}) {} `---- - x Ident { value: Atom('bar' type=inline), raw: "bar" } + x Ident { value: "bar", raw: "bar" } ,-[$DIR/tests/fixture/selector/pseudo-class/unknown/input.css:7:1] 7 | :unknown((foo bar)) {} 8 | :unknown(((foo bar))) {} @@ -1109,7 +1109,7 @@ 10 | :unknown({{foo: bar}}) {} `---- - x Ident { value: Atom('foo' type=inline), raw: "foo" } + x Ident { value: "foo", raw: "foo" } ,-[$DIR/tests/fixture/selector/pseudo-class/unknown/input.css:8:1] 8 | :unknown(((foo bar))) {} 9 | :unknown({foo: bar}) {} @@ -1157,7 +1157,7 @@ 10 | :unknown({{foo: bar}}) {} `---- - x Ident { value: Atom('bar' type=inline), raw: "bar" } + x Ident { value: "bar", raw: "bar" } ,-[$DIR/tests/fixture/selector/pseudo-class/unknown/input.css:8:1] 8 | :unknown(((foo bar))) {} 9 | :unknown({foo: bar}) {} @@ -1301,7 +1301,7 @@ 11 | :unknown({foo: bar !important}) {} `---- - x Ident { value: Atom('foo' type=inline), raw: "foo" } + x Ident { value: "foo", raw: "foo" } ,-[$DIR/tests/fixture/selector/pseudo-class/unknown/input.css:9:1] 9 | :unknown({foo: bar}) {} 10 | :unknown({{foo: bar}}) {} @@ -1349,7 +1349,7 @@ 11 | :unknown({foo: bar !important}) {} `---- - x Ident { value: Atom('bar' type=inline), raw: "bar" } + x Ident { value: "bar", raw: "bar" } ,-[$DIR/tests/fixture/selector/pseudo-class/unknown/input.css:9:1] 9 | :unknown({foo: bar}) {} 10 | :unknown({{foo: bar}}) {} @@ -1493,7 +1493,7 @@ 12 | :unknown("string") {} `---- - x Ident { value: Atom('foo' type=inline), raw: "foo" } + x Ident { value: "foo", raw: "foo" } ,-[$DIR/tests/fixture/selector/pseudo-class/unknown/input.css:10:1] 10 | :unknown({{foo: bar}}) {} 11 | :unknown({foo: bar !important}) {} @@ -1541,7 +1541,7 @@ 12 | :unknown("string") {} `---- - x Ident { value: Atom('bar' type=inline), raw: "bar" } + x Ident { value: "bar", raw: "bar" } ,-[$DIR/tests/fixture/selector/pseudo-class/unknown/input.css:10:1] 10 | :unknown({{foo: bar}}) {} 11 | :unknown({foo: bar !important}) {} @@ -1589,7 +1589,7 @@ 12 | :unknown("string") {} `---- - x Ident { value: Atom('important' type=static), raw: "important" } + x Ident { value: "important", raw: "important" } ,-[$DIR/tests/fixture/selector/pseudo-class/unknown/input.css:10:1] 10 | :unknown({{foo: bar}}) {} 11 | :unknown({foo: bar !important}) {} @@ -1701,7 +1701,7 @@ 13 | :unknown("string", foo) {} `---- - x String { value: Atom('string' type=static), raw: "\"string\"" } + x String { value: "string", raw: "\"string\"" } ,-[$DIR/tests/fixture/selector/pseudo-class/unknown/input.css:11:1] 11 | :unknown({foo: bar !important}) {} 12 | :unknown("string") {} @@ -1797,7 +1797,7 @@ 14 | :unknown('string') {} `---- - x String { value: Atom('string' type=static), raw: "\"string\"" } + x String { value: "string", raw: "\"string\"" } ,-[$DIR/tests/fixture/selector/pseudo-class/unknown/input.css:12:1] 12 | :unknown("string") {} 13 | :unknown("string", foo) {} @@ -1845,7 +1845,7 @@ 14 | :unknown('string') {} `---- - x Ident { value: Atom('foo' type=inline), raw: "foo" } + x Ident { value: "foo", raw: "foo" } ,-[$DIR/tests/fixture/selector/pseudo-class/unknown/input.css:12:1] 12 | :unknown("string") {} 13 | :unknown("string", foo) {} @@ -1941,7 +1941,7 @@ 15 | :unknown(url(foo.png)) {} `---- - x String { value: Atom('string' type=static), raw: "'string'" } + x String { value: "string", raw: "'string'" } ,-[$DIR/tests/fixture/selector/pseudo-class/unknown/input.css:13:1] 13 | :unknown("string", foo) {} 14 | :unknown('string') {} @@ -2037,7 +2037,7 @@ 16 | :unknown({!}) {} `---- - x Url { value: Atom('foo.png' type=inline), raw: UrlKeyValue("url", "foo.png") } + x Url { value: "foo.png", raw: UrlKeyValue("url", "foo.png") } ,-[$DIR/tests/fixture/selector/pseudo-class/unknown/input.css:14:1] 14 | :unknown('string') {} 15 | :unknown(url(foo.png)) {} diff --git a/crates/swc_css_parser/tests/fixture/selector/pseudo-class/where/span.swc-stderr b/crates/swc_css_parser/tests/fixture/selector/pseudo-class/where/span.swc-stderr index 685d7cda67cf..2ec8db236297 100644 --- a/crates/swc_css_parser/tests/fixture/selector/pseudo-class/where/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/selector/pseudo-class/where/span.swc-stderr @@ -5154,7 +5154,7 @@ 27 | h1:where(a, <> p) {} `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/selector/pseudo-class/where/input.css:25:1] 25 | /* Forgiving */ 26 | h1:where(<> p) {} @@ -5410,7 +5410,7 @@ 28 | h1:where(<> p,a) {} `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/selector/pseudo-class/where/input.css:26:1] 26 | h1:where(<> p) {} 27 | h1:where(a, <> p) {} @@ -5602,7 +5602,7 @@ 29 | h1:where(a, <> p,a) {} `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/selector/pseudo-class/where/input.css:27:1] 27 | h1:where(a, <> p) {} 28 | h1:where(<> p,a) {} @@ -5877,7 +5877,7 @@ : ^ `---- - x Ident { value: Atom('p' type=static), raw: "p" } + x Ident { value: "p", raw: "p" } ,-[$DIR/tests/fixture/selector/pseudo-class/where/input.css:28:1] 28 | h1:where(<> p,a) {} 29 | h1:where(a, <> p,a) {} diff --git a/crates/swc_css_parser/tests/fixture/selector/pseudo-element/unknown/span.swc-stderr b/crates/swc_css_parser/tests/fixture/selector/pseudo-element/unknown/span.swc-stderr index 9b20c9ced9ea..f68fd17bf9a2 100644 --- a/crates/swc_css_parser/tests/fixture/selector/pseudo-element/unknown/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/selector/pseudo-element/unknown/span.swc-stderr @@ -244,7 +244,7 @@ 4 | ::unknown(foo bar) {} `---- - x Ident { value: Atom('foo' type=inline), raw: "foo" } + x Ident { value: "foo", raw: "foo" } ,-[$DIR/tests/fixture/selector/pseudo-element/unknown/input.css:2:1] 2 | ::unknown() {} 3 | ::unknown(foo) {} @@ -340,7 +340,7 @@ 5 | ::unknown(foo, bar) {} `---- - x Ident { value: Atom('foo' type=inline), raw: "foo" } + x Ident { value: "foo", raw: "foo" } ,-[$DIR/tests/fixture/selector/pseudo-element/unknown/input.css:3:1] 3 | ::unknown(foo) {} 4 | ::unknown(foo bar) {} @@ -372,7 +372,7 @@ 5 | ::unknown(foo, bar) {} `---- - x Ident { value: Atom('bar' type=inline), raw: "bar" } + x Ident { value: "bar", raw: "bar" } ,-[$DIR/tests/fixture/selector/pseudo-element/unknown/input.css:3:1] 3 | ::unknown(foo) {} 4 | ::unknown(foo bar) {} @@ -468,7 +468,7 @@ 6 | ::unknown([foo]) {} `---- - x Ident { value: Atom('foo' type=inline), raw: "foo" } + x Ident { value: "foo", raw: "foo" } ,-[$DIR/tests/fixture/selector/pseudo-element/unknown/input.css:4:1] 4 | ::unknown(foo bar) {} 5 | ::unknown(foo, bar) {} @@ -516,7 +516,7 @@ 6 | ::unknown([foo]) {} `---- - x Ident { value: Atom('bar' type=inline), raw: "bar" } + x Ident { value: "bar", raw: "bar" } ,-[$DIR/tests/fixture/selector/pseudo-element/unknown/input.css:4:1] 4 | ::unknown(foo bar) {} 5 | ::unknown(foo, bar) {} @@ -628,7 +628,7 @@ 7 | ::unknown((foo bar)) {} `---- - x Ident { value: Atom('foo' type=inline), raw: "foo" } + x Ident { value: "foo", raw: "foo" } ,-[$DIR/tests/fixture/selector/pseudo-element/unknown/input.css:5:1] 5 | ::unknown(foo, bar) {} 6 | ::unknown([foo]) {} @@ -756,7 +756,7 @@ 8 | ::unknown(((foo bar))) {} `---- - x Ident { value: Atom('foo' type=inline), raw: "foo" } + x Ident { value: "foo", raw: "foo" } ,-[$DIR/tests/fixture/selector/pseudo-element/unknown/input.css:6:1] 6 | ::unknown([foo]) {} 7 | ::unknown((foo bar)) {} @@ -788,7 +788,7 @@ 8 | ::unknown(((foo bar))) {} `---- - x Ident { value: Atom('bar' type=inline), raw: "bar" } + x Ident { value: "bar", raw: "bar" } ,-[$DIR/tests/fixture/selector/pseudo-element/unknown/input.css:6:1] 6 | ::unknown([foo]) {} 7 | ::unknown((foo bar)) {} @@ -932,7 +932,7 @@ 9 | ::unknown({foo: bar}) {} `---- - x Ident { value: Atom('foo' type=inline), raw: "foo" } + x Ident { value: "foo", raw: "foo" } ,-[$DIR/tests/fixture/selector/pseudo-element/unknown/input.css:7:1] 7 | ::unknown((foo bar)) {} 8 | ::unknown(((foo bar))) {} @@ -964,7 +964,7 @@ 9 | ::unknown({foo: bar}) {} `---- - x Ident { value: Atom('bar' type=inline), raw: "bar" } + x Ident { value: "bar", raw: "bar" } ,-[$DIR/tests/fixture/selector/pseudo-element/unknown/input.css:7:1] 7 | ::unknown((foo bar)) {} 8 | ::unknown(((foo bar))) {} @@ -1108,7 +1108,7 @@ 10 | ::unknown({{foo: bar}}) {} `---- - x Ident { value: Atom('foo' type=inline), raw: "foo" } + x Ident { value: "foo", raw: "foo" } ,-[$DIR/tests/fixture/selector/pseudo-element/unknown/input.css:8:1] 8 | ::unknown(((foo bar))) {} 9 | ::unknown({foo: bar}) {} @@ -1156,7 +1156,7 @@ 10 | ::unknown({{foo: bar}}) {} `---- - x Ident { value: Atom('bar' type=inline), raw: "bar" } + x Ident { value: "bar", raw: "bar" } ,-[$DIR/tests/fixture/selector/pseudo-element/unknown/input.css:8:1] 8 | ::unknown(((foo bar))) {} 9 | ::unknown({foo: bar}) {} @@ -1300,7 +1300,7 @@ 11 | ::unknown({foo: bar !important}) {} `---- - x Ident { value: Atom('foo' type=inline), raw: "foo" } + x Ident { value: "foo", raw: "foo" } ,-[$DIR/tests/fixture/selector/pseudo-element/unknown/input.css:9:1] 9 | ::unknown({foo: bar}) {} 10 | ::unknown({{foo: bar}}) {} @@ -1348,7 +1348,7 @@ 11 | ::unknown({foo: bar !important}) {} `---- - x Ident { value: Atom('bar' type=inline), raw: "bar" } + x Ident { value: "bar", raw: "bar" } ,-[$DIR/tests/fixture/selector/pseudo-element/unknown/input.css:9:1] 9 | ::unknown({foo: bar}) {} 10 | ::unknown({{foo: bar}}) {} @@ -1492,7 +1492,7 @@ 12 | ::unknown("string") {} `---- - x Ident { value: Atom('foo' type=inline), raw: "foo" } + x Ident { value: "foo", raw: "foo" } ,-[$DIR/tests/fixture/selector/pseudo-element/unknown/input.css:10:1] 10 | ::unknown({{foo: bar}}) {} 11 | ::unknown({foo: bar !important}) {} @@ -1540,7 +1540,7 @@ 12 | ::unknown("string") {} `---- - x Ident { value: Atom('bar' type=inline), raw: "bar" } + x Ident { value: "bar", raw: "bar" } ,-[$DIR/tests/fixture/selector/pseudo-element/unknown/input.css:10:1] 10 | ::unknown({{foo: bar}}) {} 11 | ::unknown({foo: bar !important}) {} @@ -1588,7 +1588,7 @@ 12 | ::unknown("string") {} `---- - x Ident { value: Atom('important' type=static), raw: "important" } + x Ident { value: "important", raw: "important" } ,-[$DIR/tests/fixture/selector/pseudo-element/unknown/input.css:10:1] 10 | ::unknown({{foo: bar}}) {} 11 | ::unknown({foo: bar !important}) {} @@ -1700,7 +1700,7 @@ 13 | ::unknown("string", foo) {} `---- - x String { value: Atom('string' type=static), raw: "\"string\"" } + x String { value: "string", raw: "\"string\"" } ,-[$DIR/tests/fixture/selector/pseudo-element/unknown/input.css:11:1] 11 | ::unknown({foo: bar !important}) {} 12 | ::unknown("string") {} @@ -1796,7 +1796,7 @@ 14 | ::unknown('string') {} `---- - x String { value: Atom('string' type=static), raw: "\"string\"" } + x String { value: "string", raw: "\"string\"" } ,-[$DIR/tests/fixture/selector/pseudo-element/unknown/input.css:12:1] 12 | ::unknown("string") {} 13 | ::unknown("string", foo) {} @@ -1844,7 +1844,7 @@ 14 | ::unknown('string') {} `---- - x Ident { value: Atom('foo' type=inline), raw: "foo" } + x Ident { value: "foo", raw: "foo" } ,-[$DIR/tests/fixture/selector/pseudo-element/unknown/input.css:12:1] 12 | ::unknown("string") {} 13 | ::unknown("string", foo) {} @@ -1940,7 +1940,7 @@ 15 | ::unknown(url(foo.png)) {} `---- - x String { value: Atom('string' type=static), raw: "'string'" } + x String { value: "string", raw: "'string'" } ,-[$DIR/tests/fixture/selector/pseudo-element/unknown/input.css:13:1] 13 | ::unknown("string", foo) {} 14 | ::unknown('string') {} @@ -2036,7 +2036,7 @@ 16 | ::unknown({!}) {} `---- - x Url { value: Atom('foo.png' type=inline), raw: UrlKeyValue("url", "foo.png") } + x Url { value: "foo.png", raw: UrlKeyValue("url", "foo.png") } ,-[$DIR/tests/fixture/selector/pseudo-element/unknown/input.css:14:1] 14 | ::unknown('string') {} 15 | ::unknown(url(foo.png)) {} diff --git a/crates/swc_css_parser/tests/fixture/style-block/span.swc-stderr b/crates/swc_css_parser/tests/fixture/style-block/span.swc-stderr index fe694173a554..e02f8d81b259 100644 --- a/crates/swc_css_parser/tests/fixture/style-block/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/style-block/span.swc-stderr @@ -4408,7 +4408,7 @@ 92 | height: 100px; `---- - x Ident { value: Atom('mobile' type=inline), raw: "mobile" } + x Ident { value: "mobile", raw: "mobile" } ,-[$DIR/tests/fixture/style-block/input.css:90:1] 90 | width: 10px; 91 | @mixin mobile { @@ -4473,7 +4473,7 @@ 93 | } `---- - x Ident { value: Atom('height' type=static), raw: "height" } + x Ident { value: "height", raw: "height" } ,-[$DIR/tests/fixture/style-block/input.css:91:1] 91 | @mixin mobile { 92 | height: 100px; @@ -4521,7 +4521,7 @@ 93 | } `---- - x Dimension(DimensionToken { value: 100.0, raw_value: "100", unit: Atom('px' type=static), type_flag: Integer, raw_unit: "px" }) + x Dimension(DimensionToken { value: 100.0, raw_value: "100", unit: "px", type_flag: Integer, raw_unit: "px" }) ,-[$DIR/tests/fixture/style-block/input.css:91:1] 91 | @mixin mobile { 92 | height: 100px; @@ -4820,7 +4820,7 @@ : ^^^^^^^ `---- - x String { value: Atom('a.css' type=inline), raw: "\"a.css\"" } + x String { value: "a.css", raw: "\"a.css\"" } ,-[$DIR/tests/fixture/style-block/input.css:97:1] 97 | 98 | a { @unknown "a.css"; } @@ -4953,7 +4953,7 @@ : ^^^ `---- - x Ident { value: Atom('foo' type=inline), raw: "foo" } + x Ident { value: "foo", raw: "foo" } ,-[$DIR/tests/fixture/style-block/input.css:99:1] 99 | 100 | a { @unknown foo {} } @@ -5264,7 +5264,7 @@ 108 | height: 0; `---- - x Ident { value: Atom('width' type=static), raw: "width" } + x Ident { value: "width", raw: "width" } ,-[$DIR/tests/fixture/style-block/input.css:106:1] 106 | --zero-size: { 107 | width: 0; @@ -5360,7 +5360,7 @@ 109 | }; `---- - x Ident { value: Atom('height' type=static), raw: "height" } + x Ident { value: "height", raw: "height" } ,-[$DIR/tests/fixture/style-block/input.css:107:1] 107 | width: 0; 108 | height: 0; @@ -5538,7 +5538,7 @@ 112 | height: 16px; `---- - x Ident { value: Atom('width' type=static), raw: "width" } + x Ident { value: "width", raw: "width" } ,-[$DIR/tests/fixture/style-block/input.css:110:1] 110 | --small-icon: { 111 | width: 16px; @@ -5586,7 +5586,7 @@ 112 | height: 16px; `---- - x Dimension(DimensionToken { value: 16.0, raw_value: "16", unit: Atom('px' type=static), type_flag: Integer, raw_unit: "px" }) + x Dimension(DimensionToken { value: 16.0, raw_value: "16", unit: "px", type_flag: Integer, raw_unit: "px" }) ,-[$DIR/tests/fixture/style-block/input.css:110:1] 110 | --small-icon: { 111 | width: 16px; @@ -5634,7 +5634,7 @@ 113 | } `---- - x Ident { value: Atom('height' type=static), raw: "height" } + x Ident { value: "height", raw: "height" } ,-[$DIR/tests/fixture/style-block/input.css:111:1] 111 | width: 16px; 112 | height: 16px; @@ -5682,7 +5682,7 @@ 113 | } `---- - x Dimension(DimensionToken { value: 16.0, raw_value: "16", unit: Atom('px' type=static), type_flag: Integer, raw_unit: "px" }) + x Dimension(DimensionToken { value: 16.0, raw_value: "16", unit: "px", type_flag: Integer, raw_unit: "px" }) ,-[$DIR/tests/fixture/style-block/input.css:111:1] 111 | width: 16px; 112 | height: 16px; diff --git a/crates/swc_css_parser/tests/fixture/styled-jsx/selector/1/span.swc-stderr b/crates/swc_css_parser/tests/fixture/styled-jsx/selector/1/span.swc-stderr index 0548e50a7213..1d6c249a3e9a 100644 --- a/crates/swc_css_parser/tests/fixture/styled-jsx/selector/1/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/styled-jsx/selector/1/span.swc-stderr @@ -83,7 +83,7 @@ 2 | color: red; `---- - x Ident { value: Atom('foo' type=inline), raw: "foo" } + x Ident { value: "foo", raw: "foo" } ,-[$DIR/tests/fixture/styled-jsx/selector/1/input.css:1:1] 1 | :global(.foo + a) { : ^^^ @@ -139,7 +139,7 @@ 2 | color: red; `---- - x Ident { value: Atom('a' type=static), raw: "a" } + x Ident { value: "a", raw: "a" } ,-[$DIR/tests/fixture/styled-jsx/selector/1/input.css:1:1] 1 | :global(.foo + a) { : ^ diff --git a/crates/swc_css_parser/tests/fixture/styled-jsx/selector/2/span.swc-stderr b/crates/swc_css_parser/tests/fixture/styled-jsx/selector/2/span.swc-stderr index e4f18c252a1e..4e605a21bbce 100644 --- a/crates/swc_css_parser/tests/fixture/styled-jsx/selector/2/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/styled-jsx/selector/2/span.swc-stderr @@ -111,7 +111,7 @@ 2 | color: green; `---- - x Ident { value: Atom('span' type=static), raw: "span" } + x Ident { value: "span", raw: "span" } ,-[$DIR/tests/fixture/styled-jsx/selector/2/input.css:1:1] 1 | p :global(span:not(.test)) { : ^^^^ @@ -139,7 +139,7 @@ 2 | color: green; `---- - x Function { value: Atom('not' type=static), raw: "not" } + x Function { value: "not", raw: "not" } ,-[$DIR/tests/fixture/styled-jsx/selector/2/input.css:1:1] 1 | p :global(span:not(.test)) { : ^^^^ @@ -167,7 +167,7 @@ 2 | color: green; `---- - x Ident { value: Atom('test' type=inline), raw: "test" } + x Ident { value: "test", raw: "test" } ,-[$DIR/tests/fixture/styled-jsx/selector/2/input.css:1:1] 1 | p :global(span:not(.test)) { : ^^^^ diff --git a/crates/swc_css_parser/tests/fixture/value/custom-property/span.swc-stderr b/crates/swc_css_parser/tests/fixture/value/custom-property/span.swc-stderr index 55b82285dfd2..8542874f9a4e 100644 --- a/crates/swc_css_parser/tests/fixture/value/custom-property/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/value/custom-property/span.swc-stderr @@ -337,7 +337,7 @@ : ^^^^^ `---- - x Ident { value: Atom('value' type=inline), raw: "value" } + x Ident { value: "value", raw: "value" } ,-[$DIR/tests/fixture/value/custom-property/input.css:1:1] 1 | :root { 2 | ---:value; @@ -384,7 +384,7 @@ 5 | --important1: value!important; `---- - x Ident { value: Atom('value' type=inline), raw: "value" } + x Ident { value: "value", raw: "value" } ,-[$DIR/tests/fixture/value/custom-property/input.css:3:1] 3 | 4 | --important:value!important; @@ -448,7 +448,7 @@ 6 | --important2: value !important; `---- - x Ident { value: Atom('value' type=inline), raw: "value" } + x Ident { value: "value", raw: "value" } ,-[$DIR/tests/fixture/value/custom-property/input.css:4:1] 4 | --important:value!important; 5 | --important1: value!important; @@ -512,7 +512,7 @@ 7 | --important3:value !important; `---- - x Ident { value: Atom('value' type=inline), raw: "value" } + x Ident { value: "value", raw: "value" } ,-[$DIR/tests/fixture/value/custom-property/input.css:5:1] 5 | --important1: value!important; 6 | --important2: value !important; @@ -576,7 +576,7 @@ 8 | --important4: calc(1)!important; `---- - x Ident { value: Atom('value' type=inline), raw: "value" } + x Ident { value: "value", raw: "value" } ,-[$DIR/tests/fixture/value/custom-property/input.css:6:1] 6 | --important2: value !important; 7 | --important3:value !important; @@ -905,7 +905,7 @@ 17 | --number: 1; `---- - x Ident { value: Atom('ident' type=inline), raw: "ident" } + x Ident { value: "ident", raw: "ident" } ,-[$DIR/tests/fixture/value/custom-property/input.css:15:1] 15 | 16 | --no-whitespace:ident; @@ -1001,7 +1001,7 @@ 19 | --color: #06c; `---- - x Dimension(DimensionToken { value: 100.0, raw_value: "100", unit: Atom('vw' type=static), type_flag: Integer, raw_unit: "vw" }) + x Dimension(DimensionToken { value: 100.0, raw_value: "100", unit: "vw", type_flag: Integer, raw_unit: "vw" }) ,-[$DIR/tests/fixture/value/custom-property/input.css:17:1] 17 | --number: 1; 18 | --unit: 100vw; @@ -1044,7 +1044,7 @@ : ^^^^ `---- - x Hash { is_id: false, value: Atom('06c' type=inline), raw: "06c" } + x Hash { is_id: false, value: "06c", raw: "06c" } ,-[$DIR/tests/fixture/value/custom-property/input.css:18:1] 18 | --unit: 100vw; 19 | --color: #06c; @@ -1243,7 +1243,7 @@ : ^^^^^^ `---- - x Ident { value: Atom('--unit' type=inline), raw: "--unit" } + x Ident { value: "--unit", raw: "--unit" } ,-[$DIR/tests/fixture/value/custom-property/input.css:21:1] 21 | --function: calc(1 + 1); 22 | --variable: var(--unit); @@ -1290,7 +1290,7 @@ 25 | --string: "double quoted string"; `---- - x String { value: Atom('single quoted string' type=dynamic), raw: "'single quoted string'" } + x String { value: "single quoted string", raw: "'single quoted string'" } ,-[$DIR/tests/fixture/value/custom-property/input.css:23:1] 23 | 24 | --string: 'single quoted string'; @@ -1333,7 +1333,7 @@ : ^^^^^^^^^^^^^^^^^^^^^^ `---- - x String { value: Atom('double quoted string' type=dynamic), raw: "\"double quoted string\"" } + x String { value: "double quoted string", raw: "\"double quoted string\"" } ,-[$DIR/tests/fixture/value/custom-property/input.css:24:1] 24 | --string: 'single quoted string'; 25 | --string: "double quoted string"; @@ -2285,7 +2285,7 @@ 39 | --javascript: function(rule) { console.log(rule) }; `---- - x String { value: Atom('2' type=inline), raw: "\"2\"" } + x String { value: "2", raw: "\"2\"" } ,-[$DIR/tests/fixture/value/custom-property/input.css:37:1] 37 | 38 | --JSON: [1, "2", {"three": {"a":1}}, [4]]; @@ -2357,7 +2357,7 @@ 39 | --javascript: function(rule) { console.log(rule) }; `---- - x String { value: Atom('three' type=inline), raw: "\"three\"" } + x String { value: "three", raw: "\"three\"" } ,-[$DIR/tests/fixture/value/custom-property/input.css:37:1] 37 | 38 | --JSON: [1, "2", {"three": {"a":1}}, [4]]; @@ -2429,7 +2429,7 @@ 39 | --javascript: function(rule) { console.log(rule) }; `---- - x String { value: Atom('a' type=static), raw: "\"a\"" } + x String { value: "a", raw: "\"a\"" } ,-[$DIR/tests/fixture/value/custom-property/input.css:37:1] 37 | 38 | --JSON: [1, "2", {"three": {"a":1}}, [4]]; @@ -2597,7 +2597,7 @@ : ^^^^ `---- - x Ident { value: Atom('rule' type=inline), raw: "rule" } + x Ident { value: "rule", raw: "rule" } ,-[$DIR/tests/fixture/value/custom-property/input.css:38:1] 38 | --JSON: [1, "2", {"three": {"a":1}}, [4]]; 39 | --javascript: function(rule) { console.log(rule) }; @@ -2660,7 +2660,7 @@ : ^^^^^^^ `---- - x Ident { value: Atom('console' type=inline), raw: "console" } + x Ident { value: "console", raw: "console" } ,-[$DIR/tests/fixture/value/custom-property/input.css:38:1] 38 | --JSON: [1, "2", {"three": {"a":1}}, [4]]; 39 | --javascript: function(rule) { console.log(rule) }; @@ -2709,7 +2709,7 @@ : ^^^^ `---- - x Ident { value: Atom('rule' type=inline), raw: "rule" } + x Ident { value: "rule", raw: "rule" } ,-[$DIR/tests/fixture/value/custom-property/input.css:38:1] 38 | --JSON: [1, "2", {"three": {"a":1}}, [4]]; 39 | --javascript: function(rule) { console.log(rule) }; @@ -3292,7 +3292,7 @@ 46 | --semicolon-not-top-level: (;); `---- - x Ident { value: Atom('important' type=static), raw: "important" } + x Ident { value: "important", raw: "important" } ,-[$DIR/tests/fixture/value/custom-property/input.css:44:1] 44 | --complex-balanced:{[({()})()()[({})]]}[{()}]([]); 45 | --fake-important:{!important}; @@ -3532,7 +3532,7 @@ 50 | height: 0; `---- - x Ident { value: Atom('width' type=static), raw: "width" } + x Ident { value: "width", raw: "width" } ,-[$DIR/tests/fixture/value/custom-property/input.css:48:1] 48 | --zero-size: { 49 | width: 0; @@ -3628,7 +3628,7 @@ 51 | }; `---- - x Ident { value: Atom('height' type=static), raw: "height" } + x Ident { value: "height", raw: "height" } ,-[$DIR/tests/fixture/value/custom-property/input.css:49:1] 49 | width: 0; 50 | height: 0; @@ -3806,7 +3806,7 @@ 54 | height: 16px; `---- - x Ident { value: Atom('width' type=static), raw: "width" } + x Ident { value: "width", raw: "width" } ,-[$DIR/tests/fixture/value/custom-property/input.css:52:1] 52 | --small-icon: { 53 | width: 16px; @@ -3854,7 +3854,7 @@ 54 | height: 16px; `---- - x Dimension(DimensionToken { value: 16.0, raw_value: "16", unit: Atom('px' type=static), type_flag: Integer, raw_unit: "px" }) + x Dimension(DimensionToken { value: 16.0, raw_value: "16", unit: "px", type_flag: Integer, raw_unit: "px" }) ,-[$DIR/tests/fixture/value/custom-property/input.css:52:1] 52 | --small-icon: { 53 | width: 16px; @@ -3902,7 +3902,7 @@ 55 | } `---- - x Ident { value: Atom('height' type=static), raw: "height" } + x Ident { value: "height", raw: "height" } ,-[$DIR/tests/fixture/value/custom-property/input.css:53:1] 53 | width: 16px; 54 | height: 16px; @@ -3950,7 +3950,7 @@ 55 | } `---- - x Dimension(DimensionToken { value: 16.0, raw_value: "16", unit: Atom('px' type=static), type_flag: Integer, raw_unit: "px" }) + x Dimension(DimensionToken { value: 16.0, raw_value: "16", unit: "px", type_flag: Integer, raw_unit: "px" }) ,-[$DIR/tests/fixture/value/custom-property/input.css:53:1] 53 | width: 16px; 54 | height: 16px; @@ -4462,7 +4462,7 @@ 67 | } `---- - x Ident { value: Atom('value' type=inline), raw: "value" } + x Ident { value: "value", raw: "value" } ,-[$DIR/tests/fixture/value/custom-property/input.css:65:1] 65 | :root { 66 | --var: value; diff --git a/crates/swc_css_parser/tests/fixture/value/url/span.swc-stderr b/crates/swc_css_parser/tests/fixture/value/url/span.swc-stderr index e293d58b4df2..9ad1f8059d98 100644 --- a/crates/swc_css_parser/tests/fixture/value/url/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/value/url/span.swc-stderr @@ -1493,7 +1493,7 @@ : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `---- - x String { value: Atom('http://www.example.com/pinkish.gif' type=dynamic), raw: "\"http://www.example.com/pinkish.gif\"" } + x String { value: "http://www.example.com/pinkish.gif", raw: "\"http://www.example.com/pinkish.gif\"" } ,-[$DIR/tests/fixture/value/url/input.css:20:1] 20 | 21 | --foo: "http://www.example.com/pinkish.gif"; diff --git a/crates/swc_css_parser/tests/fixture/vendor/csstree/basic/span.swc-stderr b/crates/swc_css_parser/tests/fixture/vendor/csstree/basic/span.swc-stderr index 9a23588593e8..aea92a8b6f6d 100644 --- a/crates/swc_css_parser/tests/fixture/vendor/csstree/basic/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/vendor/csstree/basic/span.swc-stderr @@ -3179,7 +3179,7 @@ 28 | --custom2: ([]) !important; `---- - x Ident { value: Atom('something' type=dynamic), raw: "something" } + x Ident { value: "something", raw: "something" } ,-[$DIR/tests/fixture/vendor/csstree/basic/input.css:26:1] 26 | *|span:before { 27 | --custom1: { something !important }; @@ -3227,7 +3227,7 @@ 28 | --custom2: ([]) !important; `---- - x Ident { value: Atom('important' type=static), raw: "important" } + x Ident { value: "important", raw: "important" } ,-[$DIR/tests/fixture/vendor/csstree/basic/input.css:26:1] 26 | *|span:before { 27 | --custom1: { something !important }; diff --git a/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/6s_VBuRPHbPiUrh1fWCR_Q/span.swc-stderr b/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/6s_VBuRPHbPiUrh1fWCR_Q/span.swc-stderr index cea3fa281b43..46ccc5f283fb 100644 --- a/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/6s_VBuRPHbPiUrh1fWCR_Q/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/6s_VBuRPHbPiUrh1fWCR_Q/span.swc-stderr @@ -59,7 +59,7 @@ : ^^^^^^ `---- - x Ident { value: Atom('cl,ss' type=inline), raw: "cl\\,ss" } + x Ident { value: "cl,ss", raw: "cl\\,ss" } ,-[$DIR/tests/fixture/vendor/esbuild/misc/6s_VBuRPHbPiUrh1fWCR_Q/input.css:1:1] 1 | :pseudo(cl\,ss) {} : ^^^^^^ diff --git a/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/L0mEf41IMkWcP7NotllkAg/span.swc-stderr b/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/L0mEf41IMkWcP7NotllkAg/span.swc-stderr index 86254c0c2f05..990d8f597268 100644 --- a/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/L0mEf41IMkWcP7NotllkAg/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/L0mEf41IMkWcP7NotllkAg/span.swc-stderr @@ -76,7 +76,7 @@ 3 | c: d; `---- - x Ident { value: Atom('a' type=static), raw: "a" } + x Ident { value: "a", raw: "a" } ,-[$DIR/tests/fixture/vendor/esbuild/misc/L0mEf41IMkWcP7NotllkAg/input.css:1:1] 1 | @unknown{ 2 | a: b; @@ -124,7 +124,7 @@ 3 | c: d; `---- - x Ident { value: Atom('b' type=static), raw: "b" } + x Ident { value: "b", raw: "b" } ,-[$DIR/tests/fixture/vendor/esbuild/misc/L0mEf41IMkWcP7NotllkAg/input.css:1:1] 1 | @unknown{ 2 | a: b; @@ -174,7 +174,7 @@ 4 | } `---- - x Ident { value: Atom('c' type=inline), raw: "c" } + x Ident { value: "c", raw: "c" } ,-[$DIR/tests/fixture/vendor/esbuild/misc/L0mEf41IMkWcP7NotllkAg/input.css:2:1] 2 | a: b; 3 | c: d; @@ -222,7 +222,7 @@ 4 | } `---- - x Ident { value: Atom('d' type=static), raw: "d" } + x Ident { value: "d", raw: "d" } ,-[$DIR/tests/fixture/vendor/esbuild/misc/L0mEf41IMkWcP7NotllkAg/input.css:2:1] 2 | a: b; 3 | c: d; diff --git a/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/MvD7ThpMVIxU3dzF71Gpcg/span.swc-stderr b/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/MvD7ThpMVIxU3dzF71Gpcg/span.swc-stderr index 26d01a091526..b7f45abeb8c4 100644 --- a/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/MvD7ThpMVIxU3dzF71Gpcg/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/MvD7ThpMVIxU3dzF71Gpcg/span.swc-stderr @@ -59,7 +59,7 @@ : ^ `---- - x Ident { value: Atom('c' type=inline), raw: "c" } + x Ident { value: "c", raw: "c" } ,-[$DIR/tests/fixture/vendor/esbuild/misc/MvD7ThpMVIxU3dzF71Gpcg/input.css:1:1] 1 | ::b(c) {} : ^ diff --git a/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/SnMCumHJazvlgOXgmxJ9Jg/span.swc-stderr b/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/SnMCumHJazvlgOXgmxJ9Jg/span.swc-stderr index 6b28e66d0c76..8326677688e3 100644 --- a/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/SnMCumHJazvlgOXgmxJ9Jg/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/SnMCumHJazvlgOXgmxJ9Jg/span.swc-stderr @@ -47,7 +47,7 @@ : ^ `---- - x Ident { value: Atom('x' type=static), raw: "x" } + x Ident { value: "x", raw: "x" } ,-[$DIR/tests/fixture/vendor/esbuild/misc/SnMCumHJazvlgOXgmxJ9Jg/input.css:1:1] 1 | @unknown x; : ^ diff --git a/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/WQWdwW4B4hm60AQgxTU08Q/span.swc-stderr b/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/WQWdwW4B4hm60AQgxTU08Q/span.swc-stderr index 4c3fe04d1999..07826f379053 100644 --- a/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/WQWdwW4B4hm60AQgxTU08Q/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/WQWdwW4B4hm60AQgxTU08Q/span.swc-stderr @@ -83,7 +83,7 @@ : ^ `---- - x Ident { value: Atom('c' type=inline), raw: "c" } + x Ident { value: "c", raw: "c" } ,-[$DIR/tests/fixture/vendor/esbuild/misc/WQWdwW4B4hm60AQgxTU08Q/input.css:1:1] 1 | a::b(c) {} : ^ diff --git a/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/_d22bZcPKDgNEKSyJ2NRsQ/span.swc-stderr b/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/_d22bZcPKDgNEKSyJ2NRsQ/span.swc-stderr index acb74ed02cff..308dc6726212 100644 --- a/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/_d22bZcPKDgNEKSyJ2NRsQ/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/_d22bZcPKDgNEKSyJ2NRsQ/span.swc-stderr @@ -71,7 +71,7 @@ : ^ `---- - x Ident { value: Atom('c' type=inline), raw: "c" } + x Ident { value: "c", raw: "c" } ,-[$DIR/tests/fixture/vendor/esbuild/misc/_d22bZcPKDgNEKSyJ2NRsQ/input.css:1:1] 1 | *::b(c) {} : ^ diff --git a/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/_e6qpZBWfowEh1P3Wn3orA/span.swc-stderr b/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/_e6qpZBWfowEh1P3Wn3orA/span.swc-stderr index a205f5f47a98..66281460fbe0 100644 --- a/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/_e6qpZBWfowEh1P3Wn3orA/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/_e6qpZBWfowEh1P3Wn3orA/span.swc-stderr @@ -59,7 +59,7 @@ : ^^^^^^^ `---- - x Ident { value: Atom('class' type=static), raw: "cl\\61ss" } + x Ident { value: "class", raw: "cl\\61ss" } ,-[$DIR/tests/fixture/vendor/esbuild/misc/_e6qpZBWfowEh1P3Wn3orA/input.css:1:1] 1 | :pseudo(cl\61ss) {} : ^^^^^^^ diff --git a/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/d1BWbOHfSbCE8-_qEz-luA/span.swc-stderr b/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/d1BWbOHfSbCE8-_qEz-luA/span.swc-stderr index 7486ce6a636c..8bf93b14c409 100644 --- a/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/d1BWbOHfSbCE8-_qEz-luA/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/d1BWbOHfSbCE8-_qEz-luA/span.swc-stderr @@ -95,7 +95,7 @@ : ^ `---- - x Ident { value: Atom('c' type=inline), raw: "c" } + x Ident { value: "c", raw: "c" } ,-[$DIR/tests/fixture/vendor/esbuild/misc/d1BWbOHfSbCE8-_qEz-luA/input.css:1:1] 1 | a:b(:c) {} : ^ diff --git a/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/pLQn9swtbpZ-CVZMGw0EwA/span.swc-stderr b/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/pLQn9swtbpZ-CVZMGw0EwA/span.swc-stderr index 696ddae7369b..d4ad7220c0f8 100644 --- a/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/pLQn9swtbpZ-CVZMGw0EwA/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/vendor/esbuild/misc/pLQn9swtbpZ-CVZMGw0EwA/span.swc-stderr @@ -59,7 +59,7 @@ : ^^^^^^^ `---- - x Ident { value: Atom('cl,ss' type=inline), raw: "cl\\2css" } + x Ident { value: "cl,ss", raw: "cl\\2css" } ,-[$DIR/tests/fixture/vendor/esbuild/misc/pLQn9swtbpZ-CVZMGw0EwA/input.css:1:1] 1 | :pseudo(cl\2css) {} : ^^^^^^^ diff --git a/crates/swc_css_parser/tests/fixture/vendor/rome/custom-properties/span.swc-stderr b/crates/swc_css_parser/tests/fixture/vendor/rome/custom-properties/span.swc-stderr index 5de62a5bbb7b..add4031d2209 100644 --- a/crates/swc_css_parser/tests/fixture/vendor/rome/custom-properties/span.swc-stderr +++ b/crates/swc_css_parser/tests/fixture/vendor/rome/custom-properties/span.swc-stderr @@ -196,7 +196,7 @@ 3 | --lore-ipsum: "foo"; `---- - x String { value: Atom('bar' type=inline), raw: "'bar'" } + x String { value: "bar", raw: "'bar'" } ,-[$DIR/tests/fixture/vendor/rome/custom-properties/input.css:1:1] 1 | .style { 2 | --foo: 'bar'; @@ -244,7 +244,7 @@ 4 | --FANCY: "abort"; `---- - x String { value: Atom('foo' type=inline), raw: "\"foo\"" } + x String { value: "foo", raw: "\"foo\"" } ,-[$DIR/tests/fixture/vendor/rome/custom-properties/input.css:2:1] 2 | --foo: 'bar'; 3 | --lore-ipsum: "foo"; @@ -292,7 +292,7 @@ 5 | --test: 1987; `---- - x String { value: Atom('abort' type=inline), raw: "\"abort\"" } + x String { value: "abort", raw: "\"abort\"" } ,-[$DIR/tests/fixture/vendor/rome/custom-properties/input.css:3:1] 3 | --lore-ipsum: "foo"; 4 | --FANCY: "abort"; @@ -484,7 +484,7 @@ 9 | --time: 75ms; `---- - x Dimension(DimensionToken { value: 12.0, raw_value: "12", unit: Atom('em' type=static), type_flag: Integer, raw_unit: "em" }) + x Dimension(DimensionToken { value: 12.0, raw_value: "12", unit: "em", type_flag: Integer, raw_unit: "em" }) ,-[$DIR/tests/fixture/vendor/rome/custom-properties/input.css:7:1] 7 | --number: 37; 8 | --length: 12em; @@ -532,7 +532,7 @@ 10 | --function: foo(); `---- - x Dimension(DimensionToken { value: 75.0, raw_value: "75", unit: Atom('ms' type=static), type_flag: Integer, raw_unit: "ms" }) + x Dimension(DimensionToken { value: 75.0, raw_value: "75", unit: "ms", type_flag: Integer, raw_unit: "ms" }) ,-[$DIR/tests/fixture/vendor/rome/custom-properties/input.css:8:1] 8 | --length: 12em; 9 | --time: 75ms; @@ -932,7 +932,7 @@ 16 | --at-keyword-known: @media; `---- - x AtKeyword { value: Atom('foobar' type=inline), raw: "foobar" } + x AtKeyword { value: "foobar", raw: "foobar" } ,-[$DIR/tests/fixture/vendor/rome/custom-properties/input.css:14:1] 14 | --brackets: [ ]; 15 | --at-keyword-unknown: @foobar; @@ -980,7 +980,7 @@ 17 | --at-keyword-unknown-block: @foobar {}; `---- - x AtKeyword { value: Atom('media' type=static), raw: "media" } + x AtKeyword { value: "media", raw: "media" } ,-[$DIR/tests/fixture/vendor/rome/custom-properties/input.css:15:1] 15 | --at-keyword-unknown: @foobar; 16 | --at-keyword-known: @media; @@ -1028,7 +1028,7 @@ 18 | --at-keyword-known-block: @media {}; `---- - x AtKeyword { value: Atom('foobar' type=inline), raw: "foobar" } + x AtKeyword { value: "foobar", raw: "foobar" } ,-[$DIR/tests/fixture/vendor/rome/custom-properties/input.css:16:1] 16 | --at-keyword-known: @media; 17 | --at-keyword-unknown-block: @foobar {}; @@ -1116,7 +1116,7 @@ 19 | --cdo-at-top-level: