diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000000..702eca3dc07 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,8 @@ +# Auto detect text files and perform LF normalization +* text=auto + + +*.ts text merge=union eol=lf +*.rs text merge=union eol=lf +*.js text merge=union eol=lf +*.json text merge=union eol=lf diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml new file mode 100644 index 00000000000..e2052075514 --- /dev/null +++ b/.github/workflows/cargo.yml @@ -0,0 +1,79 @@ +name: Cargo + +on: [push, pull_request] + +env: + RUST_MIN_STACK: 16777216 + CARGO_INCREMENTAL: 0 + CI: "1" + +jobs: + fmt: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Run cargo fmt + run: cargo fmt --all -- --check + + test-debug: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Checkout submodules + shell: bash + run: | + auth_header="$(git config --local --get http.https://github.com/.extraheader)" + git submodule sync --recursive + git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 + + - name: Install node dependencies + run: | + npm config set prefix ~/npm + npm i browserslist @babel/runtime + npm i -g jest + + # Ensure that all components all compilable. + - name: Run cargo check for all targets + run: cargo check --color always --all --all-targets + + - name: Run cargo test + run: | + export PATH="$PATH:$HOME/npm/bin" + cargo test --color always --all + + test-release: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Checkout submodules + shell: bash + run: | + auth_header="$(git config --local --get http.https://github.com/.extraheader)" + git submodule sync --recursive + git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 + + - name: Install node dependencies + run: | + npm config set prefix ~/npm + npm i browserslist @babel/runtime + npm i -g jest + + - name: Run cargo test + run: | + export PATH="$PATH:$HOME/npm/bin" + cargo test --color always -p swc_ecma_parser --release + + # + deploy-docs: + runs-on: ubuntu-latest + if: github.ref == 'refs/heads/master' + needs: + - test-debug + - test-release + steps: + - uses: actions/checkout@v2 + - name: Create rustdoc + run: cargo doc diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml deleted file mode 100644 index 19d74390d57..00000000000 --- a/.github/workflows/lint.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: Lint - -on: [push, pull_request] - -jobs: - lint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: Run cargo fmt - run: cargo fmt --all -- --check - # - name: Run cargo clippy - # run: cargo clippy --all diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 44175196a38..00000000000 --- a/.travis.yml +++ /dev/null @@ -1,81 +0,0 @@ -sudo: required -dist: trusty - -addons: - apt: - packages: - - libssl-dev - -language: rust -rust: - - nightly - -# Need to cache the whole `.cargo` directory to keep .crates.toml for -# cargo-update to work -cache: - directories: - - /home/travis/.cargo -# But don't cache the cargo registry -before_cache: - - rm -rf /home/travis/.cargo/registry - -git: - submodules: false -before_install: - - sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules - - git submodule update --init --recursive - -install: - - npm install browserslist - - cargo test --no-run --color always --all --all-features - -script: - - cargo check --color always --all --all-features --all-targets - - RUST_BACKTRACE=full cargo test --color always --all --all-features - - (cd ecmascript/parser && RUST_BACKTRACE=full cargo test --release --color always --all-features) - -before_deploy: - - CARGO_TARGET_DIR=$HOME/cargo-target cargo doc --color always - -after_success: -# Temporarily disabled because cargo tarpaulin does not set CARGO_MANIFEST_DIR. -# -# - bash <(curl https://raw.githubusercontent.com/xd009642/tarpaulin/master/travis-install.sh) -# - | -# cargo tarpaulin --all --ignore-tests --out Xml && -# bash <(curl -s https://codecov.io/bash) -# - '[ $TRAVIS_PULL_REQUEST = false ] && -# [ "$TRAVIS_BRANCH" == "master" ] && -# ./.travis/docs.sh' -deploy: - local_dir: $HOME/cargo-target/doc - repo: swc-project/rustdoc - target_branch: gh-pages - provider: pages - skip_cleanup: true - github_token: $GH_TOKEN - email: kdy1997.dev@gmail.com - name: "강동윤" - on: - branch: master - -notifications: - email: never - slack: - secure: rJ4xuH2auOcENKwxAM+0K08IufQ5HY5nFxTHAnSW82bQQfnP9D2mwo1782b2Jo05rt72FzbRBBEqqhC2vU5Mzs8btdtcl4CsEZLEZ5JGcV8G/Xq4Wkug6xk65LvzrfW6v9ZNdsdXc41KCbbalCDouJR3KkQ3RDQBQviG1nQzI0GsyuraMqTH7aKwZh4S4U/PRAalriW3eMoLw3al4mn3X4S60mAmmLs9bO4glUwMXsc68630ItEt+u2lPGXFj3LaWFkmD9nMSWCbAfAibZWThtqZogSxOEEsE+nW//HTXzICsic5s50JsIvwCXPqpAWDALGJhSTt+gSsrGFtCVhRJ1VOCcG/Y1ttGtsii3eeJ9yGgGt5F4ywbofQH9Decc5MWnKLiWDKPkTLDUV573fexvc4kgHYk0JtSz3q/5jVe6FwCwg1YNKcKW9A28sIoBxvgt5FOWwrwDhl7Ha0HX9gV0ylE88uaR/5OPzl5kXrjlaR3eua5EqaJ1lkezZvyRffJJJA07BxoF0eI5cQnR8jrw5PmybJpJWHXN48gd2CmGj3YB+JwiLpRAlWtkyKhM62UnQihN2h7mHcvwygGG8AGTk9mdWBkUYXxahZ+PPQHb4Mip/QXWdfK0DTAd52CLsYjW+Wc0xxW6jwEff3GaDaRDxU6IjWBmEo74XCRPqUiPk= -env: - global: - - CASHER_TIME_OUT=600 - - RUST_MIN_STACK=16777216 - - CARGO_INCREMENTAL=0 - - RUSTFLAGS="--cfg procmacro2_semver_exempt" - - secure: Z4RSNlpg/12Qx2fIjS+7TToYxPJQgK70X7u9A5lJiCIa0JfzWCxr1ZEKXfAVLG9o4nQok+nWOZa+vxR1IgyUVnf6oSanjjWl1pSRbvccxMS799NvHmGzIAiqSKAlxiSJuxf7MQbs1XBuI3XahsWLfXGPo7vPT6sKe4AAf9gT6igJr61D5hpHkVIXK7P6rnrWQALQYplyaox0NlU9UlqSXXBjdJfp3138rl7FIeYRsMMow44unBNPvs+mhVP8PWpeFWeop0jxbNbTHwnJUbCm4ZWrvqnJ/m70IMlBMN1AskLmz4KeXOhPx+XR9VtdWBX4q8lJ7s9J0hMBxrEnxgiYVBPMlLoEX+wW3zwZ5F+DQs7uLpRHYRUpxpi/7ZuQjp+uT3mN9PMMSvbHwHLH2r/CC9olKYWySXIsGsGVyyMnZeUwvgzwxiYLoeCWe4zZY99zc7jvGKbSmk0RtPu6hApPwL5A6novXbXL2QsXzqqeWpgMLmZyb7KYhM5IGIAB1oPQIqI++Re9Z+/ea/DRSUJOsA96yRQ+vVbiuClrVgDhaAaJOGYCtR1XZ5N2zRb9+Spu/ECtfisLOb9Xs1584DyRbqG69nRdjuscjYOTFZUlOoOeFvuADY65Jt0kF6u7g8NIDkJ1ROb3heKQtY/bAQUrBNUJydOQnn5tBwn8Z618+Ac= - -branches: - only: - # This is where pull requests from "bors r+" are built. - - staging - # This is where pull requests from "bors try" are built. - - trying - # This is required to update docs. - - master diff --git a/bors.toml b/bors.toml index 166b441d4cf..588bb0fd460 100644 --- a/bors.toml +++ b/bors.toml @@ -1,5 +1,5 @@ status = [ - "lint", - "continuous-integration/travis-ci/push" + "Cargo", +# "continuous-integration/travis-ci/push" ] use_squash_merge = true \ No newline at end of file diff --git a/ecmascript/parser/src/lexer.rs b/ecmascript/parser/src/lexer/mod.rs similarity index 100% rename from ecmascript/parser/src/lexer.rs rename to ecmascript/parser/src/lexer/mod.rs diff --git a/ecmascript/parser/src/parser.rs b/ecmascript/parser/src/parser/mod.rs similarity index 100% rename from ecmascript/parser/src/parser.rs rename to ecmascript/parser/src/parser/mod.rs diff --git a/ecmascript/parser/tests/jsx/basic/5/input.js.json b/ecmascript/parser/tests/jsx/basic/5/input.js.json index c16c86c8cfd..967b08aa67d 100644 --- a/ecmascript/parser/tests/jsx/basic/5/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/5/input.js.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 6, + "end": 5, "ctxt": 0 }, "body": [ @@ -10,14 +10,14 @@ "type": "ExpressionStatement", "span": { "start": 0, - "end": 6, + "end": 5, "ctxt": 0 }, "expression": { "type": "JSXElement", "span": { "start": 0, - "end": 6, + "end": 5, "ctxt": 0 }, "opening": { @@ -35,7 +35,7 @@ }, "span": { "start": 1, - "end": 6, + "end": 5, "ctxt": 0 }, "attributes": [], diff --git a/ecmascript/parser/tests/jsx/basic/7/input.js.json b/ecmascript/parser/tests/jsx/basic/7/input.js.json index fa13b98b81d..5f62d2818ea 100644 --- a/ecmascript/parser/tests/jsx/basic/7/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/7/input.js.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 55, + "end": 51, "ctxt": 0 }, "body": [ @@ -10,14 +10,14 @@ "type": "ExpressionStatement", "span": { "start": 0, - "end": 55, + "end": 51, "ctxt": 0 }, "expression": { "type": "JSXElement", "span": { "start": 0, - "end": 55, + "end": 51, "ctxt": 0 }, "opening": { @@ -35,22 +35,22 @@ }, "span": { "start": 1, - "end": 33, + "end": 32, "ctxt": 0 }, "attributes": [ { "type": "JSXAttribute", "span": { - "start": 12, - "end": 32, + "start": 11, + "end": 31, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 12, - "end": 16, + "start": 11, + "end": 15, "ctxt": 0 }, "value": "test", @@ -60,8 +60,8 @@ "value": { "type": "StringLiteral", "span": { - "start": 17, - "end": 32, + "start": 16, + "end": 31, "ctxt": 0 }, "value": "&&", @@ -76,26 +76,26 @@ { "type": "JSXText", "span": { - "start": 33, - "end": 45, + "start": 32, + "end": 41, "ctxt": 0 }, - "value": "\n\r\nbar\n\r\nbaz\n\r\n", - "raw": "\n\r\nbar\n\r\nbaz\n\r\n" + "value": "\n\nbar\n\nbaz\n\n", + "raw": "\n\nbar\n\nbaz\n\n" } ], "closing": { "type": "JSXClosingElement", "span": { - "start": 47, - "end": 55, + "start": 43, + "end": 51, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 47, - "end": 54, + "start": 43, + "end": 50, "ctxt": 0 }, "value": "AbC-def", diff --git a/ecmascript/parser/tests/jsx/basic/asi/input.js.json b/ecmascript/parser/tests/jsx/basic/asi/input.js.json index 7926a853b46..a9ed0d77eb6 100644 --- a/ecmascript/parser/tests/jsx/basic/asi/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/asi/input.js.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 37, + "end": 34, "ctxt": 0 }, "body": [ @@ -24,22 +24,22 @@ "decorators": [], "span": { "start": 0, - "end": 37, + "end": 34, "ctxt": 0 }, "body": { "type": "BlockStatement", "span": { "start": 13, - "end": 37, + "end": 34, "ctxt": 0 }, "stmts": [ { "type": "VariableDeclaration", "span": { - "start": 18, - "end": 23, + "start": 17, + "end": 22, "ctxt": 0 }, "kind": "let", @@ -48,15 +48,15 @@ { "type": "VariableDeclarator", "span": { - "start": 22, - "end": 23, + "start": 21, + "end": 22, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 22, - "end": 23, + "start": 21, + "end": 22, "ctxt": 0 }, "value": "x", @@ -71,15 +71,15 @@ { "type": "ExpressionStatement", "span": { - "start": 27, - "end": 34, + "start": 25, + "end": 32, "ctxt": 0 }, "expression": { "type": "JSXElement", "span": { - "start": 27, - "end": 34, + "start": 25, + "end": 32, "ctxt": 0 }, "opening": { @@ -87,8 +87,8 @@ "name": { "type": "Identifier", "span": { - "start": 28, - "end": 31, + "start": 26, + "end": 29, "ctxt": 0 }, "value": "div", @@ -96,8 +96,8 @@ "optional": false }, "span": { - "start": 28, - "end": 34, + "start": 26, + "end": 32, "ctxt": 0 }, "attributes": [], diff --git a/ecmascript/parser/tests/jsx/basic/custom/unary-paren/input.js.json b/ecmascript/parser/tests/jsx/basic/custom/unary-paren/input.js.json index a52cf312df4..7f98d8eaa8b 100644 --- a/ecmascript/parser/tests/jsx/basic/custom/unary-paren/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/custom/unary-paren/input.js.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 318, + "end": 300, "ctxt": 0 }, "body": [ @@ -50,8 +50,8 @@ "identifier": { "type": "Identifier", "span": { - "start": 39, - "end": 42, + "start": 37, + "end": 40, "ctxt": 0 }, "value": "App", @@ -62,23 +62,23 @@ "params": [], "decorators": [], "span": { - "start": 30, - "end": 295, + "start": 28, + "end": 279, "ctxt": 0 }, "body": { "type": "BlockStatement", "span": { - "start": 45, - "end": 295, + "start": 43, + "end": 279, "ctxt": 0 }, "stmts": [ { "type": "VariableDeclaration", "span": { - "start": 50, - "end": 73, + "start": 47, + "end": 70, "ctxt": 0 }, "kind": "const", @@ -87,15 +87,15 @@ { "type": "VariableDeclarator", "span": { - "start": 56, - "end": 72, + "start": 53, + "end": 69, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 56, - "end": 65, + "start": 53, + "end": 62, "ctxt": 0 }, "value": "isLoading", @@ -105,8 +105,8 @@ "init": { "type": "BooleanLiteral", "span": { - "start": 68, - "end": 72, + "start": 65, + "end": 69, "ctxt": 0 }, "value": true @@ -118,22 +118,22 @@ { "type": "ReturnStatement", "span": { - "start": 77, - "end": 292, + "start": 73, + "end": 277, "ctxt": 0 }, "argument": { "type": "ParenthesisExpression", "span": { - "start": 84, - "end": 291, + "start": 80, + "end": 276, "ctxt": 0 }, "expression": { "type": "JSXElement", "span": { - "start": 91, - "end": 286, + "start": 86, + "end": 272, "ctxt": 0 }, "opening": { @@ -141,8 +141,8 @@ "name": { "type": "Identifier", "span": { - "start": 92, - "end": 95, + "start": 87, + "end": 90, "ctxt": 0 }, "value": "div", @@ -150,8 +150,8 @@ "optional": false }, "span": { - "start": 92, - "end": 96, + "start": 87, + "end": 91, "ctxt": 0 }, "attributes": [], @@ -162,18 +162,18 @@ { "type": "JSXText", "span": { - "start": 96, - "end": 104, + "start": 91, + "end": 98, "ctxt": 0 }, - "value": "\n\r\n ", - "raw": "\n\r\n " + "value": "\n\n ", + "raw": "\n\n " }, { "type": "JSXElement", "span": { - "start": 104, - "end": 119, + "start": 98, + "end": 113, "ctxt": 0 }, "opening": { @@ -181,8 +181,8 @@ "name": { "type": "Identifier", "span": { - "start": 105, - "end": 107, + "start": 99, + "end": 101, "ctxt": 0 }, "value": "h1", @@ -190,8 +190,8 @@ "optional": false }, "span": { - "start": 105, - "end": 108, + "start": 99, + "end": 102, "ctxt": 0 }, "attributes": [], @@ -202,8 +202,8 @@ { "type": "JSXText", "span": { - "start": 108, - "end": 114, + "start": 102, + "end": 108, "ctxt": 0 }, "value": "works ", @@ -213,15 +213,15 @@ "closing": { "type": "JSXClosingElement", "span": { - "start": 116, - "end": 119, + "start": 110, + "end": 113, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 116, - "end": 118, + "start": 110, + "end": 112, "ctxt": 0 }, "value": "h1", @@ -233,27 +233,27 @@ { "type": "JSXText", "span": { - "start": 119, - "end": 127, + "start": 113, + "end": 120, "ctxt": 0 }, - "value": "\n\r\n ", - "raw": "\n\r\n " + "value": "\n\n ", + "raw": "\n\n " }, { "type": "JSXExpressionContainer", "expression": { "type": "ConditionalExpression", "span": { - "start": 138, - "end": 265, + "start": 130, + "end": 253, "ctxt": 0 }, "test": { "type": "Identifier", "span": { - "start": 138, - "end": 147, + "start": 130, + "end": 139, "ctxt": 0 }, "value": "isLoading", @@ -263,15 +263,15 @@ "consequent": { "type": "ParenthesisExpression", "span": { - "start": 150, - "end": 193, + "start": 142, + "end": 183, "ctxt": 0 }, "expression": { "type": "JSXElement", "span": { - "start": 163, - "end": 182, + "start": 154, + "end": 173, "ctxt": 0 }, "opening": { @@ -279,8 +279,8 @@ "name": { "type": "Identifier", "span": { - "start": 164, - "end": 167, + "start": 155, + "end": 158, "ctxt": 0 }, "value": "div", @@ -288,8 +288,8 @@ "optional": false }, "span": { - "start": 164, - "end": 168, + "start": 155, + "end": 159, "ctxt": 0 }, "attributes": [], @@ -300,8 +300,8 @@ { "type": "JSXText", "span": { - "start": 168, - "end": 176, + "start": 159, + "end": 167, "ctxt": 0 }, "value": "loading ", @@ -311,15 +311,15 @@ "closing": { "type": "JSXClosingElement", "span": { - "start": 178, - "end": 182, + "start": 169, + "end": 173, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 178, - "end": 181, + "start": 169, + "end": 172, "ctxt": 0 }, "value": "div", @@ -332,15 +332,15 @@ "alternate": { "type": "ParenthesisExpression", "span": { - "start": 196, - "end": 265, + "start": 186, + "end": 253, "ctxt": 0 }, "expression": { "type": "JSXElement", "span": { - "start": 211, - "end": 252, + "start": 200, + "end": 241, "ctxt": 0 }, "opening": { @@ -348,8 +348,8 @@ "name": { "type": "Identifier", "span": { - "start": 212, - "end": 215, + "start": 201, + "end": 204, "ctxt": 0 }, "value": "div", @@ -357,8 +357,8 @@ "optional": false }, "span": { - "start": 212, - "end": 216, + "start": 201, + "end": 205, "ctxt": 0 }, "attributes": [], @@ -369,8 +369,8 @@ { "type": "JSXText", "span": { - "start": 216, - "end": 246, + "start": 205, + "end": 235, "ctxt": 0 }, "value": "naaaaaaaaaaaaffffffffffffffff ", @@ -380,15 +380,15 @@ "closing": { "type": "JSXClosingElement", "span": { - "start": 248, - "end": 252, + "start": 237, + "end": 241, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 248, - "end": 251, + "start": 237, + "end": 240, "ctxt": 0 }, "value": "div", @@ -403,26 +403,26 @@ { "type": "JSXText", "span": { - "start": 274, - "end": 280, + "start": 261, + "end": 266, "ctxt": 0 }, - "value": "\n\r\n ", - "raw": "\n\r\n " + "value": "\n\n ", + "raw": "\n\n " } ], "closing": { "type": "JSXClosingElement", "span": { - "start": 282, - "end": 286, + "start": 268, + "end": 272, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 282, - "end": 285, + "start": 268, + "end": 271, "ctxt": 0 }, "value": "div", @@ -443,15 +443,15 @@ { "type": "ExportDefaultExpression", "span": { - "start": 299, - "end": 318, + "start": 281, + "end": 300, "ctxt": 0 }, "expression": { "type": "Identifier", "span": { - "start": 314, - "end": 317, + "start": 296, + "end": 299, "ctxt": 0 }, "value": "App", diff --git a/ecmascript/parser/tests/jsx/basic/custom/unary/input.js.json b/ecmascript/parser/tests/jsx/basic/custom/unary/input.js.json index d6ad9cbcf8b..901e51a812d 100644 --- a/ecmascript/parser/tests/jsx/basic/custom/unary/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/custom/unary/input.js.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 266, + "end": 252, "ctxt": 0 }, "body": [ @@ -50,8 +50,8 @@ "identifier": { "type": "Identifier", "span": { - "start": 39, - "end": 42, + "start": 37, + "end": 40, "ctxt": 0 }, "value": "App", @@ -62,23 +62,23 @@ "params": [], "decorators": [], "span": { - "start": 30, - "end": 243, + "start": 28, + "end": 231, "ctxt": 0 }, "body": { "type": "BlockStatement", "span": { - "start": 45, - "end": 243, + "start": 43, + "end": 231, "ctxt": 0 }, "stmts": [ { "type": "VariableDeclaration", "span": { - "start": 50, - "end": 73, + "start": 47, + "end": 70, "ctxt": 0 }, "kind": "const", @@ -87,15 +87,15 @@ { "type": "VariableDeclarator", "span": { - "start": 56, - "end": 72, + "start": 53, + "end": 69, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 56, - "end": 65, + "start": 53, + "end": 62, "ctxt": 0 }, "value": "isLoading", @@ -105,8 +105,8 @@ "init": { "type": "BooleanLiteral", "span": { - "start": 68, - "end": 72, + "start": 65, + "end": 69, "ctxt": 0 }, "value": true @@ -118,22 +118,22 @@ { "type": "ReturnStatement", "span": { - "start": 77, - "end": 240, + "start": 73, + "end": 229, "ctxt": 0 }, "argument": { "type": "ParenthesisExpression", "span": { - "start": 84, - "end": 239, + "start": 80, + "end": 228, "ctxt": 0 }, "expression": { "type": "JSXElement", "span": { - "start": 91, - "end": 234, + "start": 86, + "end": 224, "ctxt": 0 }, "opening": { @@ -141,8 +141,8 @@ "name": { "type": "Identifier", "span": { - "start": 92, - "end": 95, + "start": 87, + "end": 90, "ctxt": 0 }, "value": "div", @@ -150,8 +150,8 @@ "optional": false }, "span": { - "start": 92, - "end": 96, + "start": 87, + "end": 91, "ctxt": 0 }, "attributes": [], @@ -162,18 +162,18 @@ { "type": "JSXText", "span": { - "start": 96, - "end": 104, + "start": 91, + "end": 98, "ctxt": 0 }, - "value": "\n\r\n ", - "raw": "\n\r\n " + "value": "\n\n ", + "raw": "\n\n " }, { "type": "JSXElement", "span": { - "start": 104, - "end": 119, + "start": 98, + "end": 113, "ctxt": 0 }, "opening": { @@ -181,8 +181,8 @@ "name": { "type": "Identifier", "span": { - "start": 105, - "end": 107, + "start": 99, + "end": 101, "ctxt": 0 }, "value": "h1", @@ -190,8 +190,8 @@ "optional": false }, "span": { - "start": 105, - "end": 108, + "start": 99, + "end": 102, "ctxt": 0 }, "attributes": [], @@ -202,8 +202,8 @@ { "type": "JSXText", "span": { - "start": 108, - "end": 114, + "start": 102, + "end": 108, "ctxt": 0 }, "value": "works ", @@ -213,15 +213,15 @@ "closing": { "type": "JSXClosingElement", "span": { - "start": 116, - "end": 119, + "start": 110, + "end": 113, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 116, - "end": 118, + "start": 110, + "end": 112, "ctxt": 0 }, "value": "h1", @@ -233,27 +233,27 @@ { "type": "JSXText", "span": { - "start": 119, - "end": 127, + "start": 113, + "end": 120, "ctxt": 0 }, - "value": "\n\r\n ", - "raw": "\n\r\n " + "value": "\n\n ", + "raw": "\n\n " }, { "type": "JSXExpressionContainer", "expression": { "type": "ConditionalExpression", "span": { - "start": 138, - "end": 213, + "start": 130, + "end": 205, "ctxt": 0 }, "test": { "type": "Identifier", "span": { - "start": 138, - "end": 147, + "start": 130, + "end": 139, "ctxt": 0 }, "value": "isLoading", @@ -263,8 +263,8 @@ "consequent": { "type": "JSXElement", "span": { - "start": 150, - "end": 169, + "start": 142, + "end": 161, "ctxt": 0 }, "opening": { @@ -272,8 +272,8 @@ "name": { "type": "Identifier", "span": { - "start": 151, - "end": 154, + "start": 143, + "end": 146, "ctxt": 0 }, "value": "div", @@ -281,8 +281,8 @@ "optional": false }, "span": { - "start": 151, - "end": 155, + "start": 143, + "end": 147, "ctxt": 0 }, "attributes": [], @@ -293,8 +293,8 @@ { "type": "JSXText", "span": { - "start": 155, - "end": 163, + "start": 147, + "end": 155, "ctxt": 0 }, "value": "loading ", @@ -304,15 +304,15 @@ "closing": { "type": "JSXClosingElement", "span": { - "start": 165, - "end": 169, + "start": 157, + "end": 161, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 165, - "end": 168, + "start": 157, + "end": 160, "ctxt": 0 }, "value": "div", @@ -324,8 +324,8 @@ "alternate": { "type": "JSXElement", "span": { - "start": 172, - "end": 213, + "start": 164, + "end": 205, "ctxt": 0 }, "opening": { @@ -333,8 +333,8 @@ "name": { "type": "Identifier", "span": { - "start": 173, - "end": 176, + "start": 165, + "end": 168, "ctxt": 0 }, "value": "div", @@ -342,8 +342,8 @@ "optional": false }, "span": { - "start": 173, - "end": 177, + "start": 165, + "end": 169, "ctxt": 0 }, "attributes": [], @@ -354,8 +354,8 @@ { "type": "JSXText", "span": { - "start": 177, - "end": 207, + "start": 169, + "end": 199, "ctxt": 0 }, "value": "naaaaaaaaaaaaffffffffffffffff ", @@ -365,15 +365,15 @@ "closing": { "type": "JSXClosingElement", "span": { - "start": 209, - "end": 213, + "start": 201, + "end": 205, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 209, - "end": 212, + "start": 201, + "end": 204, "ctxt": 0 }, "value": "div", @@ -387,26 +387,26 @@ { "type": "JSXText", "span": { - "start": 222, - "end": 228, + "start": 213, + "end": 218, "ctxt": 0 }, - "value": "\n\r\n ", - "raw": "\n\r\n " + "value": "\n\n ", + "raw": "\n\n " } ], "closing": { "type": "JSXClosingElement", "span": { - "start": 230, - "end": 234, + "start": 220, + "end": 224, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 230, - "end": 233, + "start": 220, + "end": 223, "ctxt": 0 }, "value": "div", @@ -427,15 +427,15 @@ { "type": "ExportDefaultExpression", "span": { - "start": 247, - "end": 266, + "start": 233, + "end": 252, "ctxt": 0 }, "expression": { "type": "Identifier", "span": { - "start": 262, - "end": 265, + "start": 248, + "end": 251, "ctxt": 0 }, "value": "App", diff --git a/ecmascript/parser/tests/jsx/basic/fragment-3/input.js.json b/ecmascript/parser/tests/jsx/basic/fragment-3/input.js.json index 61f0f25596c..ed362f84e2e 100644 --- a/ecmascript/parser/tests/jsx/basic/fragment-3/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/fragment-3/input.js.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 55, + "end": 50, "ctxt": 0 }, "body": [ @@ -10,14 +10,14 @@ "type": "ExpressionStatement", "span": { "start": 0, - "end": 55, + "end": 50, "ctxt": 0 }, "expression": { "type": "JSXFragment", "span": { "start": 0, - "end": 55, + "end": 50, "ctxt": 0 }, "opening": { @@ -33,17 +33,17 @@ "type": "JSXText", "span": { "start": 3, - "end": 7, + "end": 6, "ctxt": 0 }, - "value": "\n\r\n ", - "raw": "\n\r\n " + "value": "\n\n ", + "raw": "\n\n " }, { "type": "JSXElement", "span": { - "start": 7, - "end": 32, + "start": 6, + "end": 29, "ctxt": 0 }, "opening": { @@ -51,8 +51,8 @@ "name": { "type": "Identifier", "span": { - "start": 8, - "end": 12, + "start": 7, + "end": 11, "ctxt": 0 }, "value": "span", @@ -60,8 +60,8 @@ "optional": false }, "span": { - "start": 8, - "end": 13, + "start": 7, + "end": 12, "ctxt": 0 }, "attributes": [], @@ -72,26 +72,26 @@ { "type": "JSXText", "span": { - "start": 13, - "end": 25, + "start": 12, + "end": 22, "ctxt": 0 }, - "value": "\n\r\n hi\n\r\n ", - "raw": "\n\r\n hi\n\r\n " + "value": "\n\n hi\n\n ", + "raw": "\n\n hi\n\n " } ], "closing": { "type": "JSXClosingElement", "span": { - "start": 27, - "end": 32, + "start": 24, + "end": 29, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 27, - "end": 31, + "start": 24, + "end": 28, "ctxt": 0 }, "value": "span", @@ -103,18 +103,18 @@ { "type": "JSXText", "span": { - "start": 32, - "end": 36, + "start": 29, + "end": 32, "ctxt": 0 }, - "value": "\n\r\n ", - "raw": "\n\r\n " + "value": "\n\n ", + "raw": "\n\n " }, { "type": "JSXElement", "span": { - "start": 36, - "end": 50, + "start": 32, + "end": 46, "ctxt": 0 }, "opening": { @@ -122,8 +122,8 @@ "name": { "type": "Identifier", "span": { - "start": 37, - "end": 40, + "start": 33, + "end": 36, "ctxt": 0 }, "value": "div", @@ -131,8 +131,8 @@ "optional": false }, "span": { - "start": 37, - "end": 41, + "start": 33, + "end": 37, "ctxt": 0 }, "attributes": [], @@ -143,8 +143,8 @@ { "type": "JSXText", "span": { - "start": 41, - "end": 44, + "start": 37, + "end": 40, "ctxt": 0 }, "value": "bye", @@ -154,15 +154,15 @@ "closing": { "type": "JSXClosingElement", "span": { - "start": 46, - "end": 50, + "start": 42, + "end": 46, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 46, - "end": 49, + "start": 42, + "end": 45, "ctxt": 0 }, "value": "div", @@ -174,19 +174,19 @@ { "type": "JSXText", "span": { - "start": 50, - "end": 52, + "start": 46, + "end": 47, "ctxt": 0 }, - "value": "\n\r\n", - "raw": "\n\r\n" + "value": "\n\n", + "raw": "\n\n" } ], "closing": { "type": "JSXClosingFragment", "span": { - "start": 54, - "end": 55, + "start": 49, + "end": 50, "ctxt": 0 } } diff --git a/ecmascript/parser/tests/jsx/basic/fragment-4/input.js.json b/ecmascript/parser/tests/jsx/basic/fragment-4/input.js.json index ceae9241462..90cfede16f1 100644 --- a/ecmascript/parser/tests/jsx/basic/fragment-4/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/fragment-4/input.js.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 55, + "end": 49, "ctxt": 0 }, "body": [ @@ -10,14 +10,14 @@ "type": "ExpressionStatement", "span": { "start": 0, - "end": 55, + "end": 49, "ctxt": 0 }, "expression": { "type": "JSXFragment", "span": { "start": 0, - "end": 55, + "end": 49, "ctxt": 0 }, "opening": { @@ -33,24 +33,24 @@ "type": "JSXText", "span": { "start": 2, - "end": 6, + "end": 5, "ctxt": 0 }, - "value": "\n\r\n ", - "raw": "\n\r\n " + "value": "\n\n ", + "raw": "\n\n " }, { "type": "JSXFragment", "span": { - "start": 6, - "end": 50, + "start": 5, + "end": 45, "ctxt": 0 }, "opening": { "type": "JSXOpeningFragment", "span": { - "start": 7, - "end": 8, + "start": 6, + "end": 7, "ctxt": 0 } }, @@ -58,25 +58,25 @@ { "type": "JSXText", "span": { - "start": 8, - "end": 14, + "start": 7, + "end": 12, "ctxt": 0 }, - "value": "\n\r\n ", - "raw": "\n\r\n " + "value": "\n\n ", + "raw": "\n\n " }, { "type": "JSXFragment", "span": { - "start": 14, - "end": 43, + "start": 12, + "end": 39, "ctxt": 0 }, "opening": { "type": "JSXOpeningFragment", "span": { - "start": 15, - "end": 16, + "start": 13, + "end": 14, "ctxt": 0 } }, @@ -84,19 +84,19 @@ { "type": "JSXText", "span": { - "start": 16, - "end": 40, + "start": 14, + "end": 36, "ctxt": 0 }, - "value": "\n\r\n super deep\n\r\n ", - "raw": "\n\r\n super deep\n\r\n " + "value": "\n\n super deep\n\n ", + "raw": "\n\n super deep\n\n " } ], "closing": { "type": "JSXClosingFragment", "span": { - "start": 42, - "end": 43, + "start": 38, + "end": 39, "ctxt": 0 } } @@ -104,19 +104,19 @@ { "type": "JSXText", "span": { - "start": 43, - "end": 47, + "start": 39, + "end": 42, "ctxt": 0 }, - "value": "\n\r\n ", - "raw": "\n\r\n " + "value": "\n\n ", + "raw": "\n\n " } ], "closing": { "type": "JSXClosingFragment", "span": { - "start": 49, - "end": 50, + "start": 44, + "end": 45, "ctxt": 0 } } @@ -124,19 +124,19 @@ { "type": "JSXText", "span": { - "start": 50, - "end": 52, + "start": 45, + "end": 46, "ctxt": 0 }, - "value": "\n\r\n", - "raw": "\n\r\n" + "value": "\n\n", + "raw": "\n\n" } ], "closing": { "type": "JSXClosingFragment", "span": { - "start": 54, - "end": 55, + "start": 48, + "end": 49, "ctxt": 0 } } diff --git a/ecmascript/parser/tests/jsx/basic/fragment-5/input.js.json b/ecmascript/parser/tests/jsx/basic/fragment-5/input.js.json index f7106b59fb4..f152d44d4c8 100644 --- a/ecmascript/parser/tests/jsx/basic/fragment-5/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/fragment-5/input.js.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 68, + "end": 62, "ctxt": 0 }, "body": [ @@ -10,40 +10,40 @@ "type": "ExpressionStatement", "span": { "start": 0, - "end": 68, + "end": 62, "ctxt": 0 }, "expression": { "type": "JSXFragment", "span": { "start": 0, - "end": 68, + "end": 62, "ctxt": 0 }, "opening": { "type": "JSXOpeningFragment", "span": { - "start": 32, - "end": 33, + "start": 29, + "end": 30, "ctxt": 0 } }, "children": [ { "type": "JSXText", + "span": { + "start": 30, + "end": 33, + "ctxt": 0 + }, + "value": "\n\n ", + "raw": "\n\n " + }, + { + "type": "JSXElement", "span": { "start": 33, - "end": 37, - "ctxt": 0 - }, - "value": "\n\r\n ", - "raw": "\n\r\n " - }, - { - "type": "JSXElement", - "span": { - "start": 37, - "end": 48, + "end": 44, "ctxt": 0 }, "opening": { @@ -51,8 +51,8 @@ "name": { "type": "Identifier", "span": { - "start": 38, - "end": 41, + "start": 34, + "end": 37, "ctxt": 0 }, "value": "div", @@ -60,8 +60,8 @@ "optional": false }, "span": { - "start": 38, - "end": 42, + "start": 34, + "end": 38, "ctxt": 0 }, "attributes": [], @@ -72,15 +72,15 @@ "closing": { "type": "JSXClosingElement", "span": { - "start": 44, - "end": 48, + "start": 40, + "end": 44, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 44, - "end": 47, + "start": 40, + "end": 43, "ctxt": 0 }, "value": "div", @@ -92,18 +92,18 @@ { "type": "JSXText", "span": { - "start": 48, - "end": 52, + "start": 44, + "end": 47, "ctxt": 0 }, - "value": "\n\r\n ", - "raw": "\n\r\n " + "value": "\n\n ", + "raw": "\n\n " }, { "type": "JSXElement", "span": { - "start": 52, - "end": 63, + "start": 47, + "end": 58, "ctxt": 0 }, "opening": { @@ -111,8 +111,8 @@ "name": { "type": "Identifier", "span": { - "start": 53, - "end": 56, + "start": 48, + "end": 51, "ctxt": 0 }, "value": "div", @@ -120,8 +120,8 @@ "optional": false }, "span": { - "start": 53, - "end": 57, + "start": 48, + "end": 52, "ctxt": 0 }, "attributes": [], @@ -132,15 +132,15 @@ "closing": { "type": "JSXClosingElement", "span": { - "start": 59, - "end": 63, + "start": 54, + "end": 58, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 59, - "end": 62, + "start": 54, + "end": 57, "ctxt": 0 }, "value": "div", @@ -152,19 +152,19 @@ { "type": "JSXText", "span": { - "start": 63, - "end": 65, + "start": 58, + "end": 59, "ctxt": 0 }, - "value": "\n\r\n", - "raw": "\n\r\n" + "value": "\n\n", + "raw": "\n\n" } ], "closing": { "type": "JSXClosingFragment", "span": { - "start": 67, - "end": 68, + "start": 61, + "end": 62, "ctxt": 0 } } diff --git a/ecmascript/parser/tests/jsx/basic/namespace-tag/input.js.json b/ecmascript/parser/tests/jsx/basic/namespace-tag/input.js.json index 9ea864c8235..c83e3e2a44a 100644 --- a/ecmascript/parser/tests/jsx/basic/namespace-tag/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/namespace-tag/input.js.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 33, + "end": 32, "ctxt": 0 }, "body": [ @@ -63,15 +63,15 @@ { "type": "ExpressionStatement", "span": { - "start": 14, - "end": 33, + "start": 13, + "end": 32, "ctxt": 0 }, "expression": { "type": "JSXElement", "span": { - "start": 14, - "end": 33, + "start": 13, + "end": 32, "ctxt": 0 }, "opening": { @@ -81,8 +81,8 @@ "namespace": { "type": "Identifier", "span": { - "start": 15, - "end": 18, + "start": 14, + "end": 17, "ctxt": 0 }, "value": "Foo", @@ -92,8 +92,8 @@ "name": { "type": "Identifier", "span": { - "start": 19, - "end": 22, + "start": 18, + "end": 21, "ctxt": 0 }, "value": "Bar", @@ -102,8 +102,8 @@ } }, "span": { - "start": 15, - "end": 23, + "start": 14, + "end": 22, "ctxt": 0 }, "attributes": [], @@ -114,8 +114,8 @@ "closing": { "type": "JSXClosingElement", "span": { - "start": 25, - "end": 33, + "start": 24, + "end": 32, "ctxt": 0 }, "name": { @@ -123,8 +123,8 @@ "namespace": { "type": "Identifier", "span": { - "start": 25, - "end": 28, + "start": 24, + "end": 27, "ctxt": 0 }, "value": "Foo", @@ -134,8 +134,8 @@ "name": { "type": "Identifier", "span": { - "start": 29, - "end": 32, + "start": 28, + "end": 31, "ctxt": 0 }, "value": "Bar", diff --git a/ecmascript/parser/tests/jsx/basic/yield-tag/input.js.json b/ecmascript/parser/tests/jsx/basic/yield-tag/input.js.json index 64d3119278d..fc69a261e8e 100644 --- a/ecmascript/parser/tests/jsx/basic/yield-tag/input.js.json +++ b/ecmascript/parser/tests/jsx/basic/yield-tag/input.js.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 37, + "end": 35, "ctxt": 0 }, "body": [ @@ -24,36 +24,36 @@ "decorators": [], "span": { "start": 0, - "end": 37, + "end": 35, "ctxt": 0 }, "body": { "type": "BlockStatement", "span": { "start": 13, - "end": 37, + "end": 35, "ctxt": 0 }, "stmts": [ { "type": "ExpressionStatement", "span": { - "start": 20, - "end": 34, + "start": 19, + "end": 33, "ctxt": 0 }, "expression": { "type": "YieldExpression", "span": { - "start": 20, - "end": 33, + "start": 19, + "end": 32, "ctxt": 0 }, "argument": { "type": "JSXElement", "span": { - "start": 26, - "end": 33, + "start": 25, + "end": 32, "ctxt": 0 }, "opening": { @@ -61,8 +61,8 @@ "name": { "type": "Identifier", "span": { - "start": 27, - "end": 28, + "start": 26, + "end": 27, "ctxt": 0 }, "value": "a", @@ -70,8 +70,8 @@ "optional": false }, "span": { - "start": 27, - "end": 29, + "start": 26, + "end": 28, "ctxt": 0 }, "attributes": [], @@ -82,15 +82,15 @@ "closing": { "type": "JSXClosingElement", "span": { - "start": 31, - "end": 33, + "start": 30, + "end": 32, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 31, - "end": 32, + "start": 30, + "end": 31, "ctxt": 0 }, "value": "a", diff --git a/ecmascript/parser/tests/typescript/arrow-function/async-generic-false-positive/input.ts.json b/ecmascript/parser/tests/typescript/arrow-function/async-generic-false-positive/input.ts.json index 88a9f9d4f2b..484ceea526d 100644 --- a/ecmascript/parser/tests/typescript/arrow-function/async-generic-false-positive/input.ts.json +++ b/ecmascript/parser/tests/typescript/arrow-function/async-generic-false-positive/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 28, + "end": 27, "ctxt": 0 }, "body": [ @@ -46,30 +46,30 @@ { "type": "ExpressionStatement", "span": { - "start": 12, - "end": 28, + "start": 11, + "end": 27, "ctxt": 0 }, "expression": { "type": "BinaryExpression", "span": { - "start": 12, - "end": 27, + "start": 11, + "end": 26, "ctxt": 0 }, "operator": "==", "left": { "type": "CallExpression", "span": { - "start": 12, - "end": 22, + "start": 11, + "end": 21, "ctxt": 0 }, "callee": { "type": "Identifier", "span": { - "start": 12, - "end": 17, + "start": 11, + "end": 16, "ctxt": 0 }, "value": "async", @@ -80,23 +80,23 @@ "typeArguments": { "type": "TsTypeParameterInstantiation", "span": { - "start": 17, - "end": 20, + "start": 16, + "end": 19, "ctxt": 0 }, "params": [ { "type": "TsTypeReference", "span": { - "start": 18, - "end": 19, + "start": 17, + "end": 18, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 18, - "end": 19, + "start": 17, + "end": 18, "ctxt": 0 }, "value": "T", @@ -111,8 +111,8 @@ "right": { "type": "NumericLiteral", "span": { - "start": 26, - "end": 27, + "start": 25, + "end": 26, "ctxt": 0 }, "value": 0.0 diff --git a/ecmascript/parser/tests/typescript/arrow-function/generic-tsx/input.ts.json b/ecmascript/parser/tests/typescript/arrow-function/generic-tsx/input.ts.json index e7c950c127d..2ef88024d9f 100644 --- a/ecmascript/parser/tests/typescript/arrow-function/generic-tsx/input.ts.json +++ b/ecmascript/parser/tests/typescript/arrow-function/generic-tsx/input.ts.json @@ -1,53 +1,53 @@ { "type": "Module", "span": { - "start": 62, - "end": 80, + "start": 61, + "end": 79, "ctxt": 0 }, "body": [ { "type": "ExpressionStatement", "span": { - "start": 62, - "end": 80, + "start": 61, + "end": 79, "ctxt": 0 }, "expression": { "type": "ArrowFunctionExpression", "span": { - "start": 65, - "end": 79, + "start": 64, + "end": 78, "ctxt": 0 }, "params": [ { "type": "Identifier", "span": { - "start": 66, - "end": 70, + "start": 65, + "end": 69, "ctxt": 0 }, "value": "a", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 67, - "end": 70, + "start": 66, + "end": 69, "ctxt": 0 }, "typeAnnotation": { "type": "TsTypeReference", "span": { - "start": 69, - "end": 70, + "start": 68, + "end": 69, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 69, - "end": 70, + "start": 68, + "end": 69, "ctxt": 0 }, "value": "T", @@ -63,8 +63,8 @@ "body": { "type": "Identifier", "span": { - "start": 78, - "end": 79, + "start": 77, + "end": 78, "ctxt": 0 }, "value": "a", @@ -76,23 +76,23 @@ "typeParameters": { "type": "TsTypeParameterDeclaration", "span": { - "start": 62, - "end": 65, + "start": 61, + "end": 64, "ctxt": 0 }, "parameters": [ { "type": "TsTypeParameter", "span": { - "start": 63, - "end": 64, + "start": 62, + "end": 63, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 63, - "end": 64, + "start": 62, + "end": 63, "ctxt": 0 }, "value": "T", @@ -107,22 +107,22 @@ "returnType": { "type": "TsTypeAnnotation", "span": { - "start": 71, - "end": 74, + "start": 70, + "end": 73, "ctxt": 0 }, "typeAnnotation": { "type": "TsTypeReference", "span": { - "start": 73, - "end": 74, + "start": 72, + "end": 73, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 73, - "end": 74, + "start": 72, + "end": 73, "ctxt": 0 }, "value": "T", diff --git a/ecmascript/parser/tests/typescript/cast/as/input.ts.json b/ecmascript/parser/tests/typescript/cast/as/input.ts.json index 129f9b3c3e6..f486257281d 100644 --- a/ecmascript/parser/tests/typescript/cast/as/input.ts.json +++ b/ecmascript/parser/tests/typescript/cast/as/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 109, + "end": 106, "ctxt": 0 }, "body": [ @@ -56,30 +56,30 @@ { "type": "ExpressionStatement", "span": { - "start": 9, - "end": 26, + "start": 8, + "end": 25, "ctxt": 0 }, "expression": { "type": "TsAsExpression", "span": { - "start": 9, - "end": 14, + "start": 8, + "end": 13, "ctxt": 0 }, "expression": { "type": "BinaryExpression", "span": { - "start": 9, - "end": 14, + "start": 8, + "end": 13, "ctxt": 0 }, "operator": "<", "left": { "type": "Identifier", "span": { - "start": 9, - "end": 10, + "start": 8, + "end": 9, "ctxt": 0 }, "value": "x", @@ -89,8 +89,8 @@ "right": { "type": "Identifier", "span": { - "start": 13, - "end": 14, + "start": 12, + "end": 13, "ctxt": 0 }, "value": "y", @@ -101,8 +101,8 @@ "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 18, - "end": 25, + "start": 17, + "end": 24, "ctxt": 0 }, "kind": "boolean" @@ -112,23 +112,23 @@ { "type": "ExpressionStatement", "span": { - "start": 51, - "end": 69, + "start": 49, + "end": 67, "ctxt": 0 }, "expression": { "type": "BinaryExpression", "span": { - "start": 51, - "end": 58, + "start": 49, + "end": 56, "ctxt": 0 }, "operator": "===", "left": { "type": "Identifier", "span": { - "start": 51, - "end": 52, + "start": 49, + "end": 50, "ctxt": 0 }, "value": "x", @@ -138,15 +138,15 @@ "right": { "type": "TsAsExpression", "span": { - "start": 57, - "end": 58, + "start": 55, + "end": 56, "ctxt": 0 }, "expression": { "type": "NumericLiteral", "span": { - "start": 57, - "end": 58, + "start": 55, + "end": 56, "ctxt": 0 }, "value": 1.0 @@ -154,8 +154,8 @@ "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 62, - "end": 68, + "start": 60, + "end": 66, "ctxt": 0 }, "kind": "number" @@ -166,29 +166,29 @@ { "type": "ExpressionStatement", "span": { - "start": 95, - "end": 109, + "start": 92, + "end": 106, "ctxt": 0 }, "expression": { "type": "TsAsExpression", "span": { - "start": 95, - "end": 103, + "start": 92, + "end": 100, "ctxt": 0 }, "expression": { "type": "TsAsExpression", "span": { - "start": 95, - "end": 96, + "start": 92, + "end": 93, "ctxt": 0 }, "expression": { "type": "Identifier", "span": { - "start": 95, - "end": 96, + "start": 92, + "end": 93, "ctxt": 0 }, "value": "x", @@ -198,8 +198,8 @@ "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 100, - "end": 103, + "start": 97, + "end": 100, "ctxt": 0 }, "kind": "any" @@ -208,15 +208,15 @@ "typeAnnotation": { "type": "TsTypeReference", "span": { - "start": 107, - "end": 108, + "start": 104, + "end": 105, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 107, - "end": 108, + "start": 104, + "end": 105, "ctxt": 0 }, "value": "T", diff --git a/ecmascript/parser/tests/typescript/cast/need-parentheses/input.ts.json b/ecmascript/parser/tests/typescript/cast/need-parentheses/input.ts.json index 170e7fed41a..a0f8d46570c 100644 --- a/ecmascript/parser/tests/typescript/cast/need-parentheses/input.ts.json +++ b/ecmascript/parser/tests/typescript/cast/need-parentheses/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 30, + "end": 28, "ctxt": 0 }, "body": [ @@ -84,36 +84,36 @@ { "type": "ExpressionStatement", "span": { - "start": 12, - "end": 23, + "start": 11, + "end": 22, "ctxt": 0 }, "expression": { "type": "MemberExpression", "span": { - "start": 12, - "end": 22, + "start": 11, + "end": 21, "ctxt": 0 }, "object": { "type": "ParenthesisExpression", "span": { - "start": 12, - "end": 20, + "start": 11, + "end": 19, "ctxt": 0 }, "expression": { "type": "TsAsExpression", "span": { - "start": 13, - "end": 14, + "start": 12, + "end": 13, "ctxt": 0 }, "expression": { "type": "Identifier", "span": { - "start": 13, - "end": 14, + "start": 12, + "end": 13, "ctxt": 0 }, "value": "x", @@ -123,15 +123,15 @@ "typeAnnotation": { "type": "TsTypeReference", "span": { - "start": 18, - "end": 19, + "start": 17, + "end": 18, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 18, - "end": 19, + "start": 17, + "end": 18, "ctxt": 0 }, "value": "T", @@ -145,8 +145,8 @@ "property": { "type": "Identifier", "span": { - "start": 21, - "end": 22, + "start": 20, + "end": 21, "ctxt": 0 }, "value": "y", @@ -159,29 +159,29 @@ { "type": "ExpressionStatement", "span": { - "start": 25, - "end": 30, + "start": 23, + "end": 28, "ctxt": 0 }, "expression": { "type": "MemberExpression", "span": { - "start": 25, - "end": 29, + "start": 23, + "end": 27, "ctxt": 0 }, "object": { "type": "TsNonNullExpression", "span": { - "start": 25, - "end": 27, + "start": 23, + "end": 25, "ctxt": 0 }, "expression": { "type": "Identifier", "span": { - "start": 25, - "end": 26, + "start": 23, + "end": 24, "ctxt": 0 }, "value": "x", @@ -192,8 +192,8 @@ "property": { "type": "Identifier", "span": { - "start": 28, - "end": 29, + "start": 26, + "end": 27, "ctxt": 0 }, "value": "y", diff --git a/ecmascript/parser/tests/typescript/cast/null-assertion-false-positive/input.ts.json b/ecmascript/parser/tests/typescript/cast/null-assertion-false-positive/input.ts.json index 403acbcb36f..3bea561f87a 100644 --- a/ecmascript/parser/tests/typescript/cast/null-assertion-false-positive/input.ts.json +++ b/ecmascript/parser/tests/typescript/cast/null-assertion-false-positive/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 5, + "end": 4, "ctxt": 0 }, "body": [ @@ -28,23 +28,23 @@ { "type": "ExpressionStatement", "span": { - "start": 3, - "end": 5, + "start": 2, + "end": 4, "ctxt": 0 }, "expression": { "type": "UnaryExpression", "span": { - "start": 3, - "end": 5, + "start": 2, + "end": 4, "ctxt": 0 }, "operator": "!", "argument": { "type": "Identifier", "span": { - "start": 4, - "end": 5, + "start": 3, + "end": 4, "ctxt": 0 }, "value": "b", diff --git a/ecmascript/parser/tests/typescript/class/abstract-false-positive/input.ts.json b/ecmascript/parser/tests/typescript/class/abstract-false-positive/input.ts.json index fb40037bc95..c2d4c667a56 100644 --- a/ecmascript/parser/tests/typescript/class/abstract-false-positive/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/abstract-false-positive/input.ts.json @@ -1,23 +1,23 @@ { "type": "Module", "span": { - "start": 64, - "end": 88, + "start": 63, + "end": 87, "ctxt": 0 }, "body": [ { "type": "ExportDefaultExpression", "span": { - "start": 64, - "end": 88, + "start": 63, + "end": 87, "ctxt": 0 }, "expression": { "type": "Identifier", "span": { - "start": 79, - "end": 87, + "start": 78, + "end": 86, "ctxt": 0 }, "value": "abstract", diff --git a/ecmascript/parser/tests/typescript/class/abstract/input.ts.json b/ecmascript/parser/tests/typescript/class/abstract/input.ts.json index cae417473a2..af2b4d920f0 100644 --- a/ecmascript/parser/tests/typescript/class/abstract/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/abstract/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 204, + "end": 199, "ctxt": 0 }, "body": [ @@ -38,8 +38,8 @@ "identifier": { "type": "Identifier", "span": { - "start": 44, - "end": 45, + "start": 43, + "end": 44, "ctxt": 0 }, "value": "C", @@ -48,8 +48,8 @@ }, "declare": true, "span": { - "start": 38, - "end": 48, + "start": 37, + "end": 47, "ctxt": 0 }, "decorators": [], @@ -63,8 +63,8 @@ { "type": "ExportDeclaration", "span": { - "start": 50, - "end": 76, + "start": 48, + "end": 74, "ctxt": 0 }, "declaration": { @@ -72,8 +72,8 @@ "identifier": { "type": "Identifier", "span": { - "start": 72, - "end": 73, + "start": 70, + "end": 71, "ctxt": 0 }, "value": "C", @@ -82,8 +82,8 @@ }, "declare": false, "span": { - "start": 66, - "end": 76, + "start": 64, + "end": 74, "ctxt": 0 }, "decorators": [], @@ -98,16 +98,16 @@ { "type": "ExportDefaultDeclaration", "span": { - "start": 158, - "end": 167, + "start": 154, + "end": 163, "ctxt": 0 }, "decl": { "type": "ClassExpression", "identifier": null, "span": { - "start": 158, - "end": 167, + "start": 154, + "end": 163, "ctxt": 0 }, "decorators": [], @@ -122,8 +122,8 @@ { "type": "ExportDefaultDeclaration", "span": { - "start": 193, - "end": 204, + "start": 188, + "end": 199, "ctxt": 0 }, "decl": { @@ -131,8 +131,8 @@ "identifier": { "type": "Identifier", "span": { - "start": 199, - "end": 200, + "start": 194, + "end": 195, "ctxt": 0 }, "value": "C", @@ -140,8 +140,8 @@ "optional": false }, "span": { - "start": 193, - "end": 204, + "start": 188, + "end": 199, "ctxt": 0 }, "decorators": [], diff --git a/ecmascript/parser/tests/typescript/class/constructor-with-modifier-names/input.ts.json b/ecmascript/parser/tests/typescript/class/constructor-with-modifier-names/input.ts.json index d682c0dc526..bd37d36ba19 100644 --- a/ecmascript/parser/tests/typescript/class/constructor-with-modifier-names/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/constructor-with-modifier-names/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 94, + "end": 91, "ctxt": 0 }, "body": [ @@ -22,7 +22,7 @@ "declare": false, "span": { "start": 0, - "end": 94, + "end": 91, "ctxt": 0 }, "decorators": [], @@ -30,15 +30,15 @@ { "type": "Constructor", "span": { - "start": 15, - "end": 44, + "start": 14, + "end": 43, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 15, - "end": 26, + "start": 14, + "end": 25, "ctxt": 0 }, "value": "constructor", @@ -49,8 +49,8 @@ { "type": "Identifier", "span": { - "start": 27, - "end": 30, + "start": 26, + "end": 29, "ctxt": 0 }, "value": "set", @@ -60,8 +60,8 @@ { "type": "Identifier", "span": { - "start": 32, - "end": 40, + "start": 31, + "end": 39, "ctxt": 0 }, "value": "readonly", @@ -72,8 +72,8 @@ "body": { "type": "BlockStatement", "span": { - "start": 42, - "end": 44, + "start": 41, + "end": 43, "ctxt": 0 }, "stmts": [] @@ -84,15 +84,15 @@ { "type": "Constructor", "span": { - "start": 48, - "end": 91, + "start": 46, + "end": 89, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 48, - "end": 59, + "start": 46, + "end": 57, "ctxt": 0 }, "value": "constructor", @@ -103,23 +103,23 @@ { "type": "Identifier", "span": { - "start": 60, - "end": 68, + "start": 58, + "end": 66, "ctxt": 0 }, "value": "set", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 63, - "end": 68, + "start": 61, + "end": 66, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 65, - "end": 68, + "start": 63, + "end": 66, "ctxt": 0 }, "kind": "any" @@ -130,23 +130,23 @@ { "type": "Identifier", "span": { - "start": 70, - "end": 87, + "start": 68, + "end": 85, "ctxt": 0 }, "value": "readonly", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 78, - "end": 87, + "start": 76, + "end": 85, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 80, - "end": 87, + "start": 78, + "end": 85, "ctxt": 0 }, "kind": "boolean" @@ -158,8 +158,8 @@ "body": { "type": "BlockStatement", "span": { - "start": 89, - "end": 91, + "start": 87, + "end": 89, "ctxt": 0 }, "stmts": [] diff --git a/ecmascript/parser/tests/typescript/class/constructor/input.ts.json b/ecmascript/parser/tests/typescript/class/constructor/input.ts.json index de92c658ac0..43ec46c1d55 100644 --- a/ecmascript/parser/tests/typescript/class/constructor/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/constructor/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 128, + "end": 124, "ctxt": 0 }, "body": [ @@ -22,7 +22,7 @@ "declare": false, "span": { "start": 0, - "end": 128, + "end": 124, "ctxt": 0 }, "decorators": [], @@ -30,15 +30,15 @@ { "type": "Constructor", "span": { - "start": 15, - "end": 49, + "start": 14, + "end": 48, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 15, - "end": 26, + "start": 14, + "end": 25, "ctxt": 0 }, "value": "constructor", @@ -49,23 +49,23 @@ { "type": "Identifier", "span": { - "start": 27, - "end": 36, + "start": 26, + "end": 35, "ctxt": 0 }, "value": "x", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 28, - "end": 36, + "start": 27, + "end": 35, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 30, - "end": 36, + "start": 29, + "end": 35, "ctxt": 0 }, "kind": "number" @@ -76,23 +76,23 @@ { "type": "Identifier", "span": { - "start": 38, - "end": 47, + "start": 37, + "end": 46, "ctxt": 0 }, "value": "y", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 39, - "end": 47, + "start": 38, + "end": 46, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 41, - "end": 47, + "start": 40, + "end": 46, "ctxt": 0 }, "kind": "number" @@ -108,15 +108,15 @@ { "type": "Constructor", "span": { - "start": 55, - "end": 89, + "start": 53, + "end": 87, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 55, - "end": 66, + "start": 53, + "end": 64, "ctxt": 0 }, "value": "constructor", @@ -127,23 +127,23 @@ { "type": "Identifier", "span": { - "start": 67, - "end": 76, + "start": 65, + "end": 74, "ctxt": 0 }, "value": "x", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 68, - "end": 76, + "start": 66, + "end": 74, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 70, - "end": 76, + "start": 68, + "end": 74, "ctxt": 0 }, "kind": "string" @@ -154,23 +154,23 @@ { "type": "Identifier", "span": { - "start": 78, - "end": 87, + "start": 76, + "end": 85, "ctxt": 0 }, "value": "y", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 79, - "end": 87, + "start": 77, + "end": 85, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 81, - "end": 87, + "start": 79, + "end": 85, "ctxt": 0 }, "kind": "string" @@ -186,15 +186,15 @@ { "type": "Constructor", "span": { - "start": 95, - "end": 125, + "start": 92, + "end": 122, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 95, - "end": 106, + "start": 92, + "end": 103, "ctxt": 0 }, "value": "constructor", @@ -205,23 +205,23 @@ { "type": "Identifier", "span": { - "start": 107, - "end": 113, + "start": 104, + "end": 110, "ctxt": 0 }, "value": "x", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 108, - "end": 113, + "start": 105, + "end": 110, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 110, - "end": 113, + "start": 107, + "end": 110, "ctxt": 0 }, "kind": "any" @@ -232,23 +232,23 @@ { "type": "Identifier", "span": { - "start": 115, - "end": 121, + "start": 112, + "end": 118, "ctxt": 0 }, "value": "y", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 116, - "end": 121, + "start": 113, + "end": 118, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 118, - "end": 121, + "start": 115, + "end": 118, "ctxt": 0 }, "kind": "any" @@ -260,8 +260,8 @@ "body": { "type": "BlockStatement", "span": { - "start": 123, - "end": 125, + "start": 120, + "end": 122, "ctxt": 0 }, "stmts": [] diff --git a/ecmascript/parser/tests/typescript/class/declare/input.ts.json b/ecmascript/parser/tests/typescript/class/declare/input.ts.json index 1d5319db820..5bb704115a8 100644 --- a/ecmascript/parser/tests/typescript/class/declare/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/declare/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 93, + "end": 87, "ctxt": 0 }, "body": [ @@ -22,7 +22,7 @@ "declare": true, "span": { "start": 8, - "end": 93, + "end": 87, "ctxt": 0 }, "decorators": [], @@ -33,23 +33,23 @@ { "type": "Identifier", "span": { - "start": 24, - "end": 25, + "start": 23, + "end": 24, "ctxt": 0 }, "value": "x", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 27, - "end": 33, + "start": 26, + "end": 32, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 27, - "end": 33, + "start": 26, + "end": 32, "ctxt": 0 }, "kind": "string" @@ -61,15 +61,15 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 34, - "end": 39, + "start": 33, + "end": 38, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 36, - "end": 39, + "start": 35, + "end": 38, "ctxt": 0 }, "kind": "any" @@ -77,23 +77,23 @@ }, "readonly": false, "span": { - "start": 23, - "end": 40, + "start": 22, + "end": 39, "ctxt": 0 } }, { "type": "ClassProperty", "span": { - "start": 46, - "end": 48, + "start": 44, + "end": 46, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 46, - "end": 47, + "start": 44, + "end": 45, "ctxt": 0 }, "value": "x", @@ -114,15 +114,15 @@ { "type": "ClassProperty", "span": { - "start": 54, - "end": 64, + "start": 51, + "end": 61, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 54, - "end": 55, + "start": 51, + "end": 52, "ctxt": 0 }, "value": "x", @@ -133,15 +133,15 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 55, - "end": 63, + "start": 52, + "end": 60, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 57, - "end": 63, + "start": 54, + "end": 60, "ctxt": 0 }, "kind": "number" @@ -159,15 +159,15 @@ { "type": "ClassMethod", "span": { - "start": 70, - "end": 74, + "start": 66, + "end": 70, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 70, - "end": 71, + "start": 66, + "end": 67, "ctxt": 0 }, "value": "f", @@ -178,8 +178,8 @@ "params": [], "decorators": [], "span": { - "start": 70, - "end": 74, + "start": 66, + "end": 70, "ctxt": 0 }, "body": null, @@ -197,15 +197,15 @@ { "type": "ClassMethod", "span": { - "start": 80, - "end": 90, + "start": 75, + "end": 85, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 80, - "end": 81, + "start": 75, + "end": 76, "ctxt": 0 }, "value": "f", @@ -216,8 +216,8 @@ "params": [], "decorators": [], "span": { - "start": 80, - "end": 90, + "start": 75, + "end": 85, "ctxt": 0 }, "body": null, @@ -227,15 +227,15 @@ "returnType": { "type": "TsTypeAnnotation", "span": { - "start": 83, - "end": 89, + "start": 78, + "end": 84, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 85, - "end": 89, + "start": 80, + "end": 84, "ctxt": 0 }, "kind": "void" diff --git a/ecmascript/parser/tests/typescript/class/expression-extends-implements/input.ts.json b/ecmascript/parser/tests/typescript/class/expression-extends-implements/input.ts.json index 7b72e1dbfee..6a6a1e88f6c 100644 --- a/ecmascript/parser/tests/typescript/class/expression-extends-implements/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/expression-extends-implements/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 92, + "end": 91, "ctxt": 0 }, "body": [ @@ -154,15 +154,15 @@ { "type": "ExpressionStatement", "span": { - "start": 46, - "end": 92, + "start": 45, + "end": 91, "ctxt": 0 }, "expression": { "type": "ParenthesisExpression", "span": { - "start": 46, - "end": 91, + "start": 45, + "end": 90, "ctxt": 0 }, "expression": { @@ -170,8 +170,8 @@ "identifier": { "type": "Identifier", "span": { - "start": 53, - "end": 54, + "start": 52, + "end": 53, "ctxt": 0 }, "value": "C", @@ -179,8 +179,8 @@ "optional": false }, "span": { - "start": 47, - "end": 90, + "start": 46, + "end": 89, "ctxt": 0 }, "decorators": [], @@ -188,15 +188,15 @@ "superClass": { "type": "CallExpression", "span": { - "start": 63, - "end": 66, + "start": 62, + "end": 65, "ctxt": 0 }, "callee": { "type": "Identifier", "span": { - "start": 63, - "end": 64, + "start": 62, + "end": 63, "ctxt": 0 }, "value": "f", @@ -211,23 +211,23 @@ "superTypeParams": { "type": "TsTypeParameterInstantiation", "span": { - "start": 66, - "end": 69, + "start": 65, + "end": 68, "ctxt": 0 }, "params": [ { "type": "TsTypeReference", "span": { - "start": 67, - "end": 68, + "start": 66, + "end": 67, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 67, - "end": 68, + "start": 66, + "end": 67, "ctxt": 0 }, "value": "T", @@ -242,8 +242,8 @@ { "type": "TsExpressionWithTypeArguments", "span": { - "start": 81, - "end": 87, + "start": 80, + "end": 86, "ctxt": 0 }, "expression": { @@ -251,8 +251,8 @@ "left": { "type": "Identifier", "span": { - "start": 81, - "end": 82, + "start": 80, + "end": 81, "ctxt": 0 }, "value": "X", @@ -262,8 +262,8 @@ "right": { "type": "Identifier", "span": { - "start": 83, - "end": 84, + "start": 82, + "end": 83, "ctxt": 0 }, "value": "Y", @@ -274,23 +274,23 @@ "typeArguments": { "type": "TsTypeParameterInstantiation", "span": { - "start": 84, - "end": 87, + "start": 83, + "end": 86, "ctxt": 0 }, "params": [ { "type": "TsTypeReference", "span": { - "start": 85, - "end": 86, + "start": 84, + "end": 85, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 85, - "end": 86, + "start": 84, + "end": 85, "ctxt": 0 }, "value": "T", diff --git a/ecmascript/parser/tests/typescript/class/expression-extends/input.ts.json b/ecmascript/parser/tests/typescript/class/expression-extends/input.ts.json index 2544efea420..69740613dcb 100644 --- a/ecmascript/parser/tests/typescript/class/expression-extends/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/expression-extends/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 56, + "end": 55, "ctxt": 0 }, "body": [ @@ -90,15 +90,15 @@ { "type": "ExpressionStatement", "span": { - "start": 28, - "end": 56, + "start": 27, + "end": 55, "ctxt": 0 }, "expression": { "type": "ParenthesisExpression", "span": { - "start": 28, - "end": 55, + "start": 27, + "end": 54, "ctxt": 0 }, "expression": { @@ -106,8 +106,8 @@ "identifier": { "type": "Identifier", "span": { - "start": 35, - "end": 36, + "start": 34, + "end": 35, "ctxt": 0 }, "value": "C", @@ -115,8 +115,8 @@ "optional": false }, "span": { - "start": 29, - "end": 54, + "start": 28, + "end": 53, "ctxt": 0 }, "decorators": [], @@ -124,15 +124,15 @@ "superClass": { "type": "CallExpression", "span": { - "start": 45, - "end": 48, + "start": 44, + "end": 47, "ctxt": 0 }, "callee": { "type": "Identifier", "span": { - "start": 45, - "end": 46, + "start": 44, + "end": 45, "ctxt": 0 }, "value": "f", @@ -147,23 +147,23 @@ "superTypeParams": { "type": "TsTypeParameterInstantiation", "span": { - "start": 48, - "end": 51, + "start": 47, + "end": 50, "ctxt": 0 }, "params": [ { "type": "TsTypeReference", "span": { - "start": 49, - "end": 50, + "start": 48, + "end": 49, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 49, - "end": 50, + "start": 48, + "end": 49, "ctxt": 0 }, "value": "T", diff --git a/ecmascript/parser/tests/typescript/class/expression-generic/input.ts.json b/ecmascript/parser/tests/typescript/class/expression-generic/input.ts.json index aa5ef15d3b2..52fa938c756 100644 --- a/ecmascript/parser/tests/typescript/class/expression-generic/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/expression-generic/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 32, + "end": 31, "ctxt": 0 }, "body": [ @@ -71,15 +71,15 @@ { "type": "ExpressionStatement", "span": { - "start": 16, - "end": 32, + "start": 15, + "end": 31, "ctxt": 0 }, "expression": { "type": "ParenthesisExpression", "span": { - "start": 16, - "end": 31, + "start": 15, + "end": 30, "ctxt": 0 }, "expression": { @@ -87,8 +87,8 @@ "identifier": { "type": "Identifier", "span": { - "start": 23, - "end": 24, + "start": 22, + "end": 23, "ctxt": 0 }, "value": "C", @@ -96,8 +96,8 @@ "optional": false }, "span": { - "start": 17, - "end": 30, + "start": 16, + "end": 29, "ctxt": 0 }, "decorators": [], @@ -107,23 +107,23 @@ "typeParams": { "type": "TsTypeParameterDeclaration", "span": { - "start": 24, - "end": 27, + "start": 23, + "end": 26, "ctxt": 0 }, "parameters": [ { "type": "TsTypeParameter", "span": { - "start": 25, - "end": 26, + "start": 24, + "end": 25, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 25, - "end": 26, + "start": 24, + "end": 25, "ctxt": 0 }, "value": "T", diff --git a/ecmascript/parser/tests/typescript/class/expression-implements/input.ts.json b/ecmascript/parser/tests/typescript/class/expression-implements/input.ts.json index b9e7ff30b13..fbcb8b1c854 100644 --- a/ecmascript/parser/tests/typescript/class/expression-implements/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/expression-implements/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 62, + "end": 61, "ctxt": 0 }, "body": [ @@ -105,15 +105,15 @@ { "type": "ExpressionStatement", "span": { - "start": 31, - "end": 62, + "start": 30, + "end": 61, "ctxt": 0 }, "expression": { "type": "ParenthesisExpression", "span": { - "start": 31, - "end": 61, + "start": 30, + "end": 60, "ctxt": 0 }, "expression": { @@ -121,8 +121,8 @@ "identifier": { "type": "Identifier", "span": { - "start": 38, - "end": 39, + "start": 37, + "end": 38, "ctxt": 0 }, "value": "C", @@ -130,8 +130,8 @@ "optional": false }, "span": { - "start": 32, - "end": 60, + "start": 31, + "end": 59, "ctxt": 0 }, "decorators": [], @@ -144,8 +144,8 @@ { "type": "TsExpressionWithTypeArguments", "span": { - "start": 51, - "end": 57, + "start": 50, + "end": 56, "ctxt": 0 }, "expression": { @@ -153,8 +153,8 @@ "left": { "type": "Identifier", "span": { - "start": 51, - "end": 52, + "start": 50, + "end": 51, "ctxt": 0 }, "value": "X", @@ -164,8 +164,8 @@ "right": { "type": "Identifier", "span": { - "start": 53, - "end": 54, + "start": 52, + "end": 53, "ctxt": 0 }, "value": "Y", @@ -176,23 +176,23 @@ "typeArguments": { "type": "TsTypeParameterInstantiation", "span": { - "start": 54, - "end": 57, + "start": 53, + "end": 56, "ctxt": 0 }, "params": [ { "type": "TsTypeReference", "span": { - "start": 55, - "end": 56, + "start": 54, + "end": 55, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 55, - "end": 56, + "start": 54, + "end": 55, "ctxt": 0 }, "value": "T", diff --git a/ecmascript/parser/tests/typescript/class/get-generic/input.ts.json b/ecmascript/parser/tests/typescript/class/get-generic/input.ts.json index a489fb68650..76911afc93e 100644 --- a/ecmascript/parser/tests/typescript/class/get-generic/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/get-generic/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 41, + "end": 39, "ctxt": 0 }, "body": [ @@ -22,7 +22,7 @@ "declare": true, "span": { "start": 8, - "end": 41, + "end": 39, "ctxt": 0 }, "decorators": [], @@ -30,15 +30,15 @@ { "type": "ClassMethod", "span": { - "start": 23, - "end": 38, + "start": 22, + "end": 37, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 23, - "end": 26, + "start": 22, + "end": 25, "ctxt": 0 }, "value": "get", @@ -49,8 +49,8 @@ "params": [], "decorators": [], "span": { - "start": 23, - "end": 38, + "start": 22, + "end": 37, "ctxt": 0 }, "body": null, @@ -59,23 +59,23 @@ "typeParameters": { "type": "TsTypeParameterDeclaration", "span": { - "start": 26, - "end": 29, + "start": 25, + "end": 28, "ctxt": 0 }, "parameters": [ { "type": "TsTypeParameter", "span": { - "start": 27, - "end": 28, + "start": 26, + "end": 27, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 27, - "end": 28, + "start": 26, + "end": 27, "ctxt": 0 }, "value": "T", @@ -90,15 +90,15 @@ "returnType": { "type": "TsTypeAnnotation", "span": { - "start": 31, - "end": 37, + "start": 30, + "end": 36, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 33, - "end": 37, + "start": 32, + "end": 36, "ctxt": 0 }, "kind": "void" diff --git a/ecmascript/parser/tests/typescript/class/index-signature/input.ts.json b/ecmascript/parser/tests/typescript/class/index-signature/input.ts.json index 3f5a5e9b39a..e14a12b1fda 100644 --- a/ecmascript/parser/tests/typescript/class/index-signature/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/index-signature/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 67, + "end": 64, "ctxt": 0 }, "body": [ @@ -22,7 +22,7 @@ "declare": false, "span": { "start": 0, - "end": 67, + "end": 64, "ctxt": 0 }, "decorators": [], @@ -33,23 +33,23 @@ { "type": "Identifier", "span": { - "start": 16, - "end": 17, + "start": 15, + "end": 16, "ctxt": 0 }, "value": "x", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 19, - "end": 25, + "start": 18, + "end": 24, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 19, - "end": 25, + "start": 18, + "end": 24, "ctxt": 0 }, "kind": "string" @@ -61,15 +61,15 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 26, - "end": 31, + "start": 25, + "end": 30, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 28, - "end": 31, + "start": 27, + "end": 30, "ctxt": 0 }, "kind": "any" @@ -77,8 +77,8 @@ }, "readonly": false, "span": { - "start": 15, - "end": 32, + "start": 14, + "end": 31, "ctxt": 0 } }, @@ -88,23 +88,23 @@ { "type": "Identifier", "span": { - "start": 48, - "end": 49, + "start": 46, + "end": 47, "ctxt": 0 }, "value": "x", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 51, - "end": 57, + "start": 49, + "end": 55, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 51, - "end": 57, + "start": 49, + "end": 55, "ctxt": 0 }, "kind": "string" @@ -116,15 +116,15 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 58, - "end": 63, + "start": 56, + "end": 61, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 60, - "end": 63, + "start": 58, + "end": 61, "ctxt": 0 }, "kind": "any" @@ -132,8 +132,8 @@ }, "readonly": true, "span": { - "start": 38, - "end": 64, + "start": 36, + "end": 62, "ctxt": 0 } } diff --git a/ecmascript/parser/tests/typescript/class/members-with-modifier-names/input.ts.json b/ecmascript/parser/tests/typescript/class/members-with-modifier-names/input.ts.json index 631c3a1b611..152b3bd575a 100644 --- a/ecmascript/parser/tests/typescript/class/members-with-modifier-names/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/members-with-modifier-names/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 103, + "end": 98, "ctxt": 0 }, "body": [ @@ -22,7 +22,7 @@ "declare": false, "span": { "start": 0, - "end": 103, + "end": 98, "ctxt": 0 }, "decorators": [], @@ -30,15 +30,15 @@ { "type": "ClassMethod", "span": { - "start": 15, - "end": 30, + "start": 14, + "end": 29, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 15, - "end": 21, + "start": 14, + "end": 20, "ctxt": 0 }, "value": "public", @@ -49,8 +49,8 @@ "params": [], "decorators": [], "span": { - "start": 15, - "end": 30, + "start": 14, + "end": 29, "ctxt": 0 }, "body": null, @@ -60,15 +60,15 @@ "returnType": { "type": "TsTypeAnnotation", "span": { - "start": 23, - "end": 29, + "start": 22, + "end": 28, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 25, - "end": 29, + "start": 24, + "end": 28, "ctxt": 0 }, "kind": "void" @@ -84,15 +84,15 @@ { "type": "ClassMethod", "span": { - "start": 36, - "end": 58, + "start": 34, + "end": 56, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 43, - "end": 49, + "start": 41, + "end": 47, "ctxt": 0 }, "value": "static", @@ -103,8 +103,8 @@ "params": [], "decorators": [], "span": { - "start": 36, - "end": 58, + "start": 34, + "end": 56, "ctxt": 0 }, "body": null, @@ -114,15 +114,15 @@ "returnType": { "type": "TsTypeAnnotation", "span": { - "start": 51, - "end": 57, + "start": 49, + "end": 55, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 53, - "end": 57, + "start": 51, + "end": 55, "ctxt": 0 }, "kind": "void" @@ -138,15 +138,15 @@ { "type": "ClassProperty", "span": { - "start": 64, - "end": 77, + "start": 61, + "end": 74, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 64, - "end": 72, + "start": 61, + "end": 69, "ctxt": 0 }, "value": "readonly", @@ -156,8 +156,8 @@ "value": { "type": "NumericLiteral", "span": { - "start": 75, - "end": 76, + "start": 72, + "end": 73, "ctxt": 0 }, "value": 0.0 @@ -175,15 +175,15 @@ { "type": "ClassMethod", "span": { - "start": 83, - "end": 100, + "start": 79, + "end": 96, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 83, - "end": 88, + "start": 79, + "end": 84, "ctxt": 0 }, "value": "async", @@ -194,8 +194,8 @@ "params": [], "decorators": [], "span": { - "start": 83, - "end": 100, + "start": 79, + "end": 96, "ctxt": 0 }, "body": null, @@ -204,23 +204,23 @@ "typeParameters": { "type": "TsTypeParameterDeclaration", "span": { - "start": 88, - "end": 91, + "start": 84, + "end": 87, "ctxt": 0 }, "parameters": [ { "type": "TsTypeParameter", "span": { - "start": 89, - "end": 90, + "start": 85, + "end": 86, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 89, - "end": 90, + "start": 85, + "end": 86, "ctxt": 0 }, "value": "T", @@ -235,15 +235,15 @@ "returnType": { "type": "TsTypeAnnotation", "span": { - "start": 93, - "end": 99, + "start": 89, + "end": 95, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 95, - "end": 99, + "start": 91, + "end": 95, "ctxt": 0 }, "kind": "void" diff --git a/ecmascript/parser/tests/typescript/class/members-with-reserved-names/input.ts.json b/ecmascript/parser/tests/typescript/class/members-with-reserved-names/input.ts.json index 38d3d00277f..8b770961cdd 100644 --- a/ecmascript/parser/tests/typescript/class/members-with-reserved-names/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/members-with-reserved-names/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 40, + "end": 38, "ctxt": 0 }, "body": [ @@ -22,7 +22,7 @@ "declare": false, "span": { "start": 0, - "end": 40, + "end": 38, "ctxt": 0 }, "decorators": [], @@ -30,15 +30,15 @@ { "type": "ClassMethod", "span": { - "start": 22, - "end": 37, + "start": 21, + "end": 36, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 22, - "end": 28, + "start": 21, + "end": 27, "ctxt": 0 }, "value": "delete", @@ -49,8 +49,8 @@ "params": [], "decorators": [], "span": { - "start": 22, - "end": 37, + "start": 21, + "end": 36, "ctxt": 0 }, "body": null, @@ -60,15 +60,15 @@ "returnType": { "type": "TsTypeAnnotation", "span": { - "start": 30, - "end": 36, + "start": 29, + "end": 35, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 32, - "end": 36, + "start": 31, + "end": 35, "ctxt": 0 }, "kind": "void" diff --git a/ecmascript/parser/tests/typescript/class/method-computed/input.ts.json b/ecmascript/parser/tests/typescript/class/method-computed/input.ts.json index 07584c87dbf..f7aa36b8e8a 100644 --- a/ecmascript/parser/tests/typescript/class/method-computed/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/method-computed/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 77, + "end": 74, "ctxt": 0 }, "body": [ @@ -22,7 +22,7 @@ "declare": false, "span": { "start": 0, - "end": 77, + "end": 74, "ctxt": 0 }, "decorators": [], @@ -30,29 +30,29 @@ { "type": "ClassMethod", "span": { - "start": 15, - "end": 41, + "start": 14, + "end": 40, "ctxt": 0 }, "key": { "type": "Computed", "span": { - "start": 15, - "end": 32, + "start": 14, + "end": 31, "ctxt": 0 }, "expression": { "type": "MemberExpression", "span": { - "start": 16, - "end": 31, + "start": 15, + "end": 30, "ctxt": 0 }, "object": { "type": "Identifier", "span": { - "start": 16, - "end": 22, + "start": 15, + "end": 21, "ctxt": 0 }, "value": "Symbol", @@ -62,8 +62,8 @@ "property": { "type": "Identifier", "span": { - "start": 23, - "end": 31, + "start": 22, + "end": 30, "ctxt": 0 }, "value": "iterator", @@ -77,8 +77,8 @@ "params": [], "decorators": [], "span": { - "start": 15, - "end": 41, + "start": 14, + "end": 40, "ctxt": 0 }, "body": null, @@ -88,15 +88,15 @@ "returnType": { "type": "TsTypeAnnotation", "span": { - "start": 34, - "end": 40, + "start": 33, + "end": 39, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 36, - "end": 40, + "start": 35, + "end": 39, "ctxt": 0 }, "kind": "void" @@ -112,29 +112,29 @@ { "type": "ClassMethod", "span": { - "start": 47, - "end": 74, + "start": 45, + "end": 72, "ctxt": 0 }, "key": { "type": "Computed", "span": { - "start": 47, - "end": 64, + "start": 45, + "end": 62, "ctxt": 0 }, "expression": { "type": "MemberExpression", "span": { - "start": 48, - "end": 63, + "start": 46, + "end": 61, "ctxt": 0 }, "object": { "type": "Identifier", "span": { - "start": 48, - "end": 54, + "start": 46, + "end": 52, "ctxt": 0 }, "value": "Symbol", @@ -144,8 +144,8 @@ "property": { "type": "Identifier", "span": { - "start": 55, - "end": 63, + "start": 53, + "end": 61, "ctxt": 0 }, "value": "iterator", @@ -159,8 +159,8 @@ "params": [], "decorators": [], "span": { - "start": 47, - "end": 74, + "start": 45, + "end": 72, "ctxt": 0 }, "body": null, @@ -170,15 +170,15 @@ "returnType": { "type": "TsTypeAnnotation", "span": { - "start": 67, - "end": 73, + "start": 65, + "end": 71, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 69, - "end": 73, + "start": 67, + "end": 71, "ctxt": 0 }, "kind": "void" diff --git a/ecmascript/parser/tests/typescript/class/method-generic/input.ts.json b/ecmascript/parser/tests/typescript/class/method-generic/input.ts.json index 46786cc01fe..36e63770cc5 100644 --- a/ecmascript/parser/tests/typescript/class/method-generic/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/method-generic/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 86, + "end": 83, "ctxt": 0 }, "body": [ @@ -22,7 +22,7 @@ "declare": false, "span": { "start": 0, - "end": 86, + "end": 83, "ctxt": 0 }, "decorators": [], @@ -30,15 +30,15 @@ { "type": "ClassMethod", "span": { - "start": 15, - "end": 49, + "start": 14, + "end": 48, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 15, - "end": 16, + "start": 14, + "end": 15, "ctxt": 0 }, "value": "f", @@ -50,30 +50,30 @@ { "type": "Identifier", "span": { - "start": 20, - "end": 24, + "start": 19, + "end": 23, "ctxt": 0 }, "value": "a", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 21, - "end": 24, + "start": 20, + "end": 23, "ctxt": 0 }, "typeAnnotation": { "type": "TsTypeReference", "span": { - "start": 23, - "end": 24, + "start": 22, + "end": 23, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 23, - "end": 24, + "start": 22, + "end": 23, "ctxt": 0 }, "value": "T", @@ -88,30 +88,30 @@ { "type": "Identifier", "span": { - "start": 26, - "end": 31, + "start": 25, + "end": 30, "ctxt": 0 }, "value": "b", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 28, - "end": 31, + "start": 27, + "end": 30, "ctxt": 0 }, "typeAnnotation": { "type": "TsTypeReference", "span": { - "start": 30, - "end": 31, + "start": 29, + "end": 30, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 30, - "end": 31, + "start": 29, + "end": 30, "ctxt": 0 }, "value": "T", @@ -126,20 +126,20 @@ { "type": "RestElement", "span": { - "start": 33, - "end": 42, + "start": 32, + "end": 41, "ctxt": 0 }, "rest": { - "start": 33, - "end": 36, + "start": 32, + "end": 35, "ctxt": 0 }, "argument": { "type": "Identifier", "span": { - "start": 36, - "end": 37, + "start": 35, + "end": 36, "ctxt": 0 }, "value": "c", @@ -149,29 +149,29 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 37, - "end": 42, + "start": 36, + "end": 41, "ctxt": 0 }, "typeAnnotation": { "type": "TsArrayType", "span": { - "start": 39, - "end": 42, + "start": 38, + "end": 41, "ctxt": 0 }, "elemType": { "type": "TsTypeReference", "span": { - "start": 39, - "end": 40, + "start": 38, + "end": 39, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 39, - "end": 40, + "start": 38, + "end": 39, "ctxt": 0 }, "value": "T", @@ -186,15 +186,15 @@ ], "decorators": [], "span": { - "start": 15, - "end": 49, + "start": 14, + "end": 48, "ctxt": 0 }, "body": { "type": "BlockStatement", "span": { - "start": 47, - "end": 49, + "start": 46, + "end": 48, "ctxt": 0 }, "stmts": [] @@ -204,23 +204,23 @@ "typeParameters": { "type": "TsTypeParameterDeclaration", "span": { - "start": 16, - "end": 19, + "start": 15, + "end": 18, "ctxt": 0 }, "parameters": [ { "type": "TsTypeParameter", "span": { - "start": 17, - "end": 18, + "start": 16, + "end": 17, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 17, - "end": 18, + "start": 16, + "end": 17, "ctxt": 0 }, "value": "T", @@ -235,22 +235,22 @@ "returnType": { "type": "TsTypeAnnotation", "span": { - "start": 43, - "end": 46, + "start": 42, + "end": 45, "ctxt": 0 }, "typeAnnotation": { "type": "TsTypeReference", "span": { - "start": 45, - "end": 46, + "start": 44, + "end": 45, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 45, - "end": 46, + "start": 44, + "end": 45, "ctxt": 0 }, "value": "T", @@ -270,29 +270,29 @@ { "type": "ClassMethod", "span": { - "start": 55, - "end": 83, + "start": 53, + "end": 81, "ctxt": 0 }, "key": { "type": "Computed", "span": { - "start": 55, - "end": 72, + "start": 53, + "end": 70, "ctxt": 0 }, "expression": { "type": "MemberExpression", "span": { - "start": 56, - "end": 71, + "start": 54, + "end": 69, "ctxt": 0 }, "object": { "type": "Identifier", "span": { - "start": 56, - "end": 62, + "start": 54, + "end": 60, "ctxt": 0 }, "value": "Symbol", @@ -302,8 +302,8 @@ "property": { "type": "Identifier", "span": { - "start": 63, - "end": 71, + "start": 61, + "end": 69, "ctxt": 0 }, "value": "iterator", @@ -317,15 +317,15 @@ "params": [], "decorators": [], "span": { - "start": 55, - "end": 83, + "start": 53, + "end": 81, "ctxt": 0 }, "body": { "type": "BlockStatement", "span": { - "start": 81, - "end": 83, + "start": 79, + "end": 81, "ctxt": 0 }, "stmts": [] @@ -335,23 +335,23 @@ "typeParameters": { "type": "TsTypeParameterDeclaration", "span": { - "start": 72, - "end": 75, + "start": 70, + "end": 73, "ctxt": 0 }, "parameters": [ { "type": "TsTypeParameter", "span": { - "start": 73, - "end": 74, + "start": 71, + "end": 72, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 73, - "end": 74, + "start": 71, + "end": 72, "ctxt": 0 }, "value": "T", @@ -366,22 +366,22 @@ "returnType": { "type": "TsTypeAnnotation", "span": { - "start": 77, - "end": 80, + "start": 75, + "end": 78, "ctxt": 0 }, "typeAnnotation": { "type": "TsTypeReference", "span": { - "start": 79, - "end": 80, + "start": 77, + "end": 78, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 79, - "end": 80, + "start": 77, + "end": 78, "ctxt": 0 }, "value": "T", diff --git a/ecmascript/parser/tests/typescript/class/method-no-body/input.ts.json b/ecmascript/parser/tests/typescript/class/method-no-body/input.ts.json index c846c8c1799..dfa6256c687 100644 --- a/ecmascript/parser/tests/typescript/class/method-no-body/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/method-no-body/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 38, + "end": 35, "ctxt": 0 }, "body": [ @@ -22,7 +22,7 @@ "declare": false, "span": { "start": 0, - "end": 38, + "end": 35, "ctxt": 0 }, "decorators": [], @@ -30,15 +30,15 @@ { "type": "ClassMethod", "span": { - "start": 15, - "end": 19, + "start": 14, + "end": 18, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 15, - "end": 16, + "start": 14, + "end": 15, "ctxt": 0 }, "value": "f", @@ -49,8 +49,8 @@ "params": [], "decorators": [], "span": { - "start": 15, - "end": 19, + "start": 14, + "end": 18, "ctxt": 0 }, "body": null, @@ -68,15 +68,15 @@ { "type": "ClassMethod", "span": { - "start": 25, - "end": 35, + "start": 23, + "end": 33, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 25, - "end": 26, + "start": 23, + "end": 24, "ctxt": 0 }, "value": "f", @@ -87,8 +87,8 @@ "params": [], "decorators": [], "span": { - "start": 25, - "end": 35, + "start": 23, + "end": 33, "ctxt": 0 }, "body": null, @@ -98,15 +98,15 @@ "returnType": { "type": "TsTypeAnnotation", "span": { - "start": 28, - "end": 34, + "start": 26, + "end": 32, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 30, - "end": 34, + "start": 28, + "end": 32, "ctxt": 0 }, "kind": "void" diff --git a/ecmascript/parser/tests/typescript/class/method-optional/input.ts.json b/ecmascript/parser/tests/typescript/class/method-optional/input.ts.json index 4e4582195db..735c84ae14e 100644 --- a/ecmascript/parser/tests/typescript/class/method-optional/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/method-optional/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 31, + "end": 29, "ctxt": 0 }, "body": [ @@ -22,7 +22,7 @@ "declare": false, "span": { "start": 0, - "end": 31, + "end": 29, "ctxt": 0 }, "decorators": [], @@ -30,15 +30,15 @@ { "type": "ClassMethod", "span": { - "start": 15, - "end": 28, + "start": 14, + "end": 27, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 15, - "end": 16, + "start": 14, + "end": 15, "ctxt": 0 }, "value": "m", @@ -49,15 +49,15 @@ "params": [], "decorators": [], "span": { - "start": 15, - "end": 28, + "start": 14, + "end": 27, "ctxt": 0 }, "body": { "type": "BlockStatement", "span": { - "start": 26, - "end": 28, + "start": 25, + "end": 27, "ctxt": 0 }, "stmts": [] @@ -68,15 +68,15 @@ "returnType": { "type": "TsTypeAnnotation", "span": { - "start": 19, - "end": 25, + "start": 18, + "end": 24, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 21, - "end": 25, + "start": 20, + "end": 24, "ctxt": 0 }, "kind": "void" diff --git a/ecmascript/parser/tests/typescript/class/method-return-type/input.ts.json b/ecmascript/parser/tests/typescript/class/method-return-type/input.ts.json index 386937a1cae..f43d853bb73 100644 --- a/ecmascript/parser/tests/typescript/class/method-return-type/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/method-return-type/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 30, + "end": 28, "ctxt": 0 }, "body": [ @@ -22,7 +22,7 @@ "declare": false, "span": { "start": 0, - "end": 30, + "end": 28, "ctxt": 0 }, "decorators": [], @@ -30,15 +30,15 @@ { "type": "ClassMethod", "span": { - "start": 15, - "end": 27, + "start": 14, + "end": 26, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 15, - "end": 16, + "start": 14, + "end": 15, "ctxt": 0 }, "value": "f", @@ -49,15 +49,15 @@ "params": [], "decorators": [], "span": { - "start": 15, - "end": 27, + "start": 14, + "end": 26, "ctxt": 0 }, "body": { "type": "BlockStatement", "span": { - "start": 25, - "end": 27, + "start": 24, + "end": 26, "ctxt": 0 }, "stmts": [] @@ -68,15 +68,15 @@ "returnType": { "type": "TsTypeAnnotation", "span": { - "start": 18, - "end": 24, + "start": 17, + "end": 23, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 20, - "end": 24, + "start": 19, + "end": 23, "ctxt": 0 }, "kind": "void" diff --git a/ecmascript/parser/tests/typescript/class/method-with-newline-with-body/input.ts.json b/ecmascript/parser/tests/typescript/class/method-with-newline-with-body/input.ts.json index 4ae3e652739..280f51c7e1f 100644 --- a/ecmascript/parser/tests/typescript/class/method-with-newline-with-body/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/method-with-newline-with-body/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 36, + "end": 31, "ctxt": 0 }, "body": [ @@ -22,7 +22,7 @@ "declare": false, "span": { "start": 0, - "end": 36, + "end": 31, "ctxt": 0 }, "decorators": [], @@ -30,15 +30,15 @@ { "type": "ClassMethod", "span": { - "start": 16, - "end": 33, + "start": 14, + "end": 29, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 16, - "end": 17, + "start": 14, + "end": 15, "ctxt": 0 }, "value": "m", @@ -49,15 +49,15 @@ "params": [], "decorators": [], "span": { - "start": 16, - "end": 33, + "start": 14, + "end": 29, "ctxt": 0 }, "body": { "type": "BlockStatement", "span": { - "start": 25, - "end": 33, + "start": 22, + "end": 29, "ctxt": 0 }, "stmts": [] diff --git a/ecmascript/parser/tests/typescript/class/method-with-newline-without-body/input.ts.json b/ecmascript/parser/tests/typescript/class/method-with-newline-without-body/input.ts.json index 823430bf9de..86113a4b14d 100644 --- a/ecmascript/parser/tests/typescript/class/method-with-newline-without-body/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/method-with-newline-without-body/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 31, + "end": 27, "ctxt": 0 }, "body": [ @@ -22,7 +22,7 @@ "declare": false, "span": { "start": 0, - "end": 31, + "end": 27, "ctxt": 0 }, "decorators": [], @@ -30,15 +30,15 @@ { "type": "ClassMethod", "span": { - "start": 16, - "end": 19, + "start": 14, + "end": 17, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 16, - "end": 17, + "start": 14, + "end": 15, "ctxt": 0 }, "value": "m", @@ -49,8 +49,8 @@ "params": [], "decorators": [], "span": { - "start": 16, - "end": 19, + "start": 14, + "end": 17, "ctxt": 0 }, "body": null, @@ -68,15 +68,15 @@ { "type": "ClassMethod", "span": { - "start": 25, - "end": 28, + "start": 22, + "end": 25, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 25, - "end": 26, + "start": 22, + "end": 23, "ctxt": 0 }, "value": "n", @@ -87,8 +87,8 @@ "params": [], "decorators": [], "span": { - "start": 25, - "end": 28, + "start": 22, + "end": 25, "ctxt": 0 }, "body": null, diff --git a/ecmascript/parser/tests/typescript/class/modifiers-accessors/input.ts.json b/ecmascript/parser/tests/typescript/class/modifiers-accessors/input.ts.json index 392cd272de1..ec6509d6350 100644 --- a/ecmascript/parser/tests/typescript/class/modifiers-accessors/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/modifiers-accessors/input.ts.json @@ -1,8 +1,8 @@ { "type": "Module", "span": { - "start": 41, - "end": 305, + "start": 40, + "end": 295, "ctxt": 0 }, "body": [ @@ -11,8 +11,8 @@ "identifier": { "type": "Identifier", "span": { - "start": 56, - "end": 57, + "start": 55, + "end": 56, "ctxt": 0 }, "value": "C", @@ -21,8 +21,8 @@ }, "declare": false, "span": { - "start": 50, - "end": 305, + "start": 49, + "end": 295, "ctxt": 0 }, "decorators": [], @@ -30,15 +30,15 @@ { "type": "ClassMethod", "span": { - "start": 65, - "end": 82, + "start": 63, + "end": 80, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 78, - "end": 79, + "start": 76, + "end": 77, "ctxt": 0 }, "value": "a", @@ -49,8 +49,8 @@ "params": [], "decorators": [], "span": { - "start": 65, - "end": 82, + "start": 63, + "end": 80, "ctxt": 0 }, "body": null, @@ -68,15 +68,15 @@ { "type": "ClassMethod", "span": { - "start": 88, - "end": 116, + "start": 85, + "end": 113, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 99, - "end": 100, + "start": 96, + "end": 97, "ctxt": 0 }, "value": "s", @@ -87,30 +87,30 @@ "params": [], "decorators": [], "span": { - "start": 88, - "end": 116, + "start": 85, + "end": 113, "ctxt": 0 }, "body": { "type": "BlockStatement", "span": { - "start": 103, - "end": 116, + "start": 100, + "end": 113, "ctxt": 0 }, "stmts": [ { "type": "ReturnStatement", "span": { - "start": 105, - "end": 114, + "start": 102, + "end": 111, "ctxt": 0 }, "argument": { "type": "NumericLiteral", "span": { - "start": 112, - "end": 113, + "start": 109, + "end": 110, "ctxt": 0 }, "value": 0.0 @@ -132,15 +132,15 @@ { "type": "ClassMethod", "span": { - "start": 129, - "end": 148, + "start": 125, + "end": 144, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 142, - "end": 145, + "start": 138, + "end": 141, "ctxt": 0 }, "value": "pua", @@ -151,8 +151,8 @@ "params": [], "decorators": [], "span": { - "start": 129, - "end": 148, + "start": 125, + "end": 144, "ctxt": 0 }, "body": null, @@ -170,15 +170,15 @@ { "type": "ClassMethod", "span": { - "start": 161, - "end": 191, + "start": 156, + "end": 186, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 172, - "end": 175, + "start": 167, + "end": 170, "ctxt": 0 }, "value": "pus", @@ -189,30 +189,30 @@ "params": [], "decorators": [], "span": { - "start": 161, - "end": 191, + "start": 156, + "end": 186, "ctxt": 0 }, "body": { "type": "BlockStatement", "span": { - "start": 178, - "end": 191, + "start": 173, + "end": 186, "ctxt": 0 }, "stmts": [ { "type": "ReturnStatement", "span": { - "start": 180, - "end": 189, + "start": 175, + "end": 184, "ctxt": 0 }, "argument": { "type": "NumericLiteral", "span": { - "start": 187, - "end": 188, + "start": 182, + "end": 183, "ctxt": 0 }, "value": 0.0 @@ -234,15 +234,15 @@ { "type": "ClassMethod", "span": { - "start": 206, - "end": 228, + "start": 199, + "end": 221, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 210, - "end": 212, + "start": 203, + "end": 205, "ctxt": 0 }, "value": "pu", @@ -253,30 +253,30 @@ "params": [], "decorators": [], "span": { - "start": 206, - "end": 228, + "start": 199, + "end": 221, "ctxt": 0 }, "body": { "type": "BlockStatement", "span": { - "start": 215, - "end": 228, + "start": 208, + "end": 221, "ctxt": 0 }, "stmts": [ { "type": "ReturnStatement", "span": { - "start": 217, - "end": 226, + "start": 210, + "end": 219, "ctxt": 0 }, "argument": { "type": "NumericLiteral", "span": { - "start": 224, - "end": 225, + "start": 217, + "end": 218, "ctxt": 0 }, "value": 0.0 @@ -298,15 +298,15 @@ { "type": "ClassMethod", "span": { - "start": 244, - "end": 266, + "start": 236, + "end": 258, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 248, - "end": 250, + "start": 240, + "end": 242, "ctxt": 0 }, "value": "po", @@ -317,30 +317,30 @@ "params": [], "decorators": [], "span": { - "start": 244, - "end": 266, + "start": 236, + "end": 258, "ctxt": 0 }, "body": { "type": "BlockStatement", "span": { - "start": 253, - "end": 266, + "start": 245, + "end": 258, "ctxt": 0 }, "stmts": [ { "type": "ReturnStatement", "span": { - "start": 255, - "end": 264, + "start": 247, + "end": 256, "ctxt": 0 }, "argument": { "type": "NumericLiteral", "span": { - "start": 262, - "end": 263, + "start": 254, + "end": 255, "ctxt": 0 }, "value": 0.0 @@ -362,15 +362,15 @@ { "type": "ClassMethod", "span": { - "start": 280, - "end": 302, + "start": 271, + "end": 293, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 284, - "end": 286, + "start": 275, + "end": 277, "ctxt": 0 }, "value": "pi", @@ -381,30 +381,30 @@ "params": [], "decorators": [], "span": { - "start": 280, - "end": 302, + "start": 271, + "end": 293, "ctxt": 0 }, "body": { "type": "BlockStatement", "span": { - "start": 289, - "end": 302, + "start": 280, + "end": 293, "ctxt": 0 }, "stmts": [ { "type": "ReturnStatement", "span": { - "start": 291, - "end": 300, + "start": 282, + "end": 291, "ctxt": 0 }, "argument": { "type": "NumericLiteral", "span": { - "start": 298, - "end": 299, + "start": 289, + "end": 290, "ctxt": 0 }, "value": 0.0 diff --git a/ecmascript/parser/tests/typescript/class/modifiers-methods-async/input.ts.json b/ecmascript/parser/tests/typescript/class/modifiers-methods-async/input.ts.json index 8806e31c363..36f4a4d6aae 100644 --- a/ecmascript/parser/tests/typescript/class/modifiers-methods-async/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/modifiers-methods-async/input.ts.json @@ -1,8 +1,8 @@ { "type": "Module", "span": { - "start": 43, - "end": 266, + "start": 42, + "end": 256, "ctxt": 0 }, "body": [ @@ -11,8 +11,8 @@ "identifier": { "type": "Identifier", "span": { - "start": 58, - "end": 59, + "start": 57, + "end": 58, "ctxt": 0 }, "value": "C", @@ -21,8 +21,8 @@ }, "declare": false, "span": { - "start": 52, - "end": 266, + "start": 51, + "end": 256, "ctxt": 0 }, "decorators": [], @@ -30,15 +30,15 @@ { "type": "ClassMethod", "span": { - "start": 67, - "end": 86, + "start": 65, + "end": 84, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 82, - "end": 83, + "start": 80, + "end": 81, "ctxt": 0 }, "value": "a", @@ -49,8 +49,8 @@ "params": [], "decorators": [], "span": { - "start": 67, - "end": 86, + "start": 65, + "end": 84, "ctxt": 0 }, "body": null, @@ -68,15 +68,15 @@ { "type": "ClassMethod", "span": { - "start": 92, - "end": 111, + "start": 89, + "end": 108, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 105, - "end": 106, + "start": 102, + "end": 103, "ctxt": 0 }, "value": "s", @@ -87,15 +87,15 @@ "params": [], "decorators": [], "span": { - "start": 92, - "end": 111, + "start": 89, + "end": 108, "ctxt": 0 }, "body": { "type": "BlockStatement", "span": { - "start": 109, - "end": 111, + "start": 106, + "end": 108, "ctxt": 0 }, "stmts": [] @@ -114,15 +114,15 @@ { "type": "ClassMethod", "span": { - "start": 124, - "end": 145, + "start": 120, + "end": 141, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 139, - "end": 142, + "start": 135, + "end": 138, "ctxt": 0 }, "value": "pua", @@ -133,8 +133,8 @@ "params": [], "decorators": [], "span": { - "start": 124, - "end": 145, + "start": 120, + "end": 141, "ctxt": 0 }, "body": null, @@ -152,15 +152,15 @@ { "type": "ClassMethod", "span": { - "start": 158, - "end": 179, + "start": 153, + "end": 174, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 171, - "end": 174, + "start": 166, + "end": 169, "ctxt": 0 }, "value": "pus", @@ -171,15 +171,15 @@ "params": [], "decorators": [], "span": { - "start": 158, - "end": 179, + "start": 153, + "end": 174, "ctxt": 0 }, "body": { "type": "BlockStatement", "span": { - "start": 177, - "end": 179, + "start": 172, + "end": 174, "ctxt": 0 }, "stmts": [] @@ -198,15 +198,15 @@ { "type": "ClassMethod", "span": { - "start": 194, - "end": 207, + "start": 187, + "end": 200, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 200, - "end": 202, + "start": 193, + "end": 195, "ctxt": 0 }, "value": "pu", @@ -217,15 +217,15 @@ "params": [], "decorators": [], "span": { - "start": 194, - "end": 207, + "start": 187, + "end": 200, "ctxt": 0 }, "body": { "type": "BlockStatement", "span": { - "start": 205, - "end": 207, + "start": 198, + "end": 200, "ctxt": 0 }, "stmts": [] @@ -244,15 +244,15 @@ { "type": "ClassMethod", "span": { - "start": 223, - "end": 236, + "start": 215, + "end": 228, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 229, - "end": 231, + "start": 221, + "end": 223, "ctxt": 0 }, "value": "po", @@ -263,15 +263,15 @@ "params": [], "decorators": [], "span": { - "start": 223, - "end": 236, + "start": 215, + "end": 228, "ctxt": 0 }, "body": { "type": "BlockStatement", "span": { - "start": 234, - "end": 236, + "start": 226, + "end": 228, "ctxt": 0 }, "stmts": [] @@ -290,15 +290,15 @@ { "type": "ClassMethod", "span": { - "start": 250, - "end": 263, + "start": 241, + "end": 254, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 256, - "end": 258, + "start": 247, + "end": 249, "ctxt": 0 }, "value": "pi", @@ -309,15 +309,15 @@ "params": [], "decorators": [], "span": { - "start": 250, - "end": 263, + "start": 241, + "end": 254, "ctxt": 0 }, "body": { "type": "BlockStatement", "span": { - "start": 261, - "end": 263, + "start": 252, + "end": 254, "ctxt": 0 }, "stmts": [] diff --git a/ecmascript/parser/tests/typescript/class/modifiers-properties/input.ts.json b/ecmascript/parser/tests/typescript/class/modifiers-properties/input.ts.json index 66c52cf2dee..72c7d1f08a6 100644 --- a/ecmascript/parser/tests/typescript/class/modifiers-properties/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/modifiers-properties/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 416, + "end": 396, "ctxt": 0 }, "body": [ @@ -22,7 +22,7 @@ "declare": false, "span": { "start": 9, - "end": 416, + "end": 396, "ctxt": 0 }, "decorators": [], @@ -30,15 +30,15 @@ { "type": "ClassProperty", "span": { - "start": 24, - "end": 35, + "start": 23, + "end": 34, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 33, - "end": 34, + "start": 32, + "end": 33, "ctxt": 0 }, "value": "r", @@ -59,15 +59,15 @@ { "type": "ClassProperty", "span": { - "start": 41, - "end": 62, + "start": 39, + "end": 60, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 50, - "end": 52, + "start": 48, + "end": 50, "ctxt": 0 }, "value": "r2", @@ -78,15 +78,15 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 53, - "end": 61, + "start": 51, + "end": 59, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 55, - "end": 61, + "start": 53, + "end": 59, "ctxt": 0 }, "kind": "number" @@ -104,15 +104,15 @@ { "type": "ClassProperty", "span": { - "start": 68, - "end": 79, + "start": 65, + "end": 76, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 77, - "end": 78, + "start": 74, + "end": 75, "ctxt": 0 }, "value": "a", @@ -133,15 +133,15 @@ { "type": "ClassProperty", "span": { - "start": 85, - "end": 94, + "start": 81, + "end": 90, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 92, - "end": 93, + "start": 88, + "end": 89, "ctxt": 0 }, "value": "s", @@ -162,15 +162,15 @@ { "type": "ClassProperty", "span": { - "start": 109, - "end": 112, + "start": 103, + "end": 106, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 109, - "end": 111, + "start": 103, + "end": 105, "ctxt": 0 }, "value": "pu", @@ -191,15 +191,15 @@ { "type": "ClassProperty", "span": { - "start": 128, - "end": 131, + "start": 121, + "end": 124, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 128, - "end": 130, + "start": 121, + "end": 123, "ctxt": 0 }, "value": "po", @@ -220,15 +220,15 @@ { "type": "ClassProperty", "span": { - "start": 145, - "end": 148, + "start": 137, + "end": 140, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 145, - "end": 147, + "start": 137, + "end": 139, "ctxt": 0 }, "value": "pi", @@ -249,15 +249,15 @@ { "type": "ClassProperty", "span": { - "start": 156, - "end": 177, + "start": 146, + "end": 167, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 174, - "end": 176, + "start": 164, + "end": 166, "ctxt": 0 }, "value": "ra", @@ -278,15 +278,15 @@ { "type": "ClassProperty", "span": { - "start": 183, - "end": 204, + "start": 172, + "end": 193, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 201, - "end": 203, + "start": 190, + "end": 192, "ctxt": 0 }, "value": "ar", @@ -307,15 +307,15 @@ { "type": "ClassProperty", "span": { - "start": 210, - "end": 229, + "start": 198, + "end": 217, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 226, - "end": 228, + "start": 214, + "end": 216, "ctxt": 0 }, "value": "sr", @@ -336,15 +336,15 @@ { "type": "ClassProperty", "span": { - "start": 244, - "end": 257, + "start": 230, + "end": 243, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 253, - "end": 256, + "start": 239, + "end": 242, "ctxt": 0 }, "value": "pur", @@ -365,15 +365,15 @@ { "type": "ClassProperty", "span": { - "start": 270, - "end": 283, + "start": 255, + "end": 268, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 279, - "end": 282, + "start": 264, + "end": 267, "ctxt": 0 }, "value": "pua", @@ -394,15 +394,15 @@ { "type": "ClassProperty", "span": { - "start": 296, - "end": 307, + "start": 280, + "end": 291, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 303, - "end": 306, + "start": 287, + "end": 290, "ctxt": 0 }, "value": "pus", @@ -423,15 +423,15 @@ { "type": "ClassProperty", "span": { - "start": 320, - "end": 343, + "start": 303, + "end": 326, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 338, - "end": 342, + "start": 321, + "end": 325, "ctxt": 0 }, "value": "pura", @@ -452,15 +452,15 @@ { "type": "ClassProperty", "span": { - "start": 356, - "end": 379, + "start": 338, + "end": 361, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 374, - "end": 378, + "start": 356, + "end": 360, "ctxt": 0 }, "value": "puar", @@ -481,15 +481,15 @@ { "type": "ClassProperty", "span": { - "start": 392, - "end": 413, + "start": 373, + "end": 394, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 408, - "end": 412, + "start": 389, + "end": 393, "ctxt": 0 }, "value": "pusr", diff --git a/ecmascript/parser/tests/typescript/class/parameter-properties/input.ts.json b/ecmascript/parser/tests/typescript/class/parameter-properties/input.ts.json index cfdc40d2fac..624bf6d3c07 100644 --- a/ecmascript/parser/tests/typescript/class/parameter-properties/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/parameter-properties/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 267, + "end": 257, "ctxt": 0 }, "body": [ @@ -22,7 +22,7 @@ "declare": false, "span": { "start": 0, - "end": 267, + "end": 257, "ctxt": 0 }, "decorators": [], @@ -30,15 +30,15 @@ { "type": "Constructor", "span": { - "start": 15, - "end": 264, + "start": 14, + "end": 255, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 15, - "end": 26, + "start": 14, + "end": 25, "ctxt": 0 }, "value": "constructor", @@ -49,8 +49,8 @@ { "type": "TsParameterProperty", "span": { - "start": 37, - "end": 45, + "start": 35, + "end": 43, "ctxt": 0 }, "decorators": [], @@ -59,8 +59,8 @@ "param": { "type": "Identifier", "span": { - "start": 46, - "end": 47, + "start": 44, + "end": 45, "ctxt": 0 }, "value": "r", @@ -71,8 +71,8 @@ { "type": "TsParameterProperty", "span": { - "start": 58, - "end": 64, + "start": 55, + "end": 61, "ctxt": 0 }, "decorators": [], @@ -81,23 +81,23 @@ "param": { "type": "Identifier", "span": { - "start": 65, - "end": 75, + "start": 62, + "end": 72, "ctxt": 0 }, "value": "pu", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 67, - "end": 75, + "start": 64, + "end": 72, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 69, - "end": 75, + "start": 66, + "end": 72, "ctxt": 0 }, "kind": "number" @@ -109,8 +109,8 @@ { "type": "TsParameterProperty", "span": { - "start": 86, - "end": 95, + "start": 82, + "end": 91, "ctxt": 0 }, "decorators": [], @@ -119,8 +119,8 @@ "param": { "type": "Identifier", "span": { - "start": 96, - "end": 98, + "start": 92, + "end": 94, "ctxt": 0 }, "value": "po", @@ -131,8 +131,8 @@ { "type": "TsParameterProperty", "span": { - "start": 110, - "end": 117, + "start": 105, + "end": 112, "ctxt": 0 }, "decorators": [], @@ -141,23 +141,23 @@ "param": { "type": "Identifier", "span": { - "start": 118, - "end": 129, + "start": 113, + "end": 124, "ctxt": 0 }, "value": "pi", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 121, - "end": 129, + "start": 116, + "end": 124, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 123, - "end": 129, + "start": 118, + "end": 124, "ctxt": 0 }, "kind": "number" @@ -169,8 +169,8 @@ { "type": "TsParameterProperty", "span": { - "start": 140, - "end": 155, + "start": 134, + "end": 149, "ctxt": 0 }, "decorators": [], @@ -179,8 +179,8 @@ "param": { "type": "Identifier", "span": { - "start": 156, - "end": 159, + "start": 150, + "end": 153, "ctxt": 0 }, "value": "pur", @@ -191,8 +191,8 @@ { "type": "TsParameterProperty", "span": { - "start": 214, - "end": 222, + "start": 206, + "end": 214, "ctxt": 0 }, "decorators": [], @@ -201,15 +201,15 @@ "param": { "type": "AssignmentPattern", "span": { - "start": 223, - "end": 228, + "start": 215, + "end": 220, "ctxt": 0 }, "left": { "type": "Identifier", "span": { - "start": 223, - "end": 224, + "start": 215, + "end": 216, "ctxt": 0 }, "value": "x", @@ -219,8 +219,8 @@ "right": { "type": "NumericLiteral", "span": { - "start": 227, - "end": 228, + "start": 219, + "end": 220, "ctxt": 0 }, "value": 0.0 @@ -231,8 +231,8 @@ { "type": "TsParameterProperty", "span": { - "start": 239, - "end": 245, + "start": 230, + "end": 236, "ctxt": 0 }, "decorators": [], @@ -241,30 +241,30 @@ "param": { "type": "AssignmentPattern", "span": { - "start": 246, - "end": 260, + "start": 237, + "end": 251, "ctxt": 0 }, "left": { "type": "Identifier", "span": { - "start": 246, - "end": 256, + "start": 237, + "end": 247, "ctxt": 0 }, "value": "y", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 248, - "end": 256, + "start": 239, + "end": 247, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 250, - "end": 256, + "start": 241, + "end": 247, "ctxt": 0 }, "kind": "number" @@ -275,8 +275,8 @@ "right": { "type": "NumericLiteral", "span": { - "start": 259, - "end": 260, + "start": 250, + "end": 251, "ctxt": 0 }, "value": 0.0 @@ -288,8 +288,8 @@ "body": { "type": "BlockStatement", "span": { - "start": 262, - "end": 264, + "start": 253, + "end": 255, "ctxt": 0 }, "stmts": [] diff --git a/ecmascript/parser/tests/typescript/class/properties/input.ts.json b/ecmascript/parser/tests/typescript/class/properties/input.ts.json index b46c6efc3e5..94a1a70ac2c 100644 --- a/ecmascript/parser/tests/typescript/class/properties/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/properties/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 91, + "end": 84, "ctxt": 0 }, "body": [ @@ -22,7 +22,7 @@ "declare": false, "span": { "start": 0, - "end": 91, + "end": 84, "ctxt": 0 }, "decorators": [], @@ -30,15 +30,15 @@ { "type": "ClassProperty", "span": { - "start": 15, - "end": 17, + "start": 14, + "end": 16, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 15, - "end": 16, + "start": 14, + "end": 15, "ctxt": 0 }, "value": "x", @@ -59,15 +59,15 @@ { "type": "ClassProperty", "span": { - "start": 23, - "end": 26, + "start": 21, + "end": 24, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 23, - "end": 24, + "start": 21, + "end": 22, "ctxt": 0 }, "value": "x", @@ -88,15 +88,15 @@ { "type": "ClassProperty", "span": { - "start": 32, - "end": 42, + "start": 29, + "end": 39, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 32, - "end": 33, + "start": 29, + "end": 30, "ctxt": 0 }, "value": "x", @@ -107,15 +107,15 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 33, - "end": 41, + "start": 30, + "end": 38, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 35, - "end": 41, + "start": 32, + "end": 38, "ctxt": 0 }, "kind": "number" @@ -133,15 +133,15 @@ { "type": "ClassProperty", "span": { - "start": 48, - "end": 62, + "start": 44, + "end": 58, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 48, - "end": 49, + "start": 44, + "end": 45, "ctxt": 0 }, "value": "x", @@ -151,8 +151,8 @@ "value": { "type": "NumericLiteral", "span": { - "start": 60, - "end": 61, + "start": 56, + "end": 57, "ctxt": 0 }, "value": 1.0 @@ -160,15 +160,15 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 49, - "end": 57, + "start": 45, + "end": 53, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 51, - "end": 57, + "start": 47, + "end": 53, "ctxt": 0 }, "kind": "number" @@ -186,15 +186,15 @@ { "type": "ClassProperty", "span": { - "start": 68, - "end": 71, + "start": 63, + "end": 66, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 68, - "end": 69, + "start": 63, + "end": 64, "ctxt": 0 }, "value": "x", @@ -215,15 +215,15 @@ { "type": "ClassProperty", "span": { - "start": 77, - "end": 88, + "start": 71, + "end": 82, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 77, - "end": 78, + "start": 71, + "end": 72, "ctxt": 0 }, "value": "x", @@ -234,15 +234,15 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 79, - "end": 87, + "start": 73, + "end": 81, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 81, - "end": 87, + "start": 75, + "end": 81, "ctxt": 0 }, "kind": "number" diff --git a/ecmascript/parser/tests/typescript/class/property-computed/input.ts.json b/ecmascript/parser/tests/typescript/class/property-computed/input.ts.json index 7b6a9d92c2e..fec0242b37e 100644 --- a/ecmascript/parser/tests/typescript/class/property-computed/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/property-computed/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 77, + "end": 74, "ctxt": 0 }, "body": [ @@ -22,7 +22,7 @@ "declare": false, "span": { "start": 0, - "end": 77, + "end": 74, "ctxt": 0 }, "decorators": [], @@ -30,22 +30,22 @@ { "type": "ClassProperty", "span": { - "start": 15, - "end": 41, + "start": 14, + "end": 40, "ctxt": 0 }, "key": { "type": "MemberExpression", "span": { - "start": 16, - "end": 31, + "start": 15, + "end": 30, "ctxt": 0 }, "object": { "type": "Identifier", "span": { - "start": 16, - "end": 22, + "start": 15, + "end": 21, "ctxt": 0 }, "value": "Symbol", @@ -55,8 +55,8 @@ "property": { "type": "Identifier", "span": { - "start": 23, - "end": 31, + "start": 22, + "end": 30, "ctxt": 0 }, "value": "iterator", @@ -69,15 +69,15 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 32, - "end": 40, + "start": 31, + "end": 39, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 34, - "end": 40, + "start": 33, + "end": 39, "ctxt": 0 }, "kind": "number" @@ -95,22 +95,22 @@ { "type": "ClassProperty", "span": { - "start": 47, - "end": 74, + "start": 45, + "end": 72, "ctxt": 0 }, "key": { "type": "MemberExpression", "span": { - "start": 48, - "end": 63, + "start": 46, + "end": 61, "ctxt": 0 }, "object": { "type": "Identifier", "span": { - "start": 48, - "end": 54, + "start": 46, + "end": 52, "ctxt": 0 }, "value": "Symbol", @@ -120,8 +120,8 @@ "property": { "type": "Identifier", "span": { - "start": 55, - "end": 63, + "start": 53, + "end": 61, "ctxt": 0 }, "value": "iterator", @@ -134,15 +134,15 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 65, - "end": 73, + "start": 63, + "end": 71, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 67, - "end": 73, + "start": 65, + "end": 71, "ctxt": 0 }, "kind": "number" diff --git a/ecmascript/parser/tests/typescript/class/static/input.ts.json b/ecmascript/parser/tests/typescript/class/static/input.ts.json index c46d70cd633..288b8a2309a 100644 --- a/ecmascript/parser/tests/typescript/class/static/input.ts.json +++ b/ecmascript/parser/tests/typescript/class/static/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 105, + "end": 100, "ctxt": 0 }, "body": [ @@ -22,7 +22,7 @@ "declare": false, "span": { "start": 0, - "end": 105, + "end": 100, "ctxt": 0 }, "decorators": [], @@ -30,15 +30,15 @@ { "type": "ClassMethod", "span": { - "start": 15, - "end": 26, + "start": 14, + "end": 25, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 22, - "end": 23, + "start": 21, + "end": 22, "ctxt": 0 }, "value": "f", @@ -49,8 +49,8 @@ "params": [], "decorators": [], "span": { - "start": 15, - "end": 26, + "start": 14, + "end": 25, "ctxt": 0 }, "body": null, @@ -68,15 +68,15 @@ { "type": "ClassMethod", "span": { - "start": 39, - "end": 50, + "start": 37, + "end": 48, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 46, - "end": 47, + "start": 44, + "end": 45, "ctxt": 0 }, "value": "f", @@ -87,8 +87,8 @@ "params": [], "decorators": [], "span": { - "start": 39, - "end": 50, + "start": 37, + "end": 48, "ctxt": 0 }, "body": null, @@ -106,15 +106,15 @@ { "type": "ClassMethod", "span": { - "start": 66, - "end": 77, + "start": 63, + "end": 74, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 73, - "end": 74, + "start": 70, + "end": 71, "ctxt": 0 }, "value": "f", @@ -125,8 +125,8 @@ "params": [], "decorators": [], "span": { - "start": 66, - "end": 77, + "start": 63, + "end": 74, "ctxt": 0 }, "body": null, @@ -144,15 +144,15 @@ { "type": "ClassMethod", "span": { - "start": 91, - "end": 102, + "start": 87, + "end": 98, "ctxt": 0 }, "key": { "type": "Identifier", "span": { - "start": 98, - "end": 99, + "start": 94, + "end": 95, "ctxt": 0 }, "value": "f", @@ -163,8 +163,8 @@ "params": [], "decorators": [], "span": { - "start": 91, - "end": 102, + "start": 87, + "end": 98, "ctxt": 0 }, "body": null, diff --git a/ecmascript/parser/tests/typescript/custom/const-enum/input.ts.json b/ecmascript/parser/tests/typescript/custom/const-enum/input.ts.json index 6caae85d26b..8bef146ccc4 100644 --- a/ecmascript/parser/tests/typescript/custom/const-enum/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/const-enum/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 42, + "end": 38, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "TsEnumDeclaration", "span": { "start": 0, - "end": 42, + "end": 38, "ctxt": 0 }, "declare": false, @@ -30,15 +30,15 @@ { "type": "TsEnumMember", "span": { - "start": 22, - "end": 23, + "start": 21, + "end": 22, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 22, - "end": 23, + "start": 21, + "end": 22, "ctxt": 0 }, "value": "A", @@ -50,15 +50,15 @@ { "type": "TsEnumMember", "span": { - "start": 30, - "end": 31, + "start": 28, + "end": 29, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 30, - "end": 31, + "start": 28, + "end": 29, "ctxt": 0 }, "value": "B", @@ -70,15 +70,15 @@ { "type": "TsEnumMember", "span": { - "start": 38, - "end": 39, + "start": 35, + "end": 36, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 38, - "end": 39, + "start": 35, + "end": 36, "ctxt": 0 }, "value": "C", diff --git a/ecmascript/parser/tests/typescript/custom/default-followed-by-type/arrow/input.ts.json b/ecmascript/parser/tests/typescript/custom/default-followed-by-type/arrow/input.ts.json index 383825d282a..d81d92f0ec4 100644 --- a/ecmascript/parser/tests/typescript/custom/default-followed-by-type/arrow/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/default-followed-by-type/arrow/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 99, + "end": 97, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "VariableDeclaration", "span": { "start": 0, - "end": 99, + "end": 97, "ctxt": 0 }, "kind": "var", @@ -20,7 +20,7 @@ "type": "VariableDeclarator", "span": { "start": 4, - "end": 98, + "end": 96, "ctxt": 0 }, "id": { @@ -38,7 +38,7 @@ "type": "ArrowFunctionExpression", "span": { "start": 8, - "end": 98, + "end": 96, "ctxt": 0 }, "params": [ @@ -120,30 +120,30 @@ "type": "BlockStatement", "span": { "start": 56, - "end": 98, + "end": 96, "ctxt": 0 }, "stmts": [ { "type": "ReturnStatement", "span": { - "start": 63, - "end": 95, + "start": 62, + "end": 94, "ctxt": 0 }, "argument": { "type": "TemplateLiteral", "span": { - "start": 70, - "end": 94, + "start": 69, + "end": 93, "ctxt": 0 }, "expressions": [ { "type": "Identifier", "span": { - "start": 73, - "end": 81, + "start": 72, + "end": 80, "ctxt": 0 }, "value": "greeting", @@ -153,8 +153,8 @@ { "type": "Identifier", "span": { - "start": 85, - "end": 91, + "start": 84, + "end": 90, "ctxt": 0 }, "value": "target", @@ -166,16 +166,16 @@ { "type": "TemplateElement", "span": { - "start": 71, - "end": 71, + "start": 70, + "end": 70, "ctxt": 0 }, "tail": false, "cooked": { "type": "StringLiteral", "span": { - "start": 71, - "end": 71, + "start": 70, + "end": 70, "ctxt": 0 }, "value": "", @@ -184,8 +184,8 @@ "raw": { "type": "StringLiteral", "span": { - "start": 71, - "end": 71, + "start": 70, + "end": 70, "ctxt": 0 }, "value": "", @@ -195,16 +195,16 @@ { "type": "TemplateElement", "span": { - "start": 82, - "end": 83, + "start": 81, + "end": 82, "ctxt": 0 }, "tail": false, "cooked": { "type": "StringLiteral", "span": { - "start": 82, - "end": 83, + "start": 81, + "end": 82, "ctxt": 0 }, "value": " ", @@ -213,8 +213,8 @@ "raw": { "type": "StringLiteral", "span": { - "start": 82, - "end": 83, + "start": 81, + "end": 82, "ctxt": 0 }, "value": " ", @@ -224,16 +224,16 @@ { "type": "TemplateElement", "span": { - "start": 92, - "end": 93, + "start": 91, + "end": 92, "ctxt": 0 }, "tail": true, "cooked": { "type": "StringLiteral", "span": { - "start": 92, - "end": 93, + "start": 91, + "end": 92, "ctxt": 0 }, "value": "!", @@ -242,8 +242,8 @@ "raw": { "type": "StringLiteral", "span": { - "start": 92, - "end": 93, + "start": 91, + "end": 92, "ctxt": 0 }, "value": "!", diff --git a/ecmascript/parser/tests/typescript/custom/default-followed-by-type/function/input.ts.json b/ecmascript/parser/tests/typescript/custom/default-followed-by-type/function/input.ts.json index be099e55bdc..13ff4e8f978 100644 --- a/ecmascript/parser/tests/typescript/custom/default-followed-by-type/function/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/default-followed-by-type/function/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 101, + "end": 99, "ctxt": 0 }, "body": [ @@ -98,37 +98,37 @@ "decorators": [], "span": { "start": 0, - "end": 100, + "end": 98, "ctxt": 0 }, "body": { "type": "BlockStatement", "span": { "start": 58, - "end": 100, + "end": 98, "ctxt": 0 }, "stmts": [ { "type": "ReturnStatement", "span": { - "start": 65, - "end": 97, + "start": 64, + "end": 96, "ctxt": 0 }, "argument": { "type": "TemplateLiteral", "span": { - "start": 72, - "end": 96, + "start": 71, + "end": 95, "ctxt": 0 }, "expressions": [ { "type": "Identifier", "span": { - "start": 75, - "end": 83, + "start": 74, + "end": 82, "ctxt": 0 }, "value": "greeting", @@ -138,8 +138,8 @@ { "type": "Identifier", "span": { - "start": 87, - "end": 93, + "start": 86, + "end": 92, "ctxt": 0 }, "value": "target", @@ -151,16 +151,16 @@ { "type": "TemplateElement", "span": { - "start": 73, - "end": 73, + "start": 72, + "end": 72, "ctxt": 0 }, "tail": false, "cooked": { "type": "StringLiteral", "span": { - "start": 73, - "end": 73, + "start": 72, + "end": 72, "ctxt": 0 }, "value": "", @@ -169,8 +169,8 @@ "raw": { "type": "StringLiteral", "span": { - "start": 73, - "end": 73, + "start": 72, + "end": 72, "ctxt": 0 }, "value": "", @@ -180,16 +180,16 @@ { "type": "TemplateElement", "span": { - "start": 84, - "end": 85, + "start": 83, + "end": 84, "ctxt": 0 }, "tail": false, "cooked": { "type": "StringLiteral", "span": { - "start": 84, - "end": 85, + "start": 83, + "end": 84, "ctxt": 0 }, "value": " ", @@ -198,8 +198,8 @@ "raw": { "type": "StringLiteral", "span": { - "start": 84, - "end": 85, + "start": 83, + "end": 84, "ctxt": 0 }, "value": " ", @@ -209,16 +209,16 @@ { "type": "TemplateElement", "span": { - "start": 94, - "end": 95, + "start": 93, + "end": 94, "ctxt": 0 }, "tail": true, "cooked": { "type": "StringLiteral", "span": { - "start": 94, - "end": 95, + "start": 93, + "end": 94, "ctxt": 0 }, "value": "!", @@ -227,8 +227,8 @@ "raw": { "type": "StringLiteral", "span": { - "start": 94, - "end": 95, + "start": 93, + "end": 94, "ctxt": 0 }, "value": "!", @@ -248,8 +248,8 @@ { "type": "EmptyStatement", "span": { - "start": 100, - "end": 101, + "start": 98, + "end": 99, "ctxt": 0 } } diff --git a/ecmascript/parser/tests/typescript/custom/issue-196-02/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-196-02/input.ts.json index b7dbda0f6da..be2d83940cb 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-196-02/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-196-02/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 60, + "end": 59, "ctxt": 0 }, "body": [ @@ -124,23 +124,23 @@ { "type": "ExportNamedDeclaration", "span": { - "start": 44, - "end": 60, + "start": 43, + "end": 59, "ctxt": 0 }, "specifiers": [ { "type": "ExportSpecifier", "span": { - "start": 53, - "end": 57, + "start": 52, + "end": 56, "ctxt": 0 }, "orig": { "type": "Identifier", "span": { - "start": 53, - "end": 57, + "start": 52, + "end": 56, "ctxt": 0 }, "value": "Link", diff --git a/ecmascript/parser/tests/typescript/custom/issue-236/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-236/input.ts.json index ff0c7179ad0..c60b5d2e407 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-236/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-236/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 174, + "end": 171, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "ExportDeclaration", "span": { "start": 0, - "end": 174, + "end": 171, "ctxt": 0 }, "declaration": { @@ -163,52 +163,52 @@ "decorators": [], "span": { "start": 7, - "end": 174, + "end": 171, "ctxt": 0 }, "body": { "type": "BlockStatement", "span": { "start": 116, - "end": 174, + "end": 171, "ctxt": 0 }, "stmts": [ { "type": "ExpressionStatement", "span": { - "start": 123, - "end": 144, + "start": 122, + "end": 143, "ctxt": 0 }, "expression": { "type": "AssignmentExpression", "span": { - "start": 123, - "end": 143, + "start": 122, + "end": 142, "ctxt": 0 }, "operator": "=", "left": { "type": "MemberExpression", "span": { - "start": 123, - "end": 134, + "start": 122, + "end": 133, "ctxt": 0 }, "object": { "type": "ThisExpression", "span": { - "start": 123, - "end": 127, + "start": 122, + "end": 126, "ctxt": 0 } }, "property": { "type": "Identifier", "span": { - "start": 128, - "end": 134, + "start": 127, + "end": 133, "ctxt": 0 }, "value": "$scope", @@ -220,8 +220,8 @@ "right": { "type": "Identifier", "span": { - "start": 137, - "end": 143, + "start": 136, + "end": 142, "ctxt": 0 }, "value": "$scope", @@ -233,38 +233,38 @@ { "type": "ExpressionStatement", "span": { - "start": 150, - "end": 171, + "start": 148, + "end": 169, "ctxt": 0 }, "expression": { "type": "AssignmentExpression", "span": { - "start": 150, - "end": 170, + "start": 148, + "end": 168, "ctxt": 0 }, "operator": "=", "left": { "type": "MemberExpression", "span": { - "start": 150, - "end": 161, + "start": 148, + "end": 159, "ctxt": 0 }, "object": { "type": "ThisExpression", "span": { - "start": 150, - "end": 154, + "start": 148, + "end": 152, "ctxt": 0 } }, "property": { "type": "Identifier", "span": { - "start": 155, - "end": 161, + "start": 153, + "end": 159, "ctxt": 0 }, "value": "$attrs", @@ -276,8 +276,8 @@ "right": { "type": "Identifier", "span": { - "start": 164, - "end": 170, + "start": 162, + "end": 168, "ctxt": 0 }, "value": "$attrs", diff --git a/ecmascript/parser/tests/typescript/custom/issue-370/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-370/input.ts.json index f8fed0c1329..c7fb4f4389f 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-370/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-370/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 43, + "end": 39, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "VariableDeclaration", "span": { "start": 0, - "end": 43, + "end": 39, "ctxt": 0 }, "kind": "const", @@ -20,7 +20,7 @@ "type": "VariableDeclarator", "span": { "start": 6, - "end": 42, + "end": 38, "ctxt": 0 }, "id": { @@ -65,15 +65,15 @@ "type": "ArrowFunctionExpression", "span": { "start": 13, - "end": 42, + "end": 38, "ctxt": 0 }, "params": [ { "type": "Identifier", "span": { - "start": 20, - "end": 21, + "start": 19, + "end": 20, "ctxt": 0 }, "value": "a", @@ -83,8 +83,8 @@ { "type": "Identifier", "span": { - "start": 28, - "end": 29, + "start": 26, + "end": 27, "ctxt": 0 }, "value": "b", @@ -95,8 +95,8 @@ "body": { "type": "BlockStatement", "span": { - "start": 38, - "end": 42, + "start": 35, + "end": 38, "ctxt": 0 }, "stmts": [] diff --git a/ecmascript/parser/tests/typescript/custom/issue-374/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-374/input.ts.json index 45cb7c989f5..ebf0d24f443 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-374/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-374/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 93, + "end": 92, "ctxt": 0 }, "body": [ @@ -67,8 +67,8 @@ { "type": "VariableDeclaration", "span": { - "start": 42, - "end": 93, + "start": 41, + "end": 92, "ctxt": 0 }, "kind": "let", @@ -77,30 +77,30 @@ { "type": "VariableDeclarator", "span": { - "start": 46, - "end": 92, + "start": 45, + "end": 91, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 46, - "end": 55, + "start": 45, + "end": 54, "ctxt": 0 }, "value": "strLength", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 55, - "end": 63, + "start": 54, + "end": 62, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 57, - "end": 63, + "start": 56, + "end": 62, "ctxt": 0 }, "kind": "number" @@ -111,29 +111,29 @@ "init": { "type": "MemberExpression", "span": { - "start": 66, - "end": 92, + "start": 65, + "end": 91, "ctxt": 0 }, "object": { "type": "ParenthesisExpression", "span": { - "start": 66, - "end": 85, + "start": 65, + "end": 84, "ctxt": 0 }, "expression": { "type": "TsTypeAssertion", "span": { - "start": 67, - "end": 84, + "start": 66, + "end": 83, "ctxt": 0 }, "expression": { "type": "Identifier", "span": { - "start": 75, - "end": 84, + "start": 74, + "end": 83, "ctxt": 0 }, "value": "someValue", @@ -143,8 +143,8 @@ "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 68, - "end": 74, + "start": 67, + "end": 73, "ctxt": 0 }, "kind": "string" @@ -154,8 +154,8 @@ "property": { "type": "Identifier", "span": { - "start": 86, - "end": 92, + "start": 85, + "end": 91, "ctxt": 0 }, "value": "length", diff --git a/ecmascript/parser/tests/typescript/custom/issue-461/input.ts.json b/ecmascript/parser/tests/typescript/custom/issue-461/input.ts.json index 963a647637e..66346bc49a3 100644 --- a/ecmascript/parser/tests/typescript/custom/issue-461/input.ts.json +++ b/ecmascript/parser/tests/typescript/custom/issue-461/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 40, + "end": 38, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "ForInStatement", "span": { "start": 0, - "end": 40, + "end": 38, "ctxt": 0 }, "left": { @@ -73,44 +73,44 @@ "type": "BlockStatement", "span": { "start": 20, - "end": 40, + "end": 38, "ctxt": 0 }, "stmts": [ { "type": "ExpressionStatement", "span": { - "start": 25, - "end": 37, + "start": 24, + "end": 36, "ctxt": 0 }, "expression": { "type": "CallExpression", "span": { - "start": 25, - "end": 36, + "start": 24, + "end": 35, "ctxt": 0 }, "callee": { "type": "ParenthesisExpression", "span": { - "start": 25, - "end": 33, + "start": 24, + "end": 32, "ctxt": 0 }, "expression": { "type": "ArrowFunctionExpression", "span": { - "start": 26, - "end": 33, + "start": 25, + "end": 32, "ctxt": 0 }, "params": [ { "type": "Identifier", "span": { - "start": 26, - "end": 27, + "start": 25, + "end": 26, "ctxt": 0 }, "value": "x", @@ -121,8 +121,8 @@ "body": { "type": "NumericLiteral", "span": { - "start": 31, - "end": 32, + "start": 30, + "end": 31, "ctxt": 0 }, "value": 0.0 @@ -139,8 +139,8 @@ "expression": { "type": "Identifier", "span": { - "start": 34, - "end": 35, + "start": 33, + "end": 34, "ctxt": 0 }, "value": "x", diff --git a/ecmascript/parser/tests/typescript/custom/tsx-unary-paren/input.tsx.json b/ecmascript/parser/tests/typescript/custom/tsx-unary-paren/input.tsx.json index 45cbc9c668f..06ee3bd0339 100644 --- a/ecmascript/parser/tests/typescript/custom/tsx-unary-paren/input.tsx.json +++ b/ecmascript/parser/tests/typescript/custom/tsx-unary-paren/input.tsx.json @@ -1,30 +1,30 @@ { "type": "Module", "span": { - "start": 2, - "end": 194, + "start": 1, + "end": 183, "ctxt": 0 }, "body": [ { "type": "ExpressionStatement", "span": { - "start": 2, - "end": 194, + "start": 1, + "end": 183, "ctxt": 0 }, "expression": { "type": "ParenthesisExpression", "span": { - "start": 2, - "end": 193, + "start": 1, + "end": 182, "ctxt": 0 }, "expression": { "type": "JSXElement", "span": { - "start": 9, - "end": 190, + "start": 7, + "end": 180, "ctxt": 0 }, "opening": { @@ -32,8 +32,8 @@ "name": { "type": "Identifier", "span": { - "start": 10, - "end": 13, + "start": 8, + "end": 11, "ctxt": 0 }, "value": "div", @@ -41,8 +41,8 @@ "optional": false }, "span": { - "start": 10, - "end": 14, + "start": 8, + "end": 12, "ctxt": 0 }, "attributes": [], @@ -53,27 +53,27 @@ { "type": "JSXText", "span": { - "start": 14, - "end": 24, + "start": 12, + "end": 21, "ctxt": 0 }, - "value": "\n\r\n ", - "raw": "\n\r\n " + "value": "\n\n ", + "raw": "\n\n " }, { "type": "JSXExpressionContainer", "expression": { "type": "ConditionalExpression", "span": { - "start": 39, - "end": 165, + "start": 35, + "end": 158, "ctxt": 0 }, "test": { "type": "Identifier", "span": { - "start": 39, - "end": 48, + "start": 35, + "end": 44, "ctxt": 0 }, "value": "isLoading", @@ -83,15 +83,15 @@ "consequent": { "type": "ParenthesisExpression", "span": { - "start": 68, - "end": 87, + "start": 63, + "end": 82, "ctxt": 0 }, "expression": { "type": "JSXElement", "span": { - "start": 69, - "end": 86, + "start": 64, + "end": 81, "ctxt": 0 }, "opening": { @@ -99,8 +99,8 @@ "name": { "type": "Identifier", "span": { - "start": 70, - "end": 72, + "start": 65, + "end": 67, "ctxt": 0 }, "value": "h2", @@ -108,8 +108,8 @@ "optional": false }, "span": { - "start": 70, - "end": 73, + "start": 65, + "end": 68, "ctxt": 0 }, "attributes": [], @@ -120,8 +120,8 @@ { "type": "JSXText", "span": { - "start": 73, - "end": 81, + "start": 68, + "end": 76, "ctxt": 0 }, "value": "loading ", @@ -131,15 +131,15 @@ "closing": { "type": "JSXClosingElement", "span": { - "start": 83, - "end": 86, + "start": 78, + "end": 81, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 83, - "end": 85, + "start": 78, + "end": 80, "ctxt": 0 }, "value": "h2", @@ -152,15 +152,15 @@ "alternate": { "type": "ParenthesisExpression", "span": { - "start": 124, - "end": 165, + "start": 117, + "end": 158, "ctxt": 0 }, "expression": { "type": "JSXElement", "span": { - "start": 125, - "end": 164, + "start": 118, + "end": 157, "ctxt": 0 }, "opening": { @@ -168,8 +168,8 @@ "name": { "type": "Identifier", "span": { - "start": 126, - "end": 128, + "start": 119, + "end": 121, "ctxt": 0 }, "value": "h3", @@ -177,8 +177,8 @@ "optional": false }, "span": { - "start": 126, - "end": 129, + "start": 119, + "end": 122, "ctxt": 0 }, "attributes": [], @@ -189,8 +189,8 @@ { "type": "JSXText", "span": { - "start": 129, - "end": 159, + "start": 122, + "end": 152, "ctxt": 0 }, "value": "naaaaaaaaaaaaffffffffffffffff ", @@ -200,15 +200,15 @@ "closing": { "type": "JSXClosingElement", "span": { - "start": 161, - "end": 164, + "start": 154, + "end": 157, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 161, - "end": 163, + "start": 154, + "end": 156, "ctxt": 0 }, "value": "h3", @@ -223,26 +223,26 @@ { "type": "JSXText", "span": { - "start": 178, - "end": 184, + "start": 169, + "end": 174, "ctxt": 0 }, - "value": "\n\r\n ", - "raw": "\n\r\n " + "value": "\n\n ", + "raw": "\n\n " } ], "closing": { "type": "JSXClosingElement", "span": { - "start": 186, - "end": 190, + "start": 176, + "end": 180, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 186, - "end": 189, + "start": 176, + "end": 179, "ctxt": 0 }, "value": "div", diff --git a/ecmascript/parser/tests/typescript/custom/tsx-unary/input.tsx.json b/ecmascript/parser/tests/typescript/custom/tsx-unary/input.tsx.json index d6ad9cbcf8b..901e51a812d 100644 --- a/ecmascript/parser/tests/typescript/custom/tsx-unary/input.tsx.json +++ b/ecmascript/parser/tests/typescript/custom/tsx-unary/input.tsx.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 266, + "end": 252, "ctxt": 0 }, "body": [ @@ -50,8 +50,8 @@ "identifier": { "type": "Identifier", "span": { - "start": 39, - "end": 42, + "start": 37, + "end": 40, "ctxt": 0 }, "value": "App", @@ -62,23 +62,23 @@ "params": [], "decorators": [], "span": { - "start": 30, - "end": 243, + "start": 28, + "end": 231, "ctxt": 0 }, "body": { "type": "BlockStatement", "span": { - "start": 45, - "end": 243, + "start": 43, + "end": 231, "ctxt": 0 }, "stmts": [ { "type": "VariableDeclaration", "span": { - "start": 50, - "end": 73, + "start": 47, + "end": 70, "ctxt": 0 }, "kind": "const", @@ -87,15 +87,15 @@ { "type": "VariableDeclarator", "span": { - "start": 56, - "end": 72, + "start": 53, + "end": 69, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 56, - "end": 65, + "start": 53, + "end": 62, "ctxt": 0 }, "value": "isLoading", @@ -105,8 +105,8 @@ "init": { "type": "BooleanLiteral", "span": { - "start": 68, - "end": 72, + "start": 65, + "end": 69, "ctxt": 0 }, "value": true @@ -118,22 +118,22 @@ { "type": "ReturnStatement", "span": { - "start": 77, - "end": 240, + "start": 73, + "end": 229, "ctxt": 0 }, "argument": { "type": "ParenthesisExpression", "span": { - "start": 84, - "end": 239, + "start": 80, + "end": 228, "ctxt": 0 }, "expression": { "type": "JSXElement", "span": { - "start": 91, - "end": 234, + "start": 86, + "end": 224, "ctxt": 0 }, "opening": { @@ -141,8 +141,8 @@ "name": { "type": "Identifier", "span": { - "start": 92, - "end": 95, + "start": 87, + "end": 90, "ctxt": 0 }, "value": "div", @@ -150,8 +150,8 @@ "optional": false }, "span": { - "start": 92, - "end": 96, + "start": 87, + "end": 91, "ctxt": 0 }, "attributes": [], @@ -162,18 +162,18 @@ { "type": "JSXText", "span": { - "start": 96, - "end": 104, + "start": 91, + "end": 98, "ctxt": 0 }, - "value": "\n\r\n ", - "raw": "\n\r\n " + "value": "\n\n ", + "raw": "\n\n " }, { "type": "JSXElement", "span": { - "start": 104, - "end": 119, + "start": 98, + "end": 113, "ctxt": 0 }, "opening": { @@ -181,8 +181,8 @@ "name": { "type": "Identifier", "span": { - "start": 105, - "end": 107, + "start": 99, + "end": 101, "ctxt": 0 }, "value": "h1", @@ -190,8 +190,8 @@ "optional": false }, "span": { - "start": 105, - "end": 108, + "start": 99, + "end": 102, "ctxt": 0 }, "attributes": [], @@ -202,8 +202,8 @@ { "type": "JSXText", "span": { - "start": 108, - "end": 114, + "start": 102, + "end": 108, "ctxt": 0 }, "value": "works ", @@ -213,15 +213,15 @@ "closing": { "type": "JSXClosingElement", "span": { - "start": 116, - "end": 119, + "start": 110, + "end": 113, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 116, - "end": 118, + "start": 110, + "end": 112, "ctxt": 0 }, "value": "h1", @@ -233,27 +233,27 @@ { "type": "JSXText", "span": { - "start": 119, - "end": 127, + "start": 113, + "end": 120, "ctxt": 0 }, - "value": "\n\r\n ", - "raw": "\n\r\n " + "value": "\n\n ", + "raw": "\n\n " }, { "type": "JSXExpressionContainer", "expression": { "type": "ConditionalExpression", "span": { - "start": 138, - "end": 213, + "start": 130, + "end": 205, "ctxt": 0 }, "test": { "type": "Identifier", "span": { - "start": 138, - "end": 147, + "start": 130, + "end": 139, "ctxt": 0 }, "value": "isLoading", @@ -263,8 +263,8 @@ "consequent": { "type": "JSXElement", "span": { - "start": 150, - "end": 169, + "start": 142, + "end": 161, "ctxt": 0 }, "opening": { @@ -272,8 +272,8 @@ "name": { "type": "Identifier", "span": { - "start": 151, - "end": 154, + "start": 143, + "end": 146, "ctxt": 0 }, "value": "div", @@ -281,8 +281,8 @@ "optional": false }, "span": { - "start": 151, - "end": 155, + "start": 143, + "end": 147, "ctxt": 0 }, "attributes": [], @@ -293,8 +293,8 @@ { "type": "JSXText", "span": { - "start": 155, - "end": 163, + "start": 147, + "end": 155, "ctxt": 0 }, "value": "loading ", @@ -304,15 +304,15 @@ "closing": { "type": "JSXClosingElement", "span": { - "start": 165, - "end": 169, + "start": 157, + "end": 161, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 165, - "end": 168, + "start": 157, + "end": 160, "ctxt": 0 }, "value": "div", @@ -324,8 +324,8 @@ "alternate": { "type": "JSXElement", "span": { - "start": 172, - "end": 213, + "start": 164, + "end": 205, "ctxt": 0 }, "opening": { @@ -333,8 +333,8 @@ "name": { "type": "Identifier", "span": { - "start": 173, - "end": 176, + "start": 165, + "end": 168, "ctxt": 0 }, "value": "div", @@ -342,8 +342,8 @@ "optional": false }, "span": { - "start": 173, - "end": 177, + "start": 165, + "end": 169, "ctxt": 0 }, "attributes": [], @@ -354,8 +354,8 @@ { "type": "JSXText", "span": { - "start": 177, - "end": 207, + "start": 169, + "end": 199, "ctxt": 0 }, "value": "naaaaaaaaaaaaffffffffffffffff ", @@ -365,15 +365,15 @@ "closing": { "type": "JSXClosingElement", "span": { - "start": 209, - "end": 213, + "start": 201, + "end": 205, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 209, - "end": 212, + "start": 201, + "end": 204, "ctxt": 0 }, "value": "div", @@ -387,26 +387,26 @@ { "type": "JSXText", "span": { - "start": 222, - "end": 228, + "start": 213, + "end": 218, "ctxt": 0 }, - "value": "\n\r\n ", - "raw": "\n\r\n " + "value": "\n\n ", + "raw": "\n\n " } ], "closing": { "type": "JSXClosingElement", "span": { - "start": 230, - "end": 234, + "start": 220, + "end": 224, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 230, - "end": 233, + "start": 220, + "end": 223, "ctxt": 0 }, "value": "div", @@ -427,15 +427,15 @@ { "type": "ExportDefaultExpression", "span": { - "start": 247, - "end": 266, + "start": 233, + "end": 252, "ctxt": 0 }, "expression": { "type": "Identifier", "span": { - "start": 262, - "end": 265, + "start": 248, + "end": 251, "ctxt": 0 }, "value": "App", diff --git a/ecmascript/parser/tests/typescript/declare/var/input.ts.json b/ecmascript/parser/tests/typescript/declare/var/input.ts.json index 80a3fea6481..63fd399e3da 100644 --- a/ecmascript/parser/tests/typescript/declare/var/input.ts.json +++ b/ecmascript/parser/tests/typescript/declare/var/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 35, + "end": 34, "ctxt": 0 }, "body": [ @@ -42,8 +42,8 @@ { "type": "VariableDeclaration", "span": { - "start": 24, - "end": 35, + "start": 23, + "end": 34, "ctxt": 0 }, "kind": "var", @@ -52,30 +52,30 @@ { "type": "VariableDeclarator", "span": { - "start": 28, - "end": 34, + "start": 27, + "end": 33, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 28, - "end": 29, + "start": 27, + "end": 28, "ctxt": 0 }, "value": "x", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 29, - "end": 34, + "start": 28, + "end": 33, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 31, - "end": 34, + "start": 30, + "end": 33, "ctxt": 0 }, "kind": "any" diff --git a/ecmascript/parser/tests/typescript/decorators/type-arguments/input.ts.json b/ecmascript/parser/tests/typescript/decorators/type-arguments/input.ts.json index 44d75dfb8e5..6ccff4987b9 100644 --- a/ecmascript/parser/tests/typescript/decorators/type-arguments/input.ts.json +++ b/ecmascript/parser/tests/typescript/decorators/type-arguments/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 35, + "end": 34, "ctxt": 0 }, "body": [ @@ -11,8 +11,8 @@ "identifier": { "type": "Identifier", "span": { - "start": 28, - "end": 32, + "start": 27, + "end": 31, "ctxt": 0 }, "value": "Test", @@ -21,8 +21,8 @@ }, "declare": false, "span": { - "start": 22, - "end": 35, + "start": 21, + "end": 34, "ctxt": 0 }, "decorators": [ diff --git a/ecmascript/parser/tests/typescript/enum/members-reserved-words/input.ts.json b/ecmascript/parser/tests/typescript/enum/members-reserved-words/input.ts.json index 2cd223dcc66..c0d2101d13a 100644 --- a/ecmascript/parser/tests/typescript/enum/members-reserved-words/input.ts.json +++ b/ecmascript/parser/tests/typescript/enum/members-reserved-words/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 36, + "end": 33, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "TsEnumDeclaration", "span": { "start": 0, - "end": 36, + "end": 33, "ctxt": 0 }, "declare": false, @@ -30,15 +30,15 @@ { "type": "TsEnumMember", "span": { - "start": 14, - "end": 19, + "start": 13, + "end": 18, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 14, - "end": 19, + "start": 13, + "end": 18, "ctxt": 0 }, "value": "const", @@ -50,15 +50,15 @@ { "type": "TsEnumMember", "span": { - "start": 26, - "end": 33, + "start": 24, + "end": 31, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 26, - "end": 33, + "start": 24, + "end": 31, "ctxt": 0 }, "value": "default", diff --git a/ecmascript/parser/tests/typescript/enum/members-strings/input.ts.json b/ecmascript/parser/tests/typescript/enum/members-strings/input.ts.json index 1c117cebca1..ba6aa942527 100644 --- a/ecmascript/parser/tests/typescript/enum/members-strings/input.ts.json +++ b/ecmascript/parser/tests/typescript/enum/members-strings/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 38, + "end": 35, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "TsEnumDeclaration", "span": { "start": 0, - "end": 38, + "end": 35, "ctxt": 0 }, "declare": false, @@ -30,15 +30,15 @@ { "type": "TsEnumMember", "span": { - "start": 14, - "end": 19, + "start": 13, + "end": 18, "ctxt": 0 }, "id": { "type": "StringLiteral", "span": { - "start": 14, - "end": 19, + "start": 13, + "end": 18, "ctxt": 0 }, "value": "foo", @@ -49,15 +49,15 @@ { "type": "TsEnumMember", "span": { - "start": 26, - "end": 35, + "start": 24, + "end": 33, "ctxt": 0 }, "id": { "type": "StringLiteral", "span": { - "start": 26, - "end": 31, + "start": 24, + "end": 29, "ctxt": 0 }, "value": "bar", @@ -66,8 +66,8 @@ "init": { "type": "NumericLiteral", "span": { - "start": 34, - "end": 35, + "start": 32, + "end": 33, "ctxt": 0 }, "value": 1.0 diff --git a/ecmascript/parser/tests/typescript/enum/members-trailing-comma-with-initializer/input.ts.json b/ecmascript/parser/tests/typescript/enum/members-trailing-comma-with-initializer/input.ts.json index c5fda9c4050..850977e52b7 100644 --- a/ecmascript/parser/tests/typescript/enum/members-trailing-comma-with-initializer/input.ts.json +++ b/ecmascript/parser/tests/typescript/enum/members-trailing-comma-with-initializer/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 23, + "end": 21, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "TsEnumDeclaration", "span": { "start": 0, - "end": 23, + "end": 21, "ctxt": 0 }, "declare": false, @@ -30,15 +30,15 @@ { "type": "TsEnumMember", "span": { - "start": 14, - "end": 19, + "start": 13, + "end": 18, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 14, - "end": 15, + "start": 13, + "end": 14, "ctxt": 0 }, "value": "A", @@ -48,8 +48,8 @@ "init": { "type": "NumericLiteral", "span": { - "start": 18, - "end": 19, + "start": 17, + "end": 18, "ctxt": 0 }, "value": 0.0 diff --git a/ecmascript/parser/tests/typescript/enum/members-trailing-comma/input.ts.json b/ecmascript/parser/tests/typescript/enum/members-trailing-comma/input.ts.json index 0a11cb85f7d..fdbe1a653eb 100644 --- a/ecmascript/parser/tests/typescript/enum/members-trailing-comma/input.ts.json +++ b/ecmascript/parser/tests/typescript/enum/members-trailing-comma/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 19, + "end": 17, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "TsEnumDeclaration", "span": { "start": 0, - "end": 19, + "end": 17, "ctxt": 0 }, "declare": false, @@ -30,15 +30,15 @@ { "type": "TsEnumMember", "span": { - "start": 14, - "end": 15, + "start": 13, + "end": 14, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 14, - "end": 15, + "start": 13, + "end": 14, "ctxt": 0 }, "value": "A", diff --git a/ecmascript/parser/tests/typescript/enum/members/input.ts.json b/ecmascript/parser/tests/typescript/enum/members/input.ts.json index 316cf68affb..b35a5f16a49 100644 --- a/ecmascript/parser/tests/typescript/enum/members/input.ts.json +++ b/ecmascript/parser/tests/typescript/enum/members/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 30, + "end": 27, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "TsEnumDeclaration", "span": { "start": 0, - "end": 30, + "end": 27, "ctxt": 0 }, "declare": false, @@ -30,15 +30,15 @@ { "type": "TsEnumMember", "span": { - "start": 14, - "end": 15, + "start": 13, + "end": 14, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 14, - "end": 15, + "start": 13, + "end": 14, "ctxt": 0 }, "value": "A", @@ -50,15 +50,15 @@ { "type": "TsEnumMember", "span": { - "start": 22, - "end": 27, + "start": 20, + "end": 25, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 22, - "end": 23, + "start": 20, + "end": 21, "ctxt": 0 }, "value": "B", @@ -68,8 +68,8 @@ "init": { "type": "NumericLiteral", "span": { - "start": 26, - "end": 27, + "start": 24, + "end": 25, "ctxt": 0 }, "value": 0.0 diff --git a/ecmascript/parser/tests/typescript/es2019/from-entries/input.ts.json b/ecmascript/parser/tests/typescript/es2019/from-entries/input.ts.json index 986649f61d8..9a19d567eb2 100644 --- a/ecmascript/parser/tests/typescript/es2019/from-entries/input.ts.json +++ b/ecmascript/parser/tests/typescript/es2019/from-entries/input.ts.json @@ -1,23 +1,23 @@ { "type": "Module", "span": { - "start": 2, - "end": 192, + "start": 1, + "end": 188, "ctxt": 0 }, "body": [ { "type": "TsInterfaceDeclaration", "span": { - "start": 12, - "end": 192, + "start": 11, + "end": 188, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 12, - "end": 29, + "start": 11, + "end": 28, "ctxt": 0 }, "value": "ObjectConstructor", @@ -30,24 +30,24 @@ "body": { "type": "TsInterfaceBody", "span": { - "start": 30, - "end": 192, + "start": 29, + "end": 188, "ctxt": 0 }, "body": [ { "type": "TsMethodSignature", "span": { - "start": 37, - "end": 131, + "start": 35, + "end": 129, "ctxt": 0 }, "readonly": false, "key": { "type": "Identifier", "span": { - "start": 37, - "end": 48, + "start": 35, + "end": 46, "ctxt": 0 }, "value": "fromEntries", @@ -60,30 +60,30 @@ { "type": "Identifier", "span": { - "start": 58, - "end": 102, + "start": 56, + "end": 100, "ctxt": 0 }, "value": "entries", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 65, - "end": 102, + "start": 63, + "end": 100, "ctxt": 0 }, "typeAnnotation": { "type": "TsTypeReference", "span": { - "start": 67, - "end": 102, + "start": 65, + "end": 100, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 67, - "end": 75, + "start": 65, + "end": 73, "ctxt": 0 }, "value": "Iterable", @@ -93,39 +93,39 @@ "typeParams": { "type": "TsTypeParameterInstantiation", "span": { - "start": 75, - "end": 102, + "start": 73, + "end": 100, "ctxt": 0 }, "params": [ { "type": "TsTypeOperator", "span": { - "start": 76, - "end": 101, + "start": 74, + "end": 99, "ctxt": 0 }, "op": "readonly", "typeAnnotation": { "type": "TsTupleType", "span": { - "start": 85, - "end": 101, + "start": 83, + "end": 99, "ctxt": 0 }, "elemTypes": [ { "type": "TsTypeReference", "span": { - "start": 86, - "end": 97, + "start": 84, + "end": 95, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 86, - "end": 97, + "start": 84, + "end": 95, "ctxt": 0 }, "value": "PropertyKey", @@ -137,15 +137,15 @@ { "type": "TsTypeReference", "span": { - "start": 99, - "end": 100, + "start": 97, + "end": 98, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 99, - "end": 100, + "start": 97, + "end": 98, "ctxt": 0 }, "value": "T", @@ -167,30 +167,30 @@ "typeAnn": { "type": "TsTypeAnnotation", "span": { - "start": 103, - "end": 130, + "start": 101, + "end": 128, "ctxt": 0 }, "typeAnnotation": { "type": "TsMappedType", "span": { - "start": 105, - "end": 130, + "start": 103, + "end": 128, "ctxt": 0 }, "readonly": null, "typeParam": { "type": "TsTypeParameter", "span": { - "start": 108, - "end": 124, + "start": 106, + "end": 122, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 108, - "end": 109, + "start": 106, + "end": 107, "ctxt": 0 }, "value": "k", @@ -200,15 +200,15 @@ "constraint": { "type": "TsTypeReference", "span": { - "start": 113, - "end": 124, + "start": 111, + "end": 122, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 113, - "end": 124, + "start": 111, + "end": 122, "ctxt": 0 }, "value": "PropertyKey", @@ -223,15 +223,15 @@ "typeAnnotation": { "type": "TsTypeReference", "span": { - "start": 127, - "end": 128, + "start": 125, + "end": 126, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 127, - "end": 128, + "start": 125, + "end": 126, "ctxt": 0 }, "value": "T", @@ -245,23 +245,23 @@ "typeParams": { "type": "TsTypeParameterDeclaration", "span": { - "start": 48, - "end": 57, + "start": 46, + "end": 55, "ctxt": 0 }, "parameters": [ { "type": "TsTypeParameter", "span": { - "start": 49, - "end": 56, + "start": 47, + "end": 54, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 49, - "end": 50, + "start": 47, + "end": 48, "ctxt": 0 }, "value": "T", @@ -272,8 +272,8 @@ "default": { "type": "TsKeywordType", "span": { - "start": 53, - "end": 56, + "start": 51, + "end": 54, "ctxt": 0 }, "kind": "any" @@ -285,16 +285,16 @@ { "type": "TsMethodSignature", "span": { - "start": 137, - "end": 189, + "start": 134, + "end": 186, "ctxt": 0 }, "readonly": false, "key": { "type": "Identifier", "span": { - "start": 137, - "end": 148, + "start": 134, + "end": 145, "ctxt": 0 }, "value": "fromEntries", @@ -307,30 +307,30 @@ { "type": "Identifier", "span": { - "start": 149, - "end": 182, + "start": 146, + "end": 179, "ctxt": 0 }, "value": "entries", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 156, - "end": 182, + "start": 153, + "end": 179, "ctxt": 0 }, "typeAnnotation": { "type": "TsTypeReference", "span": { - "start": 158, - "end": 182, + "start": 155, + "end": 179, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 158, - "end": 166, + "start": 155, + "end": 163, "ctxt": 0 }, "value": "Iterable", @@ -340,31 +340,31 @@ "typeParams": { "type": "TsTypeParameterInstantiation", "span": { - "start": 166, - "end": 182, + "start": 163, + "end": 179, "ctxt": 0 }, "params": [ { "type": "TsTypeOperator", "span": { - "start": 167, - "end": 181, + "start": 164, + "end": 178, "ctxt": 0 }, "op": "readonly", "typeAnnotation": { "type": "TsArrayType", "span": { - "start": 176, - "end": 181, + "start": 173, + "end": 178, "ctxt": 0 }, "elemType": { "type": "TsKeywordType", "span": { - "start": 176, - "end": 179, + "start": 173, + "end": 176, "ctxt": 0 }, "kind": "any" @@ -381,15 +381,15 @@ "typeAnn": { "type": "TsTypeAnnotation", "span": { - "start": 183, - "end": 188, + "start": 180, + "end": 185, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 185, - "end": 188, + "start": 182, + "end": 185, "ctxt": 0 }, "kind": "any" diff --git a/ecmascript/parser/tests/typescript/export/declare/input.ts.json b/ecmascript/parser/tests/typescript/export/declare/input.ts.json index 25699ed769d..976e2f10e14 100644 --- a/ecmascript/parser/tests/typescript/export/declare/input.ts.json +++ b/ecmascript/parser/tests/typescript/export/declare/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 217, + "end": 211, "ctxt": 0 }, "body": [ @@ -66,8 +66,8 @@ { "type": "ExportDeclaration", "span": { - "start": 33, - "end": 67, + "start": 32, + "end": 66, "ctxt": 0 }, "declaration": { @@ -75,8 +75,8 @@ "identifier": { "type": "Identifier", "span": { - "start": 57, - "end": 58, + "start": 56, + "end": 57, "ctxt": 0 }, "value": "f", @@ -87,8 +87,8 @@ "params": [], "decorators": [], "span": { - "start": 48, - "end": 67, + "start": 47, + "end": 66, "ctxt": 0 }, "body": null, @@ -98,15 +98,15 @@ "returnType": { "type": "TsTypeAnnotation", "span": { - "start": 60, - "end": 66, + "start": 59, + "end": 65, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 62, - "end": 66, + "start": 61, + "end": 65, "ctxt": 0 }, "kind": "void" @@ -117,8 +117,8 @@ { "type": "ExportDeclaration", "span": { - "start": 69, - "end": 94, + "start": 67, + "end": 92, "ctxt": 0 }, "declaration": { @@ -126,8 +126,8 @@ "identifier": { "type": "Identifier", "span": { - "start": 90, - "end": 91, + "start": 88, + "end": 89, "ctxt": 0 }, "value": "C", @@ -136,8 +136,8 @@ }, "declare": true, "span": { - "start": 84, - "end": 94, + "start": 82, + "end": 92, "ctxt": 0 }, "decorators": [], @@ -152,22 +152,22 @@ { "type": "ExportDeclaration", "span": { - "start": 96, - "end": 125, + "start": 93, + "end": 122, "ctxt": 0 }, "declaration": { "type": "TsInterfaceDeclaration", "span": { - "start": 121, - "end": 125, + "start": 118, + "end": 122, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 121, - "end": 122, + "start": 118, + "end": 119, "ctxt": 0 }, "value": "I", @@ -180,8 +180,8 @@ "body": { "type": "TsInterfaceBody", "span": { - "start": 123, - "end": 125, + "start": 120, + "end": 122, "ctxt": 0 }, "body": [] @@ -191,23 +191,23 @@ { "type": "ExportDeclaration", "span": { - "start": 127, - "end": 158, + "start": 123, + "end": 154, "ctxt": 0 }, "declaration": { "type": "TsTypeAliasDeclaration", "span": { - "start": 127, - "end": 158, + "start": 123, + "end": 154, "ctxt": 0 }, "declare": true, "id": { "type": "Identifier", "span": { - "start": 147, - "end": 148, + "start": 143, + "end": 144, "ctxt": 0 }, "value": "T", @@ -218,8 +218,8 @@ "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 151, - "end": 157, + "start": 147, + "end": 153, "ctxt": 0 }, "kind": "number" @@ -229,15 +229,15 @@ { "type": "ExportDeclaration", "span": { - "start": 160, - "end": 186, + "start": 155, + "end": 181, "ctxt": 0 }, "declaration": { "type": "TsModuleDeclaration", "span": { - "start": 160, - "end": 186, + "start": 155, + "end": 181, "ctxt": 0 }, "declare": true, @@ -245,8 +245,8 @@ "id": { "type": "Identifier", "span": { - "start": 182, - "end": 183, + "start": 177, + "end": 178, "ctxt": 0 }, "value": "M", @@ -256,8 +256,8 @@ "body": { "type": "TsModuleBlock", "span": { - "start": 184, - "end": 186, + "start": 179, + "end": 181, "ctxt": 0 }, "body": [] @@ -267,15 +267,15 @@ { "type": "ExportDeclaration", "span": { - "start": 188, - "end": 217, + "start": 182, + "end": 211, "ctxt": 0 }, "declaration": { "type": "TsModuleDeclaration", "span": { - "start": 188, - "end": 217, + "start": 182, + "end": 211, "ctxt": 0 }, "declare": true, @@ -283,8 +283,8 @@ "id": { "type": "Identifier", "span": { - "start": 213, - "end": 214, + "start": 207, + "end": 208, "ctxt": 0 }, "value": "N", @@ -294,8 +294,8 @@ "body": { "type": "TsModuleBlock", "span": { - "start": 215, - "end": 217, + "start": 209, + "end": 211, "ctxt": 0 }, "body": [] diff --git a/ecmascript/parser/tests/typescript/export/nested-same-name/input.ts.json b/ecmascript/parser/tests/typescript/export/nested-same-name/input.ts.json index 2957908e657..67fc759f73a 100644 --- a/ecmascript/parser/tests/typescript/export/nested-same-name/input.ts.json +++ b/ecmascript/parser/tests/typescript/export/nested-same-name/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 69, + "end": 66, "ctxt": 0 }, "body": [ @@ -58,15 +58,15 @@ { "type": "ExportDeclaration", "span": { - "start": 21, - "end": 69, + "start": 20, + "end": 66, "ctxt": 0 }, "declaration": { "type": "TsModuleDeclaration", "span": { - "start": 28, - "end": 69, + "start": 27, + "end": 66, "ctxt": 0 }, "declare": false, @@ -74,8 +74,8 @@ "id": { "type": "Identifier", "span": { - "start": 38, - "end": 39, + "start": 37, + "end": 38, "ctxt": 0 }, "value": "N", @@ -85,23 +85,23 @@ "body": { "type": "TsModuleBlock", "span": { - "start": 40, - "end": 69, + "start": 39, + "end": 66, "ctxt": 0 }, "body": [ { "type": "ExportDeclaration", "span": { - "start": 47, - "end": 66, + "start": 45, + "end": 64, "ctxt": 0 }, "declaration": { "type": "VariableDeclaration", "span": { - "start": 54, - "end": 66, + "start": 52, + "end": 64, "ctxt": 0 }, "kind": "const", @@ -110,15 +110,15 @@ { "type": "VariableDeclarator", "span": { - "start": 60, - "end": 65, + "start": 58, + "end": 63, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 60, - "end": 61, + "start": 58, + "end": 59, "ctxt": 0 }, "value": "x", @@ -128,8 +128,8 @@ "init": { "type": "NumericLiteral", "span": { - "start": 64, - "end": 65, + "start": 62, + "end": 63, "ctxt": 0 }, "value": 1.0 diff --git a/ecmascript/parser/tests/typescript/function/declare/input.ts.json b/ecmascript/parser/tests/typescript/function/declare/input.ts.json index 4d1f72495d5..a38d2ffa67b 100644 --- a/ecmascript/parser/tests/typescript/function/declare/input.ts.json +++ b/ecmascript/parser/tests/typescript/function/declare/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 56, + "end": 55, "ctxt": 0 }, "body": [ @@ -54,8 +54,8 @@ "identifier": { "type": "Identifier", "span": { - "start": 46, - "end": 47, + "start": 45, + "end": 46, "ctxt": 0 }, "value": "f", @@ -66,8 +66,8 @@ "params": [], "decorators": [], "span": { - "start": 37, - "end": 56, + "start": 36, + "end": 55, "ctxt": 0 }, "body": null, @@ -76,23 +76,23 @@ "typeParameters": { "type": "TsTypeParameterDeclaration", "span": { - "start": 47, - "end": 50, + "start": 46, + "end": 49, "ctxt": 0 }, "parameters": [ { "type": "TsTypeParameter", "span": { - "start": 48, - "end": 49, + "start": 47, + "end": 48, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 48, - "end": 49, + "start": 47, + "end": 48, "ctxt": 0 }, "value": "T", @@ -107,22 +107,22 @@ "returnType": { "type": "TsTypeAnnotation", "span": { - "start": 52, - "end": 55, + "start": 51, + "end": 54, "ctxt": 0 }, "typeAnnotation": { "type": "TsTypeReference", "span": { - "start": 54, - "end": 55, + "start": 53, + "end": 54, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 54, - "end": 55, + "start": 53, + "end": 54, "ctxt": 0 }, "value": "T", diff --git a/ecmascript/parser/tests/typescript/function/overloads/input.ts.json b/ecmascript/parser/tests/typescript/function/overloads/input.ts.json index 1c469f54827..0b2ea6a3b65 100644 --- a/ecmascript/parser/tests/typescript/function/overloads/input.ts.json +++ b/ecmascript/parser/tests/typescript/function/overloads/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 76, + "end": 75, "ctxt": 0 }, "body": [ @@ -88,8 +88,8 @@ { "type": "ExportDeclaration", "span": { - "start": 39, - "end": 76, + "start": 38, + "end": 75, "ctxt": 0 }, "declaration": { @@ -97,8 +97,8 @@ "identifier": { "type": "Identifier", "span": { - "start": 55, - "end": 56, + "start": 54, + "end": 55, "ctxt": 0 }, "value": "f", @@ -110,23 +110,23 @@ { "type": "Identifier", "span": { - "start": 57, - "end": 66, + "start": 56, + "end": 65, "ctxt": 0 }, "value": "x", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 58, - "end": 66, + "start": 57, + "end": 65, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 60, - "end": 66, + "start": 59, + "end": 65, "ctxt": 0 }, "kind": "string" @@ -137,8 +137,8 @@ ], "decorators": [], "span": { - "start": 46, - "end": 76, + "start": 45, + "end": 75, "ctxt": 0 }, "body": null, @@ -148,15 +148,15 @@ "returnType": { "type": "TsTypeAnnotation", "span": { - "start": 67, - "end": 75, + "start": 66, + "end": 74, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 69, - "end": 75, + "start": 68, + "end": 74, "ctxt": 0 }, "kind": "string" diff --git a/ecmascript/parser/tests/typescript/function/predicate-types/input.ts.json b/ecmascript/parser/tests/typescript/function/predicate-types/input.ts.json index 6e6fb212ef4..b81d319b45f 100644 --- a/ecmascript/parser/tests/typescript/function/predicate-types/input.ts.json +++ b/ecmascript/parser/tests/typescript/function/predicate-types/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 72, + "end": 71, "ctxt": 0 }, "body": [ @@ -115,15 +115,15 @@ { "type": "ExpressionStatement", "span": { - "start": 37, - "end": 72, + "start": 36, + "end": 71, "ctxt": 0 }, "expression": { "type": "ParenthesisExpression", "span": { - "start": 37, - "end": 72, + "start": 36, + "end": 71, "ctxt": 0 }, "expression": { @@ -133,23 +133,23 @@ { "type": "Identifier", "span": { - "start": 47, - "end": 53, + "start": 46, + "end": 52, "ctxt": 0 }, "value": "x", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 48, - "end": 53, + "start": 47, + "end": 52, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 50, - "end": 53, + "start": 49, + "end": 52, "ctxt": 0 }, "kind": "any" @@ -160,15 +160,15 @@ ], "decorators": [], "span": { - "start": 38, - "end": 71, + "start": 37, + "end": 70, "ctxt": 0 }, "body": { "type": "BlockStatement", "span": { - "start": 69, - "end": 71, + "start": 68, + "end": 70, "ctxt": 0 }, "stmts": [] @@ -179,22 +179,22 @@ "returnType": { "type": "TsTypeAnnotation", "span": { - "start": 54, - "end": 68, + "start": 53, + "end": 67, "ctxt": 0 }, "typeAnnotation": { "type": "TsTypePredicate", "span": { - "start": 54, - "end": 68, + "start": 53, + "end": 67, "ctxt": 0 }, "paramName": { "type": "Identifier", "span": { - "start": 56, - "end": 57, + "start": 55, + "end": 56, "ctxt": 0 }, "value": "x", @@ -204,15 +204,15 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 61, - "end": 68, + "start": 60, + "end": 67, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 61, - "end": 68, + "start": 60, + "end": 67, "ctxt": 0 }, "kind": "boolean" diff --git a/ecmascript/parser/tests/typescript/import/not-top-level/input.ts.json b/ecmascript/parser/tests/typescript/import/not-top-level/input.ts.json index 078be2af0de..981cf539bf5 100644 --- a/ecmascript/parser/tests/typescript/import/not-top-level/input.ts.json +++ b/ecmascript/parser/tests/typescript/import/not-top-level/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 52, + "end": 50, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "TsModuleDeclaration", "span": { "start": 0, - "end": 52, + "end": 50, "ctxt": 0 }, "declare": true, @@ -29,30 +29,30 @@ "type": "TsModuleBlock", "span": { "start": 19, - "end": 52, + "end": 50, "ctxt": 0 }, "body": [ { "type": "ImportDeclaration", "span": { - "start": 26, - "end": 49, + "start": 25, + "end": 48, "ctxt": 0 }, "specifiers": [ { "type": "ImportNamespaceSpecifier", "span": { - "start": 33, - "end": 39, + "start": 32, + "end": 38, "ctxt": 0 }, "local": { "type": "Identifier", "span": { - "start": 38, - "end": 39, + "start": 37, + "end": 38, "ctxt": 0 }, "value": "a", @@ -64,8 +64,8 @@ "source": { "type": "StringLiteral", "span": { - "start": 45, - "end": 48, + "start": 44, + "end": 47, "ctxt": 0 }, "value": "a", diff --git a/ecmascript/parser/tests/typescript/interface/call-signature/input.ts.json b/ecmascript/parser/tests/typescript/interface/call-signature/input.ts.json index 712fbaefa03..879beadb046 100644 --- a/ecmascript/parser/tests/typescript/interface/call-signature/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/call-signature/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 40, + "end": 38, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "TsInterfaceDeclaration", "span": { "start": 10, - "end": 40, + "end": 38, "ctxt": 0 }, "id": { @@ -31,38 +31,38 @@ "type": "TsInterfaceBody", "span": { "start": 12, - "end": 40, + "end": 38, "ctxt": 0 }, "body": [ { "type": "TsCallSignatureDeclaration", "span": { - "start": 19, - "end": 37, + "start": 18, + "end": 36, "ctxt": 0 }, "params": [ { "type": "Identifier", "span": { - "start": 20, - "end": 29, + "start": 19, + "end": 28, "ctxt": 0 }, "value": "x", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 21, - "end": 29, + "start": 20, + "end": 28, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 23, - "end": 29, + "start": 22, + "end": 28, "ctxt": 0 }, "kind": "number" @@ -74,15 +74,15 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 30, - "end": 36, + "start": 29, + "end": 35, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 32, - "end": 36, + "start": 31, + "end": 35, "ctxt": 0 }, "kind": "void" diff --git a/ecmascript/parser/tests/typescript/interface/construct-signature/input.ts.json b/ecmascript/parser/tests/typescript/interface/construct-signature/input.ts.json index 3088365b2a4..65250dfc15f 100644 --- a/ecmascript/parser/tests/typescript/interface/construct-signature/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/construct-signature/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 44, + "end": 42, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "TsInterfaceDeclaration", "span": { "start": 10, - "end": 44, + "end": 42, "ctxt": 0 }, "id": { @@ -31,38 +31,38 @@ "type": "TsInterfaceBody", "span": { "start": 12, - "end": 44, + "end": 42, "ctxt": 0 }, "body": [ { "type": "TsConstructSignatureDeclaration", "span": { - "start": 19, - "end": 41, + "start": 18, + "end": 40, "ctxt": 0 }, "params": [ { "type": "Identifier", "span": { - "start": 24, - "end": 33, + "start": 23, + "end": 32, "ctxt": 0 }, "value": "x", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 25, - "end": 33, + "start": 24, + "end": 32, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 27, - "end": 33, + "start": 26, + "end": 32, "ctxt": 0 }, "kind": "number" @@ -74,15 +74,15 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 34, - "end": 40, + "start": 33, + "end": 39, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 36, - "end": 40, + "start": 35, + "end": 39, "ctxt": 0 }, "kind": "void" diff --git a/ecmascript/parser/tests/typescript/interface/export/input.ts.json b/ecmascript/parser/tests/typescript/interface/export/input.ts.json index 191a739bf2d..f77f262cfd8 100644 --- a/ecmascript/parser/tests/typescript/interface/export/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/export/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 52, + "end": 51, "ctxt": 0 }, "body": [ @@ -48,22 +48,22 @@ { "type": "ExportDefaultDeclaration", "span": { - "start": 23, - "end": 52, + "start": 22, + "end": 51, "ctxt": 0 }, "decl": { "type": "TsInterfaceDeclaration", "span": { - "start": 48, - "end": 52, + "start": 47, + "end": 51, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 48, - "end": 49, + "start": 47, + "end": 48, "ctxt": 0 }, "value": "A", @@ -76,8 +76,8 @@ "body": { "type": "TsInterfaceBody", "span": { - "start": 50, - "end": 52, + "start": 49, + "end": 51, "ctxt": 0 }, "body": [] diff --git a/ecmascript/parser/tests/typescript/interface/index-signature/input.ts.json b/ecmascript/parser/tests/typescript/interface/index-signature/input.ts.json index 5e59aabd7c5..eaff0d52611 100644 --- a/ecmascript/parser/tests/typescript/interface/index-signature/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/index-signature/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 42, + "end": 40, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "TsInterfaceDeclaration", "span": { "start": 10, - "end": 42, + "end": 40, "ctxt": 0 }, "id": { @@ -31,7 +31,7 @@ "type": "TsInterfaceBody", "span": { "start": 12, - "end": 42, + "end": 40, "ctxt": 0 }, "body": [ @@ -41,23 +41,23 @@ { "type": "Identifier", "span": { - "start": 20, - "end": 21, + "start": 19, + "end": 20, "ctxt": 0 }, "value": "s", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 23, - "end": 29, + "start": 22, + "end": 28, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 23, - "end": 29, + "start": 22, + "end": 28, "ctxt": 0 }, "kind": "string" @@ -69,15 +69,15 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 30, - "end": 38, + "start": 29, + "end": 37, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 32, - "end": 38, + "start": 31, + "end": 37, "ctxt": 0 }, "kind": "number" @@ -85,8 +85,8 @@ }, "readonly": false, "span": { - "start": 19, - "end": 39, + "start": 18, + "end": 38, "ctxt": 0 } } diff --git a/ecmascript/parser/tests/typescript/interface/method-computed/input.ts.json b/ecmascript/parser/tests/typescript/interface/method-computed/input.ts.json index cfa6d624b96..12183a4f86c 100644 --- a/ecmascript/parser/tests/typescript/interface/method-computed/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/method-computed/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 83, + "end": 80, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "TsInterfaceDeclaration", "span": { "start": 10, - "end": 83, + "end": 80, "ctxt": 0 }, "id": { @@ -31,30 +31,30 @@ "type": "TsInterfaceBody", "span": { "start": 12, - "end": 83, + "end": 80, "ctxt": 0 }, "body": [ { "type": "TsMethodSignature", "span": { - "start": 19, - "end": 45, + "start": 18, + "end": 44, "ctxt": 0 }, "readonly": false, "key": { "type": "MemberExpression", "span": { - "start": 20, - "end": 35, + "start": 19, + "end": 34, "ctxt": 0 }, "object": { "type": "Identifier", "span": { - "start": 20, - "end": 26, + "start": 19, + "end": 25, "ctxt": 0 }, "value": "Symbol", @@ -64,8 +64,8 @@ "property": { "type": "Identifier", "span": { - "start": 27, - "end": 35, + "start": 26, + "end": 34, "ctxt": 0 }, "value": "iterator", @@ -80,15 +80,15 @@ "typeAnn": { "type": "TsTypeAnnotation", "span": { - "start": 38, - "end": 44, + "start": 37, + "end": 43, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 40, - "end": 44, + "start": 39, + "end": 43, "ctxt": 0 }, "kind": "void" @@ -99,23 +99,23 @@ { "type": "TsMethodSignature", "span": { - "start": 51, - "end": 80, + "start": 49, + "end": 78, "ctxt": 0 }, "readonly": false, "key": { "type": "MemberExpression", "span": { - "start": 52, - "end": 67, + "start": 50, + "end": 65, "ctxt": 0 }, "object": { "type": "Identifier", "span": { - "start": 52, - "end": 58, + "start": 50, + "end": 56, "ctxt": 0 }, "value": "Symbol", @@ -125,8 +125,8 @@ "property": { "type": "Identifier", "span": { - "start": 59, - "end": 67, + "start": 57, + "end": 65, "ctxt": 0 }, "value": "iterator", @@ -141,15 +141,15 @@ "typeAnn": { "type": "TsTypeAnnotation", "span": { - "start": 71, - "end": 79, + "start": 69, + "end": 77, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 73, - "end": 79, + "start": 71, + "end": 77, "ctxt": 0 }, "kind": "number" diff --git a/ecmascript/parser/tests/typescript/interface/method-generic/input.ts.json b/ecmascript/parser/tests/typescript/interface/method-generic/input.ts.json index 049d8f541ad..7b5c1a21fbd 100644 --- a/ecmascript/parser/tests/typescript/interface/method-generic/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/method-generic/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 63, + "end": 61, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "TsInterfaceDeclaration", "span": { "start": 10, - "end": 63, + "end": 61, "ctxt": 0 }, "id": { @@ -31,23 +31,23 @@ "type": "TsInterfaceBody", "span": { "start": 12, - "end": 63, + "end": 61, "ctxt": 0 }, "body": [ { "type": "TsMethodSignature", "span": { - "start": 19, - "end": 60, + "start": 18, + "end": 59, "ctxt": 0 }, "readonly": false, "key": { "type": "Identifier", "span": { - "start": 19, - "end": 20, + "start": 18, + "end": 19, "ctxt": 0 }, "value": "m", @@ -60,22 +60,22 @@ "typeAnn": { "type": "TsTypeAnnotation", "span": { - "start": 56, - "end": 59, + "start": 55, + "end": 58, "ctxt": 0 }, "typeAnnotation": { "type": "TsTypeReference", "span": { - "start": 58, - "end": 59, + "start": 57, + "end": 58, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 58, - "end": 59, + "start": 57, + "end": 58, "ctxt": 0 }, "value": "T", @@ -88,23 +88,23 @@ "typeParams": { "type": "TsTypeParameterDeclaration", "span": { - "start": 20, - "end": 54, + "start": 19, + "end": 53, "ctxt": 0 }, "parameters": [ { "type": "TsTypeParameter", "span": { - "start": 21, - "end": 53, + "start": 20, + "end": 52, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 21, - "end": 22, + "start": 20, + "end": 21, "ctxt": 0 }, "value": "T", @@ -114,8 +114,8 @@ "constraint": { "type": "TsKeywordType", "span": { - "start": 31, - "end": 37, + "start": 30, + "end": 36, "ctxt": 0 }, "kind": "object" @@ -123,24 +123,24 @@ "default": { "type": "TsTypeLiteral", "span": { - "start": 40, - "end": 53, + "start": 39, + "end": 52, "ctxt": 0 }, "members": [ { "type": "TsPropertySignature", "span": { - "start": 42, - "end": 51, + "start": 41, + "end": 50, "ctxt": 0 }, "readonly": false, "key": { "type": "Identifier", "span": { - "start": 42, - "end": 43, + "start": 41, + "end": 42, "ctxt": 0 }, "value": "x", @@ -154,15 +154,15 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 43, - "end": 51, + "start": 42, + "end": 50, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 45, - "end": 51, + "start": 44, + "end": 50, "ctxt": 0 }, "kind": "number" diff --git a/ecmascript/parser/tests/typescript/interface/method-optional/input.ts.json b/ecmascript/parser/tests/typescript/interface/method-optional/input.ts.json index 009d1d7efae..9fd6804260e 100644 --- a/ecmascript/parser/tests/typescript/interface/method-optional/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/method-optional/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 33, + "end": 31, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "TsInterfaceDeclaration", "span": { "start": 10, - "end": 33, + "end": 31, "ctxt": 0 }, "id": { @@ -31,23 +31,23 @@ "type": "TsInterfaceBody", "span": { "start": 12, - "end": 33, + "end": 31, "ctxt": 0 }, "body": [ { "type": "TsMethodSignature", "span": { - "start": 19, - "end": 30, + "start": 18, + "end": 29, "ctxt": 0 }, "readonly": false, "key": { "type": "Identifier", "span": { - "start": 19, - "end": 20, + "start": 18, + "end": 19, "ctxt": 0 }, "value": "m", @@ -60,15 +60,15 @@ "typeAnn": { "type": "TsTypeAnnotation", "span": { - "start": 23, - "end": 29, + "start": 22, + "end": 28, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 25, - "end": 29, + "start": 24, + "end": 28, "ctxt": 0 }, "kind": "void" diff --git a/ecmascript/parser/tests/typescript/interface/method-plain/input.ts.json b/ecmascript/parser/tests/typescript/interface/method-plain/input.ts.json index bc906d32c7b..b9dfb26302a 100644 --- a/ecmascript/parser/tests/typescript/interface/method-plain/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/method-plain/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 68, + "end": 65, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "TsInterfaceDeclaration", "span": { "start": 10, - "end": 68, + "end": 65, "ctxt": 0 }, "id": { @@ -31,23 +31,23 @@ "type": "TsInterfaceBody", "span": { "start": 12, - "end": 68, + "end": 65, "ctxt": 0 }, "body": [ { "type": "TsMethodSignature", "span": { - "start": 19, - "end": 23, + "start": 18, + "end": 22, "ctxt": 0 }, "readonly": false, "key": { "type": "Identifier", "span": { - "start": 19, - "end": 20, + "start": 18, + "end": 19, "ctxt": 0 }, "value": "m", @@ -63,16 +63,16 @@ { "type": "TsMethodSignature", "span": { - "start": 29, - "end": 65, + "start": 27, + "end": 63, "ctxt": 0 }, "readonly": false, "key": { "type": "Identifier", "span": { - "start": 29, - "end": 30, + "start": 27, + "end": 28, "ctxt": 0 }, "value": "m", @@ -85,23 +85,23 @@ { "type": "Identifier", "span": { - "start": 31, - "end": 41, + "start": 29, + "end": 39, "ctxt": 0 }, "value": "x", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 33, - "end": 41, + "start": 31, + "end": 39, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 35, - "end": 41, + "start": 33, + "end": 39, "ctxt": 0 }, "kind": "number" @@ -112,20 +112,20 @@ { "type": "RestElement", "span": { - "start": 43, - "end": 57, + "start": 41, + "end": 55, "ctxt": 0 }, "rest": { - "start": 43, - "end": 46, + "start": 41, + "end": 44, "ctxt": 0 }, "argument": { "type": "Identifier", "span": { - "start": 46, - "end": 47, + "start": 44, + "end": 45, "ctxt": 0 }, "value": "y", @@ -135,22 +135,22 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 47, - "end": 57, + "start": 45, + "end": 55, "ctxt": 0 }, "typeAnnotation": { "type": "TsArrayType", "span": { - "start": 49, - "end": 57, + "start": 47, + "end": 55, "ctxt": 0 }, "elemType": { "type": "TsKeywordType", "span": { - "start": 49, - "end": 55, + "start": 47, + "end": 53, "ctxt": 0 }, "kind": "number" @@ -162,15 +162,15 @@ "typeAnn": { "type": "TsTypeAnnotation", "span": { - "start": 58, - "end": 64, + "start": 56, + "end": 62, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 60, - "end": 64, + "start": 58, + "end": 62, "ctxt": 0 }, "kind": "void" diff --git a/ecmascript/parser/tests/typescript/interface/modifiers/input.ts.json b/ecmascript/parser/tests/typescript/interface/modifiers/input.ts.json index fc7833c7a5c..5d410440649 100644 --- a/ecmascript/parser/tests/typescript/interface/modifiers/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/modifiers/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 41, + "end": 39, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "TsInterfaceDeclaration", "span": { "start": 10, - "end": 41, + "end": 39, "ctxt": 0 }, "id": { @@ -31,23 +31,23 @@ "type": "TsInterfaceBody", "span": { "start": 12, - "end": 41, + "end": 39, "ctxt": 0 }, "body": [ { "type": "TsPropertySignature", "span": { - "start": 19, - "end": 38, + "start": 18, + "end": 37, "ctxt": 0 }, "readonly": true, "key": { "type": "Identifier", "span": { - "start": 28, - "end": 29, + "start": 27, + "end": 28, "ctxt": 0 }, "value": "x", @@ -61,15 +61,15 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 29, - "end": 37, + "start": 28, + "end": 36, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 31, - "end": 37, + "start": 30, + "end": 36, "ctxt": 0 }, "kind": "number" diff --git a/ecmascript/parser/tests/typescript/interface/properties/input.ts.json b/ecmascript/parser/tests/typescript/interface/properties/input.ts.json index 84c7afc292d..79a24efe2d6 100644 --- a/ecmascript/parser/tests/typescript/interface/properties/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/properties/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 57, + "end": 53, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "TsInterfaceDeclaration", "span": { "start": 10, - "end": 57, + "end": 53, "ctxt": 0 }, "id": { @@ -31,23 +31,23 @@ "type": "TsInterfaceBody", "span": { "start": 12, - "end": 57, + "end": 53, "ctxt": 0 }, "body": [ { "type": "TsPropertySignature", "span": { - "start": 19, - "end": 21, + "start": 18, + "end": 20, "ctxt": 0 }, "readonly": false, "key": { "type": "Identifier", "span": { - "start": 19, - "end": 20, + "start": 18, + "end": 19, "ctxt": 0 }, "value": "x", @@ -64,16 +64,16 @@ { "type": "TsPropertySignature", "span": { - "start": 27, - "end": 37, + "start": 25, + "end": 35, "ctxt": 0 }, "readonly": false, "key": { "type": "Identifier", "span": { - "start": 27, - "end": 28, + "start": 25, + "end": 26, "ctxt": 0 }, "value": "y", @@ -87,15 +87,15 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 28, - "end": 36, + "start": 26, + "end": 34, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 30, - "end": 36, + "start": 28, + "end": 34, "ctxt": 0 }, "kind": "number" @@ -106,16 +106,16 @@ { "type": "TsPropertySignature", "span": { - "start": 43, - "end": 54, + "start": 40, + "end": 51, "ctxt": 0 }, "readonly": false, "key": { "type": "Identifier", "span": { - "start": 43, - "end": 44, + "start": 40, + "end": 41, "ctxt": 0 }, "value": "z", @@ -129,15 +129,15 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 45, - "end": 53, + "start": 42, + "end": 50, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 47, - "end": 53, + "start": 44, + "end": 50, "ctxt": 0 }, "kind": "number" diff --git a/ecmascript/parser/tests/typescript/interface/property-computed/input.ts.json b/ecmascript/parser/tests/typescript/interface/property-computed/input.ts.json index 105a37e7f6e..8dae949c7cb 100644 --- a/ecmascript/parser/tests/typescript/interface/property-computed/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/property-computed/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 81, + "end": 78, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "TsInterfaceDeclaration", "span": { "start": 10, - "end": 81, + "end": 78, "ctxt": 0 }, "id": { @@ -31,30 +31,30 @@ "type": "TsInterfaceBody", "span": { "start": 12, - "end": 81, + "end": 78, "ctxt": 0 }, "body": [ { "type": "TsPropertySignature", "span": { - "start": 19, - "end": 45, + "start": 18, + "end": 44, "ctxt": 0 }, "readonly": false, "key": { "type": "MemberExpression", "span": { - "start": 20, - "end": 35, + "start": 19, + "end": 34, "ctxt": 0 }, "object": { "type": "Identifier", "span": { - "start": 20, - "end": 26, + "start": 19, + "end": 25, "ctxt": 0 }, "value": "Symbol", @@ -64,8 +64,8 @@ "property": { "type": "Identifier", "span": { - "start": 27, - "end": 35, + "start": 26, + "end": 34, "ctxt": 0 }, "value": "iterator", @@ -81,15 +81,15 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 36, - "end": 44, + "start": 35, + "end": 43, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 38, - "end": 44, + "start": 37, + "end": 43, "ctxt": 0 }, "kind": "number" @@ -100,23 +100,23 @@ { "type": "TsPropertySignature", "span": { - "start": 51, - "end": 78, + "start": 49, + "end": 76, "ctxt": 0 }, "readonly": false, "key": { "type": "MemberExpression", "span": { - "start": 52, - "end": 67, + "start": 50, + "end": 65, "ctxt": 0 }, "object": { "type": "Identifier", "span": { - "start": 52, - "end": 58, + "start": 50, + "end": 56, "ctxt": 0 }, "value": "Symbol", @@ -126,8 +126,8 @@ "property": { "type": "Identifier", "span": { - "start": 59, - "end": 67, + "start": 57, + "end": 65, "ctxt": 0 }, "value": "iterator", @@ -143,15 +143,15 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 69, - "end": 77, + "start": 67, + "end": 75, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 71, - "end": 77, + "start": 69, + "end": 75, "ctxt": 0 }, "kind": "number" diff --git a/ecmascript/parser/tests/typescript/interface/property-named-public/input.ts.json b/ecmascript/parser/tests/typescript/interface/property-named-public/input.ts.json index e4bc65e0b97..af4f16b52ff 100644 --- a/ecmascript/parser/tests/typescript/interface/property-named-public/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/property-named-public/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 34, + "end": 32, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "TsInterfaceDeclaration", "span": { "start": 10, - "end": 34, + "end": 32, "ctxt": 0 }, "id": { @@ -31,23 +31,23 @@ "type": "TsInterfaceBody", "span": { "start": 12, - "end": 34, + "end": 32, "ctxt": 0 }, "body": [ { "type": "TsPropertySignature", "span": { - "start": 16, - "end": 31, + "start": 15, + "end": 30, "ctxt": 0 }, "readonly": false, "key": { "type": "Identifier", "span": { - "start": 16, - "end": 22, + "start": 15, + "end": 21, "ctxt": 0 }, "value": "public", @@ -61,15 +61,15 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 22, - "end": 30, + "start": 21, + "end": 29, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 24, - "end": 30, + "start": 23, + "end": 29, "ctxt": 0 }, "kind": "number" diff --git a/ecmascript/parser/tests/typescript/interface/reserved-method-name/input.ts.json b/ecmascript/parser/tests/typescript/interface/reserved-method-name/input.ts.json index 95050f93b54..f4beb2acde7 100644 --- a/ecmascript/parser/tests/typescript/interface/reserved-method-name/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/reserved-method-name/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 36, + "end": 34, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "TsInterfaceDeclaration", "span": { "start": 10, - "end": 36, + "end": 34, "ctxt": 0 }, "id": { @@ -31,23 +31,23 @@ "type": "TsInterfaceBody", "span": { "start": 12, - "end": 36, + "end": 34, "ctxt": 0 }, "body": [ { "type": "TsMethodSignature", "span": { - "start": 19, - "end": 33, + "start": 18, + "end": 32, "ctxt": 0 }, "readonly": false, "key": { "type": "Identifier", "span": { - "start": 19, - "end": 24, + "start": 18, + "end": 23, "ctxt": 0 }, "value": "catch", @@ -60,15 +60,15 @@ "typeAnn": { "type": "TsTypeAnnotation", "span": { - "start": 26, - "end": 32, + "start": 25, + "end": 31, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 28, - "end": 32, + "start": 27, + "end": 31, "ctxt": 0 }, "kind": "void" diff --git a/ecmascript/parser/tests/typescript/interface/separators/input.ts.json b/ecmascript/parser/tests/typescript/interface/separators/input.ts.json index 56f9308c1c3..940f3864edb 100644 --- a/ecmascript/parser/tests/typescript/interface/separators/input.ts.json +++ b/ecmascript/parser/tests/typescript/interface/separators/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 135, + "end": 130, "ctxt": 0 }, "body": [ @@ -125,15 +125,15 @@ { "type": "TsInterfaceDeclaration", "span": { - "start": 52, - "end": 81, + "start": 51, + "end": 80, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 52, - "end": 56, + "start": 51, + "end": 55, "ctxt": 0 }, "value": "Semi", @@ -146,24 +146,24 @@ "body": { "type": "TsInterfaceBody", "span": { - "start": 57, - "end": 81, + "start": 56, + "end": 80, "ctxt": 0 }, "body": [ { "type": "TsPropertySignature", "span": { - "start": 59, - "end": 69, + "start": 58, + "end": 68, "ctxt": 0 }, "readonly": false, "key": { "type": "Identifier", "span": { - "start": 59, - "end": 60, + "start": 58, + "end": 59, "ctxt": 0 }, "value": "x", @@ -177,15 +177,15 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 60, - "end": 68, + "start": 59, + "end": 67, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 62, - "end": 68, + "start": 61, + "end": 67, "ctxt": 0 }, "kind": "number" @@ -196,16 +196,16 @@ { "type": "TsPropertySignature", "span": { - "start": 70, - "end": 79, + "start": 69, + "end": 78, "ctxt": 0 }, "readonly": false, "key": { "type": "Identifier", "span": { - "start": 70, - "end": 71, + "start": 69, + "end": 70, "ctxt": 0 }, "value": "y", @@ -219,15 +219,15 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 71, - "end": 79, + "start": 70, + "end": 78, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 73, - "end": 79, + "start": 72, + "end": 78, "ctxt": 0 }, "kind": "number" @@ -241,15 +241,15 @@ { "type": "TsInterfaceDeclaration", "span": { - "start": 93, - "end": 135, + "start": 91, + "end": 130, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 93, - "end": 100, + "start": 91, + "end": 98, "ctxt": 0 }, "value": "Newline", @@ -262,24 +262,24 @@ "body": { "type": "TsInterfaceBody", "span": { - "start": 101, - "end": 135, + "start": 99, + "end": 130, "ctxt": 0 }, "body": [ { "type": "TsPropertySignature", "span": { - "start": 108, - "end": 117, + "start": 105, + "end": 114, "ctxt": 0 }, "readonly": false, "key": { "type": "Identifier", "span": { - "start": 108, - "end": 109, + "start": 105, + "end": 106, "ctxt": 0 }, "value": "x", @@ -293,15 +293,15 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 109, - "end": 117, + "start": 106, + "end": 114, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 111, - "end": 117, + "start": 108, + "end": 114, "ctxt": 0 }, "kind": "number" @@ -312,16 +312,16 @@ { "type": "TsPropertySignature", "span": { - "start": 123, - "end": 132, + "start": 119, + "end": 128, "ctxt": 0 }, "readonly": false, "key": { "type": "Identifier", "span": { - "start": 123, - "end": 124, + "start": 119, + "end": 120, "ctxt": 0 }, "value": "y", @@ -335,15 +335,15 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 124, - "end": 132, + "start": 120, + "end": 128, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 126, - "end": 132, + "start": 122, + "end": 128, "ctxt": 0 }, "kind": "number" diff --git a/ecmascript/parser/tests/typescript/module-namespace/body-declare/input.ts.json b/ecmascript/parser/tests/typescript/module-namespace/body-declare/input.ts.json index c007003b569..51040770a9f 100644 --- a/ecmascript/parser/tests/typescript/module-namespace/body-declare/input.ts.json +++ b/ecmascript/parser/tests/typescript/module-namespace/body-declare/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 46, + "end": 44, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "TsModuleDeclaration", "span": { "start": 0, - "end": 46, + "end": 44, "ctxt": 0 }, "declare": true, @@ -30,15 +30,15 @@ "type": "TsModuleBlock", "span": { "start": 20, - "end": 46, + "end": 44, "ctxt": 0 }, "body": [ { "type": "VariableDeclaration", "span": { - "start": 27, - "end": 43, + "start": 26, + "end": 42, "ctxt": 0 }, "kind": "const", @@ -47,30 +47,30 @@ { "type": "VariableDeclarator", "span": { - "start": 33, - "end": 42, + "start": 32, + "end": 41, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 33, - "end": 34, + "start": 32, + "end": 33, "ctxt": 0 }, "value": "x", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 34, - "end": 42, + "start": 33, + "end": 41, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 36, - "end": 42, + "start": 35, + "end": 41, "ctxt": 0 }, "kind": "number" diff --git a/ecmascript/parser/tests/typescript/module-namespace/body-nested-declare/input.ts.json b/ecmascript/parser/tests/typescript/module-namespace/body-nested-declare/input.ts.json index 45c03627728..bbabe17ee74 100644 --- a/ecmascript/parser/tests/typescript/module-namespace/body-nested-declare/input.ts.json +++ b/ecmascript/parser/tests/typescript/module-namespace/body-nested-declare/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 76, + "end": 72, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "TsModuleDeclaration", "span": { "start": 0, - "end": 76, + "end": 72, "ctxt": 0 }, "declare": true, @@ -30,15 +30,15 @@ "type": "TsModuleBlock", "span": { "start": 20, - "end": 76, + "end": 72, "ctxt": 0 }, "body": [ { "type": "TsModuleDeclaration", "span": { - "start": 27, - "end": 73, + "start": 26, + "end": 70, "ctxt": 0 }, "declare": true, @@ -46,8 +46,8 @@ "id": { "type": "Identifier", "span": { - "start": 37, - "end": 38, + "start": 36, + "end": 37, "ctxt": 0 }, "value": "B", @@ -57,16 +57,16 @@ "body": { "type": "TsModuleBlock", "span": { - "start": 39, - "end": 73, + "start": 38, + "end": 70, "ctxt": 0 }, "body": [ { "type": "VariableDeclaration", "span": { - "start": 50, - "end": 66, + "start": 48, + "end": 64, "ctxt": 0 }, "kind": "const", @@ -75,30 +75,30 @@ { "type": "VariableDeclarator", "span": { - "start": 56, - "end": 65, + "start": 54, + "end": 63, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 56, - "end": 57, + "start": 54, + "end": 55, "ctxt": 0 }, "value": "x", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 57, - "end": 65, + "start": 55, + "end": 63, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 59, - "end": 65, + "start": 57, + "end": 63, "ctxt": 0 }, "kind": "number" diff --git a/ecmascript/parser/tests/typescript/module-namespace/body-nested/input.ts.json b/ecmascript/parser/tests/typescript/module-namespace/body-nested/input.ts.json index 115745938a3..ab03b9ebea4 100644 --- a/ecmascript/parser/tests/typescript/module-namespace/body-nested/input.ts.json +++ b/ecmascript/parser/tests/typescript/module-namespace/body-nested/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 42, + "end": 39, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "TsModuleDeclaration", "span": { "start": 0, - "end": 42, + "end": 39, "ctxt": 0 }, "declare": false, @@ -30,15 +30,15 @@ "type": "TsModuleBlock", "span": { "start": 12, - "end": 42, + "end": 39, "ctxt": 0 }, "body": [ { "type": "TsModuleDeclaration", "span": { - "start": 19, - "end": 39, + "start": 18, + "end": 37, "ctxt": 0 }, "declare": false, @@ -46,8 +46,8 @@ "id": { "type": "Identifier", "span": { - "start": 29, - "end": 30, + "start": 28, + "end": 29, "ctxt": 0 }, "value": "B", @@ -57,8 +57,8 @@ "body": { "type": "TsModuleBlock", "span": { - "start": 31, - "end": 39, + "start": 30, + "end": 37, "ctxt": 0 }, "body": [] diff --git a/ecmascript/parser/tests/typescript/module-namespace/body/input.ts.json b/ecmascript/parser/tests/typescript/module-namespace/body/input.ts.json index d6ea5b64a00..e32520048b5 100644 --- a/ecmascript/parser/tests/typescript/module-namespace/body/input.ts.json +++ b/ecmascript/parser/tests/typescript/module-namespace/body/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 34, + "end": 32, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "TsModuleDeclaration", "span": { "start": 0, - "end": 34, + "end": 32, "ctxt": 0 }, "declare": false, @@ -30,15 +30,15 @@ "type": "TsModuleBlock", "span": { "start": 12, - "end": 34, + "end": 32, "ctxt": 0 }, "body": [ { "type": "VariableDeclaration", "span": { - "start": 19, - "end": 31, + "start": 18, + "end": 30, "ctxt": 0 }, "kind": "const", @@ -47,15 +47,15 @@ { "type": "VariableDeclarator", "span": { - "start": 25, - "end": 30, + "start": 24, + "end": 29, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 25, - "end": 26, + "start": 24, + "end": 25, "ctxt": 0 }, "value": "x", @@ -65,8 +65,8 @@ "init": { "type": "NumericLiteral", "span": { - "start": 29, - "end": 30, + "start": 28, + "end": 29, "ctxt": 0 }, "value": 0.0 diff --git a/ecmascript/parser/tests/typescript/module-namespace/global-in-module/input.ts.json b/ecmascript/parser/tests/typescript/module-namespace/global-in-module/input.ts.json index 4e81578039f..b7ff245fcc6 100644 --- a/ecmascript/parser/tests/typescript/module-namespace/global-in-module/input.ts.json +++ b/ecmascript/parser/tests/typescript/module-namespace/global-in-module/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 68, + "end": 64, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "TsModuleDeclaration", "span": { "start": 0, - "end": 68, + "end": 64, "ctxt": 0 }, "declare": true, @@ -29,15 +29,15 @@ "type": "TsModuleBlock", "span": { "start": 19, - "end": 68, + "end": 64, "ctxt": 0 }, "body": [ { "type": "TsModuleDeclaration", "span": { - "start": 26, - "end": 65, + "start": 25, + "end": 62, "ctxt": 0 }, "declare": true, @@ -45,8 +45,8 @@ "id": { "type": "Identifier", "span": { - "start": 26, - "end": 32, + "start": 25, + "end": 31, "ctxt": 0 }, "value": "global", @@ -56,16 +56,16 @@ "body": { "type": "TsModuleBlock", "span": { - "start": 33, - "end": 65, + "start": 32, + "end": 62, "ctxt": 0 }, "body": [ { "type": "VariableDeclaration", "span": { - "start": 44, - "end": 58, + "start": 42, + "end": 56, "ctxt": 0 }, "kind": "var", @@ -74,30 +74,30 @@ { "type": "VariableDeclarator", "span": { - "start": 48, - "end": 57, + "start": 46, + "end": 55, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 48, - "end": 49, + "start": 46, + "end": 47, "ctxt": 0 }, "value": "x", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 49, - "end": 57, + "start": 47, + "end": 55, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 51, - "end": 57, + "start": 49, + "end": 55, "ctxt": 0 }, "kind": "number" diff --git a/ecmascript/parser/tests/typescript/module-namespace/head-declare/input.ts.json b/ecmascript/parser/tests/typescript/module-namespace/head-declare/input.ts.json index db8ebd489d7..6d5491be0b7 100644 --- a/ecmascript/parser/tests/typescript/module-namespace/head-declare/input.ts.json +++ b/ecmascript/parser/tests/typescript/module-namespace/head-declare/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 87, + "end": 84, "ctxt": 0 }, "body": [ @@ -60,8 +60,8 @@ { "type": "TsModuleDeclaration", "span": { - "start": 26, - "end": 45, + "start": 25, + "end": 44, "ctxt": 0 }, "declare": true, @@ -69,8 +69,8 @@ "id": { "type": "Identifier", "span": { - "start": 41, - "end": 42, + "start": 40, + "end": 41, "ctxt": 0 }, "value": "M", @@ -80,8 +80,8 @@ "body": { "type": "TsModuleBlock", "span": { - "start": 43, - "end": 45, + "start": 42, + "end": 44, "ctxt": 0 }, "body": [] @@ -90,8 +90,8 @@ { "type": "TsModuleDeclaration", "span": { - "start": 47, - "end": 68, + "start": 45, + "end": 66, "ctxt": 0 }, "declare": true, @@ -99,8 +99,8 @@ "id": { "type": "StringLiteral", "span": { - "start": 62, - "end": 65, + "start": 60, + "end": 63, "ctxt": 0 }, "value": "m", @@ -109,8 +109,8 @@ "body": { "type": "TsModuleBlock", "span": { - "start": 66, - "end": 68, + "start": 64, + "end": 66, "ctxt": 0 }, "body": [] @@ -119,8 +119,8 @@ { "type": "TsModuleDeclaration", "span": { - "start": 70, - "end": 87, + "start": 67, + "end": 84, "ctxt": 0 }, "declare": true, @@ -128,8 +128,8 @@ "id": { "type": "Identifier", "span": { - "start": 78, - "end": 84, + "start": 75, + "end": 81, "ctxt": 0 }, "value": "global", @@ -139,8 +139,8 @@ "body": { "type": "TsModuleBlock", "span": { - "start": 85, - "end": 87, + "start": 82, + "end": 84, "ctxt": 0 }, "body": [] diff --git a/ecmascript/parser/tests/typescript/module-namespace/head-export/input.ts.json b/ecmascript/parser/tests/typescript/module-namespace/head-export/input.ts.json index 90f8a64427b..34e3a94740f 100644 --- a/ecmascript/parser/tests/typescript/module-namespace/head-export/input.ts.json +++ b/ecmascript/parser/tests/typescript/module-namespace/head-export/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 43, + "end": 42, "ctxt": 0 }, "body": [ @@ -68,15 +68,15 @@ { "type": "ExportDeclaration", "span": { - "start": 25, - "end": 43, + "start": 24, + "end": 42, "ctxt": 0 }, "declaration": { "type": "TsModuleDeclaration", "span": { - "start": 32, - "end": 43, + "start": 31, + "end": 42, "ctxt": 0 }, "declare": false, @@ -84,8 +84,8 @@ "id": { "type": "Identifier", "span": { - "start": 39, - "end": 40, + "start": 38, + "end": 39, "ctxt": 0 }, "value": "X", @@ -95,8 +95,8 @@ "body": { "type": "TsModuleBlock", "span": { - "start": 41, - "end": 43, + "start": 40, + "end": 42, "ctxt": 0 }, "body": [] diff --git a/ecmascript/parser/tests/typescript/module-namespace/head/input.ts.json b/ecmascript/parser/tests/typescript/module-namespace/head/input.ts.json index b517787ad27..51f6825dac2 100644 --- a/ecmascript/parser/tests/typescript/module-namespace/head/input.ts.json +++ b/ecmascript/parser/tests/typescript/module-namespace/head/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 62, + "end": 59, "ctxt": 0 }, "body": [ @@ -39,8 +39,8 @@ { "type": "TsModuleDeclaration", "span": { - "start": 16, - "end": 34, + "start": 15, + "end": 33, "ctxt": 0 }, "declare": false, @@ -48,8 +48,8 @@ "id": { "type": "Identifier", "span": { - "start": 26, - "end": 27, + "start": 25, + "end": 26, "ctxt": 0 }, "value": "M", @@ -59,8 +59,8 @@ "body": { "type": "TsNamespaceDeclaration", "span": { - "start": 28, - "end": 34, + "start": 27, + "end": 33, "ctxt": 0 }, "declare": false, @@ -68,8 +68,8 @@ "id": { "type": "Identifier", "span": { - "start": 28, - "end": 29, + "start": 27, + "end": 28, "ctxt": 0 }, "value": "N", @@ -79,8 +79,8 @@ "body": { "type": "TsNamespaceDeclaration", "span": { - "start": 30, - "end": 34, + "start": 29, + "end": 33, "ctxt": 0 }, "declare": false, @@ -88,8 +88,8 @@ "id": { "type": "Identifier", "span": { - "start": 30, - "end": 31, + "start": 29, + "end": 30, "ctxt": 0 }, "value": "O", @@ -99,8 +99,8 @@ "body": { "type": "TsModuleBlock", "span": { - "start": 32, - "end": 34, + "start": 31, + "end": 33, "ctxt": 0 }, "body": [] @@ -111,8 +111,8 @@ { "type": "TsModuleDeclaration", "span": { - "start": 36, - "end": 47, + "start": 34, + "end": 45, "ctxt": 0 }, "declare": false, @@ -120,8 +120,8 @@ "id": { "type": "Identifier", "span": { - "start": 43, - "end": 44, + "start": 41, + "end": 42, "ctxt": 0 }, "value": "M", @@ -131,8 +131,8 @@ "body": { "type": "TsModuleBlock", "span": { - "start": 45, - "end": 47, + "start": 43, + "end": 45, "ctxt": 0 }, "body": [] @@ -141,8 +141,8 @@ { "type": "TsModuleDeclaration", "span": { - "start": 49, - "end": 62, + "start": 46, + "end": 59, "ctxt": 0 }, "declare": false, @@ -150,8 +150,8 @@ "id": { "type": "StringLiteral", "span": { - "start": 56, - "end": 59, + "start": 53, + "end": 56, "ctxt": 0 }, "value": "m", @@ -160,8 +160,8 @@ "body": { "type": "TsModuleBlock", "span": { - "start": 60, - "end": 62, + "start": 57, + "end": 59, "ctxt": 0 }, "body": [] diff --git a/ecmascript/parser/tests/typescript/regression/is-default-export/input.ts.json b/ecmascript/parser/tests/typescript/regression/is-default-export/input.ts.json index 1951db96649..613bbff8f0c 100644 --- a/ecmascript/parser/tests/typescript/regression/is-default-export/input.ts.json +++ b/ecmascript/parser/tests/typescript/regression/is-default-export/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 64, + "end": 62, "ctxt": 0 }, "body": [ @@ -47,15 +47,15 @@ { "type": "ExportDeclaration", "span": { - "start": 25, - "end": 41, + "start": 24, + "end": 40, "ctxt": 0 }, "declaration": { "type": "TsEnumDeclaration", "span": { - "start": 32, - "end": 41, + "start": 31, + "end": 40, "ctxt": 0 }, "declare": false, @@ -63,8 +63,8 @@ "id": { "type": "Identifier", "span": { - "start": 37, - "end": 38, + "start": 36, + "end": 37, "ctxt": 0 }, "value": "E", @@ -77,22 +77,22 @@ { "type": "ExportDeclaration", "span": { - "start": 43, - "end": 64, + "start": 41, + "end": 62, "ctxt": 0 }, "declaration": { "type": "TsInterfaceDeclaration", "span": { - "start": 60, - "end": 64, + "start": 58, + "end": 62, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 60, - "end": 61, + "start": 58, + "end": 59, "ctxt": 0 }, "value": "I", @@ -105,8 +105,8 @@ "body": { "type": "TsInterfaceBody", "span": { - "start": 62, - "end": 64, + "start": 60, + "end": 62, "ctxt": 0 }, "body": [] diff --git a/ecmascript/parser/tests/typescript/regression/tsx-issue-7742/input.ts.json b/ecmascript/parser/tests/typescript/regression/tsx-issue-7742/input.ts.json index c1eff8a6791..fd2d97fadc0 100644 --- a/ecmascript/parser/tests/typescript/regression/tsx-issue-7742/input.ts.json +++ b/ecmascript/parser/tests/typescript/regression/tsx-issue-7742/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 42, + "end": 40, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "TsInterfaceDeclaration", "span": { "start": 10, - "end": 42, + "end": 40, "ctxt": 0 }, "id": { @@ -61,45 +61,45 @@ "type": "TsInterfaceBody", "span": { "start": 17, - "end": 42, + "end": 40, "ctxt": 0 }, "body": [ { "type": "TsCallSignatureDeclaration", "span": { - "start": 24, - "end": 39, + "start": 23, + "end": 38, "ctxt": 0 }, "params": [ { "type": "Identifier", "span": { - "start": 28, - "end": 34, + "start": 27, + "end": 33, "ctxt": 0 }, "value": "bar", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 31, - "end": 34, + "start": 30, + "end": 33, "ctxt": 0 }, "typeAnnotation": { "type": "TsTypeReference", "span": { - "start": 33, - "end": 34, + "start": 32, + "end": 33, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 33, - "end": 34, + "start": 32, + "end": 33, "ctxt": 0 }, "value": "G", @@ -115,22 +115,22 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 35, - "end": 38, + "start": 34, + "end": 37, "ctxt": 0 }, "typeAnnotation": { "type": "TsTypeReference", "span": { - "start": 37, - "end": 38, + "start": 36, + "end": 37, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 37, - "end": 38, + "start": 36, + "end": 37, "ctxt": 0 }, "value": "T", @@ -143,23 +143,23 @@ "typeParams": { "type": "TsTypeParameterDeclaration", "span": { - "start": 24, - "end": 27, + "start": 23, + "end": 26, "ctxt": 0 }, "parameters": [ { "type": "TsTypeParameter", "span": { - "start": 25, - "end": 26, + "start": 24, + "end": 25, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 25, - "end": 26, + "start": 24, + "end": 25, "ctxt": 0 }, "value": "T", diff --git a/ecmascript/parser/tests/typescript/tsx/brace-is-block/input.ts.json b/ecmascript/parser/tests/typescript/tsx/brace-is-block/input.ts.json index df9b7ec1527..cc82c520c68 100644 --- a/ecmascript/parser/tests/typescript/tsx/brace-is-block/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsx/brace-is-block/input.ts.json @@ -1,8 +1,8 @@ { "type": "Module", "span": { - "start": 100, - "end": 129, + "start": 99, + "end": 127, "ctxt": 0 }, "body": [ @@ -11,8 +11,8 @@ "identifier": { "type": "Identifier", "span": { - "start": 106, - "end": 107, + "start": 105, + "end": 106, "ctxt": 0 }, "value": "C", @@ -21,8 +21,8 @@ }, "declare": false, "span": { - "start": 100, - "end": 123, + "start": 99, + "end": 122, "ctxt": 0 }, "decorators": [], @@ -30,8 +30,8 @@ "superClass": { "type": "Identifier", "span": { - "start": 116, - "end": 117, + "start": 115, + "end": 116, "ctxt": 0 }, "value": "D", @@ -43,23 +43,23 @@ "superTypeParams": { "type": "TsTypeParameterInstantiation", "span": { - "start": 117, - "end": 120, + "start": 116, + "end": 119, "ctxt": 0 }, "params": [ { "type": "TsTypeReference", "span": { - "start": 118, - "end": 119, + "start": 117, + "end": 118, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 118, - "end": 119, + "start": 117, + "end": 118, "ctxt": 0 }, "value": "T", @@ -75,15 +75,15 @@ { "type": "ExpressionStatement", "span": { - "start": 125, - "end": 129, + "start": 123, + "end": 127, "ctxt": 0 }, "expression": { "type": "JSXElement", "span": { - "start": 125, - "end": 129, + "start": 123, + "end": 127, "ctxt": 0 }, "opening": { @@ -91,8 +91,8 @@ "name": { "type": "Identifier", "span": { - "start": 126, - "end": 127, + "start": 124, + "end": 125, "ctxt": 0 }, "value": "C", @@ -100,8 +100,8 @@ "optional": false }, "span": { - "start": 126, - "end": 129, + "start": 124, + "end": 127, "ctxt": 0 }, "attributes": [], diff --git a/ecmascript/parser/tests/typescript/tsx/type-arguments/input.ts.json b/ecmascript/parser/tests/typescript/tsx/type-arguments/input.ts.json index 4382114e6a4..d17785484cd 100644 --- a/ecmascript/parser/tests/typescript/tsx/type-arguments/input.ts.json +++ b/ecmascript/parser/tests/typescript/tsx/type-arguments/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 36, + "end": 34, "ctxt": 0 }, "body": [ @@ -67,22 +67,22 @@ { "type": "ExpressionStatement", "span": { - "start": 9, - "end": 20, + "start": 8, + "end": 19, "ctxt": 0 }, "expression": { "type": "NewExpression", "span": { - "start": 9, - "end": 19, + "start": 8, + "end": 18, "ctxt": 0 }, "callee": { "type": "Identifier", "span": { - "start": 13, - "end": 14, + "start": 12, + "end": 13, "ctxt": 0 }, "value": "C", @@ -93,23 +93,23 @@ "typeArguments": { "type": "TsTypeParameterInstantiation", "span": { - "start": 14, - "end": 17, + "start": 13, + "end": 16, "ctxt": 0 }, "params": [ { "type": "TsTypeReference", "span": { - "start": 15, - "end": 16, + "start": 14, + "end": 15, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 15, - "end": 16, + "start": 14, + "end": 15, "ctxt": 0 }, "value": "T", @@ -125,16 +125,16 @@ { "type": "TsTypeAliasDeclaration", "span": { - "start": 22, - "end": 36, + "start": 20, + "end": 34, "ctxt": 0 }, "declare": false, "id": { "type": "Identifier", "span": { - "start": 27, - "end": 28, + "start": 25, + "end": 26, "ctxt": 0 }, "value": "A", @@ -145,15 +145,15 @@ "typeAnnotation": { "type": "TsTypeReference", "span": { - "start": 31, - "end": 35, + "start": 29, + "end": 33, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 31, - "end": 32, + "start": 29, + "end": 30, "ctxt": 0 }, "value": "T", @@ -163,23 +163,23 @@ "typeParams": { "type": "TsTypeParameterInstantiation", "span": { - "start": 32, - "end": 35, + "start": 30, + "end": 33, "ctxt": 0 }, "params": [ { "type": "TsTypeReference", "span": { - "start": 33, - "end": 34, + "start": 31, + "end": 32, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 33, - "end": 34, + "start": 31, + "end": 32, "ctxt": 0 }, "value": "T", diff --git a/ecmascript/parser/tests/typescript/type-arguments/call/input.ts.json b/ecmascript/parser/tests/typescript/type-arguments/call/input.ts.json index 92d41e1f2e0..d24e1ba90b6 100644 --- a/ecmascript/parser/tests/typescript/type-arguments/call/input.ts.json +++ b/ecmascript/parser/tests/typescript/type-arguments/call/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 19, + "end": 18, "ctxt": 0 }, "body": [ @@ -67,22 +67,22 @@ { "type": "ExpressionStatement", "span": { - "start": 9, - "end": 19, + "start": 8, + "end": 18, "ctxt": 0 }, "expression": { "type": "CallExpression", "span": { - "start": 9, - "end": 18, + "start": 8, + "end": 17, "ctxt": 0 }, "callee": { "type": "Identifier", "span": { - "start": 9, - "end": 10, + "start": 8, + "end": 9, "ctxt": 0 }, "value": "f", @@ -93,23 +93,23 @@ "typeArguments": { "type": "TsTypeParameterInstantiation", "span": { - "start": 10, - "end": 16, + "start": 9, + "end": 15, "ctxt": 0 }, "params": [ { "type": "TsTypeReference", "span": { - "start": 11, - "end": 12, + "start": 10, + "end": 11, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 11, - "end": 12, + "start": 10, + "end": 11, "ctxt": 0 }, "value": "T", @@ -121,15 +121,15 @@ { "type": "TsTypeReference", "span": { - "start": 14, - "end": 15, + "start": 13, + "end": 14, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 14, - "end": 15, + "start": 13, + "end": 14, "ctxt": 0 }, "value": "U", diff --git a/ecmascript/parser/tests/typescript/type-arguments/new/input.ts.json b/ecmascript/parser/tests/typescript/type-arguments/new/input.ts.json index aca941fabaf..c147e773549 100644 --- a/ecmascript/parser/tests/typescript/type-arguments/new/input.ts.json +++ b/ecmascript/parser/tests/typescript/type-arguments/new/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 27, + "end": 26, "ctxt": 0 }, "body": [ @@ -67,22 +67,22 @@ { "type": "ExpressionStatement", "span": { - "start": 13, - "end": 27, + "start": 12, + "end": 26, "ctxt": 0 }, "expression": { "type": "NewExpression", "span": { - "start": 13, - "end": 26, + "start": 12, + "end": 25, "ctxt": 0 }, "callee": { "type": "Identifier", "span": { - "start": 17, - "end": 18, + "start": 16, + "end": 17, "ctxt": 0 }, "value": "C", @@ -93,23 +93,23 @@ "typeArguments": { "type": "TsTypeParameterInstantiation", "span": { - "start": 18, - "end": 24, + "start": 17, + "end": 23, "ctxt": 0 }, "params": [ { "type": "TsTypeReference", "span": { - "start": 19, - "end": 20, + "start": 18, + "end": 19, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 19, - "end": 20, + "start": 18, + "end": 19, "ctxt": 0 }, "value": "T", @@ -121,15 +121,15 @@ { "type": "TsTypeReference", "span": { - "start": 22, - "end": 23, + "start": 21, + "end": 22, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 22, - "end": 23, + "start": 21, + "end": 22, "ctxt": 0 }, "value": "U", diff --git a/ecmascript/parser/tests/typescript/type-arguments/tagged-template-no-asi/input.ts.json b/ecmascript/parser/tests/typescript/type-arguments/tagged-template-no-asi/input.ts.json index fcd2f8cd08a..a7311dda1d4 100644 --- a/ecmascript/parser/tests/typescript/type-arguments/tagged-template-no-asi/input.ts.json +++ b/ecmascript/parser/tests/typescript/type-arguments/tagged-template-no-asi/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 12, + "end": 11, "ctxt": 0 }, "body": [ @@ -10,21 +10,21 @@ "type": "ExpressionStatement", "span": { "start": 0, - "end": 12, + "end": 11, "ctxt": 0 }, "expression": { "type": "NewExpression", "span": { "start": 0, - "end": 12, + "end": 11, "ctxt": 0 }, "callee": { "type": "TaggedTemplateExpression", "span": { - "start": 10, - "end": 12, + "start": 9, + "end": 11, "ctxt": 0 }, "tag": { @@ -43,16 +43,16 @@ { "type": "TemplateElement", "span": { - "start": 11, - "end": 11, + "start": 10, + "end": 10, "ctxt": 0 }, "tail": true, "cooked": { "type": "StringLiteral", "span": { - "start": 11, - "end": 11, + "start": 10, + "end": 10, "ctxt": 0 }, "value": "", @@ -61,8 +61,8 @@ "raw": { "type": "StringLiteral", "span": { - "start": 11, - "end": 11, + "start": 10, + "end": 10, "ctxt": 0 }, "value": "", diff --git a/ecmascript/parser/tests/typescript/type-arguments/tsx/input.ts.json b/ecmascript/parser/tests/typescript/type-arguments/tsx/input.ts.json index ae02b84f0de..0ddbbcad22b 100644 --- a/ecmascript/parser/tests/typescript/type-arguments/tsx/input.ts.json +++ b/ecmascript/parser/tests/typescript/type-arguments/tsx/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 31, + "end": 30, "ctxt": 0 }, "body": [ @@ -85,15 +85,15 @@ { "type": "ExpressionStatement", "span": { - "start": 18, - "end": 31, + "start": 17, + "end": 30, "ctxt": 0 }, "expression": { "type": "JSXElement", "span": { - "start": 18, - "end": 30, + "start": 17, + "end": 29, "ctxt": 0 }, "opening": { @@ -101,8 +101,8 @@ "name": { "type": "Identifier", "span": { - "start": 19, - "end": 20, + "start": 18, + "end": 19, "ctxt": 0 }, "value": "C", @@ -110,8 +110,8 @@ "optional": false }, "span": { - "start": 19, - "end": 30, + "start": 18, + "end": 29, "ctxt": 0 }, "attributes": [], @@ -119,16 +119,16 @@ "typeArguments": { "type": "TsTypeParameterInstantiation", "span": { - "start": 20, - "end": 28, + "start": 19, + "end": 27, "ctxt": 0 }, "params": [ { "type": "TsKeywordType", "span": { - "start": 21, - "end": 27, + "start": 20, + "end": 26, "ctxt": 0 }, "kind": "number" diff --git a/ecmascript/parser/tests/typescript/types/keywords/input.ts.json b/ecmascript/parser/tests/typescript/types/keywords/input.ts.json index c2c22a97c98..cf20a7ac9ee 100644 --- a/ecmascript/parser/tests/typescript/types/keywords/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/keywords/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 195, + "end": 184, "ctxt": 0 }, "body": [ @@ -58,8 +58,8 @@ { "type": "VariableDeclaration", "span": { - "start": 13, - "end": 29, + "start": 12, + "end": 28, "ctxt": 0 }, "kind": "let", @@ -68,30 +68,30 @@ { "type": "VariableDeclarator", "span": { - "start": 17, - "end": 28, + "start": 16, + "end": 27, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 17, - "end": 19, + "start": 16, + "end": 18, "ctxt": 0 }, "value": "un", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 19, - "end": 28, + "start": 18, + "end": 27, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 21, - "end": 28, + "start": 20, + "end": 27, "ctxt": 0 }, "kind": "unknown" @@ -107,8 +107,8 @@ { "type": "VariableDeclaration", "span": { - "start": 31, - "end": 46, + "start": 29, + "end": 44, "ctxt": 0 }, "kind": "let", @@ -117,30 +117,30 @@ { "type": "VariableDeclarator", "span": { - "start": 35, - "end": 45, + "start": 33, + "end": 43, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 35, - "end": 36, + "start": 33, + "end": 34, "ctxt": 0 }, "value": "b", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 36, - "end": 45, + "start": 34, + "end": 43, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 38, - "end": 45, + "start": 36, + "end": 43, "ctxt": 0 }, "kind": "boolean" @@ -156,8 +156,8 @@ { "type": "VariableDeclaration", "span": { - "start": 48, - "end": 62, + "start": 45, + "end": 59, "ctxt": 0 }, "kind": "let", @@ -166,30 +166,30 @@ { "type": "VariableDeclarator", "span": { - "start": 52, - "end": 61, + "start": 49, + "end": 58, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 52, - "end": 54, + "start": 49, + "end": 51, "ctxt": 0 }, "value": "ne", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 54, - "end": 61, + "start": 51, + "end": 58, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 56, - "end": 61, + "start": 53, + "end": 58, "ctxt": 0 }, "kind": "never" @@ -205,8 +205,8 @@ { "type": "VariableDeclaration", "span": { - "start": 64, - "end": 78, + "start": 60, + "end": 74, "ctxt": 0 }, "kind": "let", @@ -215,30 +215,30 @@ { "type": "VariableDeclarator", "span": { - "start": 68, - "end": 77, + "start": 64, + "end": 73, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 68, - "end": 71, + "start": 64, + "end": 67, "ctxt": 0 }, "value": "nul", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 71, - "end": 77, + "start": 67, + "end": 73, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 73, - "end": 77, + "start": 69, + "end": 73, "ctxt": 0 }, "kind": "null" @@ -254,8 +254,8 @@ { "type": "VariableDeclaration", "span": { - "start": 80, - "end": 96, + "start": 75, + "end": 91, "ctxt": 0 }, "kind": "let", @@ -264,30 +264,30 @@ { "type": "VariableDeclarator", "span": { - "start": 84, - "end": 95, + "start": 79, + "end": 90, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 84, - "end": 87, + "start": 79, + "end": 82, "ctxt": 0 }, "value": "num", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 87, - "end": 95, + "start": 82, + "end": 90, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 89, - "end": 95, + "start": 84, + "end": 90, "ctxt": 0 }, "kind": "number" @@ -303,8 +303,8 @@ { "type": "VariableDeclaration", "span": { - "start": 98, - "end": 112, + "start": 92, + "end": 106, "ctxt": 0 }, "kind": "let", @@ -313,30 +313,30 @@ { "type": "VariableDeclarator", "span": { - "start": 102, - "end": 111, + "start": 96, + "end": 105, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 102, - "end": 103, + "start": 96, + "end": 97, "ctxt": 0 }, "value": "o", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 103, - "end": 111, + "start": 97, + "end": 105, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 105, - "end": 111, + "start": 99, + "end": 105, "ctxt": 0 }, "kind": "object" @@ -352,8 +352,8 @@ { "type": "VariableDeclaration", "span": { - "start": 114, - "end": 129, + "start": 107, + "end": 122, "ctxt": 0 }, "kind": "let", @@ -362,30 +362,30 @@ { "type": "VariableDeclarator", "span": { - "start": 118, - "end": 128, + "start": 111, + "end": 121, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 118, - "end": 120, + "start": 111, + "end": 113, "ctxt": 0 }, "value": "st", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 120, - "end": 128, + "start": 113, + "end": 121, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 122, - "end": 128, + "start": 115, + "end": 121, "ctxt": 0 }, "kind": "string" @@ -401,8 +401,8 @@ { "type": "VariableDeclaration", "span": { - "start": 131, - "end": 146, + "start": 123, + "end": 138, "ctxt": 0 }, "kind": "let", @@ -411,30 +411,30 @@ { "type": "VariableDeclarator", "span": { - "start": 135, - "end": 145, + "start": 127, + "end": 137, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 135, - "end": 137, + "start": 127, + "end": 129, "ctxt": 0 }, "value": "sy", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 137, - "end": 145, + "start": 129, + "end": 137, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 139, - "end": 145, + "start": 131, + "end": 137, "ctxt": 0 }, "kind": "symbol" @@ -450,8 +450,8 @@ { "type": "VariableDeclaration", "span": { - "start": 148, - "end": 165, + "start": 139, + "end": 156, "ctxt": 0 }, "kind": "let", @@ -460,30 +460,30 @@ { "type": "VariableDeclarator", "span": { - "start": 152, - "end": 164, + "start": 143, + "end": 155, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 152, - "end": 153, + "start": 143, + "end": 144, "ctxt": 0 }, "value": "u", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 153, - "end": 164, + "start": 144, + "end": 155, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 155, - "end": 164, + "start": 146, + "end": 155, "ctxt": 0 }, "kind": "undefined" @@ -499,8 +499,8 @@ { "type": "VariableDeclaration", "span": { - "start": 167, - "end": 179, + "start": 157, + "end": 169, "ctxt": 0 }, "kind": "let", @@ -509,30 +509,30 @@ { "type": "VariableDeclarator", "span": { - "start": 171, - "end": 178, + "start": 161, + "end": 168, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 171, - "end": 172, + "start": 161, + "end": 162, "ctxt": 0 }, "value": "v", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 172, - "end": 178, + "start": 162, + "end": 168, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 174, - "end": 178, + "start": 164, + "end": 168, "ctxt": 0 }, "kind": "void" @@ -548,8 +548,8 @@ { "type": "VariableDeclaration", "span": { - "start": 181, - "end": 195, + "start": 170, + "end": 184, "ctxt": 0 }, "kind": "let", @@ -558,30 +558,30 @@ { "type": "VariableDeclarator", "span": { - "start": 185, - "end": 194, + "start": 174, + "end": 183, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 185, - "end": 186, + "start": 174, + "end": 175, "ctxt": 0 }, "value": "n", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 186, - "end": 194, + "start": 175, + "end": 183, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 188, - "end": 194, + "start": 177, + "end": 183, "ctxt": 0 }, "kind": "bigint" diff --git a/ecmascript/parser/tests/typescript/types/literal-boolean/input.ts.json b/ecmascript/parser/tests/typescript/types/literal-boolean/input.ts.json index e2866be904c..e4755d3caa1 100644 --- a/ecmascript/parser/tests/typescript/types/literal-boolean/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/literal-boolean/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 27, + "end": 26, "ctxt": 0 }, "body": [ @@ -66,8 +66,8 @@ { "type": "VariableDeclaration", "span": { - "start": 14, - "end": 27, + "start": 13, + "end": 26, "ctxt": 0 }, "kind": "let", @@ -76,37 +76,37 @@ { "type": "VariableDeclarator", "span": { - "start": 18, - "end": 26, + "start": 17, + "end": 25, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 18, - "end": 19, + "start": 17, + "end": 18, "ctxt": 0 }, "value": "x", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 19, - "end": 26, + "start": 18, + "end": 25, "ctxt": 0 }, "typeAnnotation": { "type": "TsLiteralType", "span": { - "start": 21, - "end": 26, + "start": 20, + "end": 25, "ctxt": 0 }, "literal": { "type": "BooleanLiteral", "span": { - "start": 21, - "end": 26, + "start": 20, + "end": 25, "ctxt": 0 }, "value": false diff --git a/ecmascript/parser/tests/typescript/types/mapped/input.ts.json b/ecmascript/parser/tests/typescript/types/mapped/input.ts.json index 80e306dd951..d74ea8815a3 100644 --- a/ecmascript/parser/tests/typescript/types/mapped/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/mapped/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 183, + "end": 180, "ctxt": 0 }, "body": [ @@ -97,8 +97,8 @@ { "type": "VariableDeclaration", "span": { - "start": 38, - "end": 84, + "start": 37, + "end": 83, "ctxt": 0 }, "kind": "let", @@ -107,45 +107,45 @@ { "type": "VariableDeclarator", "span": { - "start": 42, - "end": 83, + "start": 41, + "end": 82, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 42, - "end": 45, + "start": 41, + "end": 44, "ctxt": 0 }, "value": "map", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 45, - "end": 83, + "start": 44, + "end": 82, "ctxt": 0 }, "typeAnnotation": { "type": "TsMappedType", "span": { - "start": 47, - "end": 83, + "start": 46, + "end": 82, "ctxt": 0 }, "readonly": true, "typeParam": { "type": "TsTypeParameter", "span": { - "start": 59, - "end": 70, + "start": 58, + "end": 69, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 59, - "end": 60, + "start": 58, + "end": 59, "ctxt": 0 }, "value": "P", @@ -155,8 +155,8 @@ "constraint": { "type": "TsKeywordType", "span": { - "start": 64, - "end": 70, + "start": 63, + "end": 69, "ctxt": 0 }, "kind": "string" @@ -167,8 +167,8 @@ "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 74, - "end": 80, + "start": 73, + "end": 79, "ctxt": 0 }, "kind": "number" @@ -185,8 +185,8 @@ { "type": "VariableDeclaration", "span": { - "start": 86, - "end": 134, + "start": 84, + "end": 132, "ctxt": 0 }, "kind": "let", @@ -195,45 +195,45 @@ { "type": "VariableDeclarator", "span": { - "start": 90, - "end": 133, + "start": 88, + "end": 131, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 90, - "end": 93, + "start": 88, + "end": 91, "ctxt": 0 }, "value": "map", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 93, - "end": 133, + "start": 91, + "end": 131, "ctxt": 0 }, "typeAnnotation": { "type": "TsMappedType", "span": { - "start": 95, - "end": 133, + "start": 93, + "end": 131, "ctxt": 0 }, "readonly": "+", "typeParam": { "type": "TsTypeParameter", "span": { - "start": 108, - "end": 119, + "start": 106, + "end": 117, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 108, - "end": 109, + "start": 106, + "end": 107, "ctxt": 0 }, "value": "P", @@ -243,8 +243,8 @@ "constraint": { "type": "TsKeywordType", "span": { - "start": 113, - "end": 119, + "start": 111, + "end": 117, "ctxt": 0 }, "kind": "string" @@ -255,8 +255,8 @@ "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 124, - "end": 130, + "start": 122, + "end": 128, "ctxt": 0 }, "kind": "number" @@ -273,8 +273,8 @@ { "type": "VariableDeclaration", "span": { - "start": 136, - "end": 183, + "start": 133, + "end": 180, "ctxt": 0 }, "kind": "let", @@ -283,45 +283,45 @@ { "type": "VariableDeclarator", "span": { - "start": 140, - "end": 182, + "start": 137, + "end": 179, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 140, - "end": 143, + "start": 137, + "end": 140, "ctxt": 0 }, "value": "map", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 143, - "end": 182, + "start": 140, + "end": 179, "ctxt": 0 }, "typeAnnotation": { "type": "TsMappedType", "span": { - "start": 145, - "end": 182, + "start": 142, + "end": 179, "ctxt": 0 }, "readonly": "-", "typeParam": { "type": "TsTypeParameter", "span": { - "start": 158, - "end": 169, + "start": 155, + "end": 166, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 158, - "end": 159, + "start": 155, + "end": 156, "ctxt": 0 }, "value": "P", @@ -331,8 +331,8 @@ "constraint": { "type": "TsKeywordType", "span": { - "start": 163, - "end": 169, + "start": 160, + "end": 166, "ctxt": 0 }, "kind": "string" @@ -343,8 +343,8 @@ "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 174, - "end": 180, + "start": 171, + "end": 177, "ctxt": 0 }, "kind": "number" diff --git a/ecmascript/parser/tests/typescript/types/object-shorthand/input.ts.json b/ecmascript/parser/tests/typescript/types/object-shorthand/input.ts.json index 8bb11df9b47..e2e625ae6e2 100644 --- a/ecmascript/parser/tests/typescript/types/object-shorthand/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/object-shorthand/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 91, + "end": 87, "ctxt": 0 }, "body": [ @@ -10,7 +10,7 @@ "type": "VariableDeclaration", "span": { "start": 0, - "end": 91, + "end": 87, "ctxt": 0 }, "kind": "const", @@ -20,7 +20,7 @@ "type": "VariableDeclarator", "span": { "start": 6, - "end": 90, + "end": 86, "ctxt": 0 }, "id": { @@ -38,7 +38,7 @@ "type": "ObjectExpression", "span": { "start": 14, - "end": 90, + "end": 86, "ctxt": 0 }, "properties": [ @@ -47,8 +47,8 @@ "key": { "type": "Identifier", "span": { - "start": 19, - "end": 22, + "start": 18, + "end": 21, "ctxt": 0 }, "value": "put", @@ -59,30 +59,30 @@ { "type": "Identifier", "span": { - "start": 49, - "end": 57, + "start": 48, + "end": 56, "ctxt": 0 }, "value": "value", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 54, - "end": 57, + "start": 53, + "end": 56, "ctxt": 0 }, "typeAnnotation": { "type": "TsTypeReference", "span": { - "start": 56, - "end": 57, + "start": 55, + "end": 56, "ctxt": 0 }, "typeName": { "type": "Identifier", "span": { - "start": 56, - "end": 57, + "start": 55, + "end": 56, "ctxt": 0 }, "value": "T", @@ -97,15 +97,15 @@ ], "decorators": [], "span": { - "start": 19, - "end": 87, + "start": 18, + "end": 84, "ctxt": 0 }, "body": { "type": "BlockStatement", "span": { - "start": 59, - "end": 87, + "start": 58, + "end": 84, "ctxt": 0 }, "stmts": [] @@ -115,23 +115,23 @@ "typeParameters": { "type": "TsTypeParameterDeclaration", "span": { - "start": 22, - "end": 48, + "start": 21, + "end": 47, "ctxt": 0 }, "parameters": [ { "type": "TsTypeParameter", "span": { - "start": 23, - "end": 47, + "start": 22, + "end": 46, "ctxt": 0 }, "name": { "type": "Identifier", "span": { - "start": 23, - "end": 24, + "start": 22, + "end": 23, "ctxt": 0 }, "value": "T", @@ -141,24 +141,24 @@ "constraint": { "type": "TsTypeLiteral", "span": { - "start": 33, - "end": 47, + "start": 32, + "end": 46, "ctxt": 0 }, "members": [ { "type": "TsPropertySignature", "span": { - "start": 35, - "end": 45, + "start": 34, + "end": 44, "ctxt": 0 }, "readonly": false, "key": { "type": "Identifier", "span": { - "start": 35, - "end": 37, + "start": 34, + "end": 36, "ctxt": 0 }, "value": "id", @@ -172,15 +172,15 @@ "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 37, - "end": 45, + "start": 36, + "end": 44, "ctxt": 0 }, "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 39, - "end": 45, + "start": 38, + "end": 44, "ctxt": 0 }, "kind": "string" diff --git a/ecmascript/parser/tests/typescript/types/type-operator/input.ts.json b/ecmascript/parser/tests/typescript/types/type-operator/input.ts.json index 0380ce84cac..ced9443d48a 100644 --- a/ecmascript/parser/tests/typescript/types/type-operator/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/type-operator/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 38, + "end": 37, "ctxt": 0 }, "body": [ @@ -78,8 +78,8 @@ { "type": "VariableDeclaration", "span": { - "start": 17, - "end": 38, + "start": 16, + "end": 37, "ctxt": 0 }, "kind": "let", @@ -88,38 +88,38 @@ { "type": "VariableDeclarator", "span": { - "start": 21, - "end": 37, + "start": 20, + "end": 36, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 21, - "end": 22, + "start": 20, + "end": 21, "ctxt": 0 }, "value": "y", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 22, - "end": 37, + "start": 21, + "end": 36, "ctxt": 0 }, "typeAnnotation": { "type": "TsTypeOperator", "span": { - "start": 24, - "end": 37, + "start": 23, + "end": 36, "ctxt": 0 }, "op": "unique", "typeAnnotation": { "type": "TsKeywordType", "span": { - "start": 31, - "end": 37, + "start": 30, + "end": 36, "ctxt": 0 }, "kind": "symbol" diff --git a/ecmascript/parser/tests/typescript/types/union-intersection/input.ts.json b/ecmascript/parser/tests/typescript/types/union-intersection/input.ts.json index 7f39957a423..ec4c77459ca 100644 --- a/ecmascript/parser/tests/typescript/types/union-intersection/input.ts.json +++ b/ecmascript/parser/tests/typescript/types/union-intersection/input.ts.json @@ -2,7 +2,7 @@ "type": "Module", "span": { "start": 0, - "end": 163, + "end": 160, "ctxt": 0 }, "body": [ @@ -86,8 +86,8 @@ { "type": "VariableDeclaration", "span": { - "start": 39, - "end": 73, + "start": 38, + "end": 72, "ctxt": 0 }, "kind": "let", @@ -96,38 +96,38 @@ { "type": "VariableDeclarator", "span": { - "start": 43, - "end": 72, + "start": 42, + "end": 71, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 43, - "end": 55, + "start": 42, + "end": 54, "ctxt": 0 }, "value": "intersection", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 55, - "end": 72, + "start": 54, + "end": 71, "ctxt": 0 }, "typeAnnotation": { "type": "TsIntersectionType", "span": { - "start": 57, - "end": 72, + "start": 56, + "end": 71, "ctxt": 0 }, "types": [ { "type": "TsKeywordType", "span": { - "start": 57, - "end": 63, + "start": 56, + "end": 62, "ctxt": 0 }, "kind": "number" @@ -135,8 +135,8 @@ { "type": "TsKeywordType", "span": { - "start": 66, - "end": 72, + "start": 65, + "end": 71, "ctxt": 0 }, "kind": "string" @@ -154,8 +154,8 @@ { "type": "VariableDeclaration", "span": { - "start": 75, - "end": 118, + "start": 73, + "end": 116, "ctxt": 0 }, "kind": "let", @@ -164,38 +164,38 @@ { "type": "VariableDeclarator", "span": { - "start": 79, - "end": 117, + "start": 77, + "end": 115, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 79, - "end": 90, + "start": 77, + "end": 88, "ctxt": 0 }, "value": "precedence1", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 90, - "end": 117, + "start": 88, + "end": 115, "ctxt": 0 }, "typeAnnotation": { "type": "TsUnionType", "span": { - "start": 92, - "end": 117, + "start": 90, + "end": 115, "ctxt": 0 }, "types": [ { "type": "TsKeywordType", "span": { - "start": 92, - "end": 98, + "start": 90, + "end": 96, "ctxt": 0 }, "kind": "number" @@ -203,16 +203,16 @@ { "type": "TsIntersectionType", "span": { - "start": 101, - "end": 117, + "start": 99, + "end": 115, "ctxt": 0 }, "types": [ { "type": "TsKeywordType", "span": { - "start": 101, - "end": 107, + "start": 99, + "end": 105, "ctxt": 0 }, "kind": "string" @@ -220,8 +220,8 @@ { "type": "TsKeywordType", "span": { - "start": 110, - "end": 117, + "start": 108, + "end": 115, "ctxt": 0 }, "kind": "boolean" @@ -241,8 +241,8 @@ { "type": "VariableDeclaration", "span": { - "start": 120, - "end": 163, + "start": 117, + "end": 160, "ctxt": 0 }, "kind": "let", @@ -251,46 +251,46 @@ { "type": "VariableDeclarator", "span": { - "start": 124, - "end": 162, + "start": 121, + "end": 159, "ctxt": 0 }, "id": { "type": "Identifier", "span": { - "start": 124, - "end": 135, + "start": 121, + "end": 132, "ctxt": 0 }, "value": "precedence2", "typeAnnotation": { "type": "TsTypeAnnotation", "span": { - "start": 135, - "end": 162, + "start": 132, + "end": 159, "ctxt": 0 }, "typeAnnotation": { "type": "TsUnionType", "span": { - "start": 137, - "end": 162, + "start": 134, + "end": 159, "ctxt": 0 }, "types": [ { "type": "TsIntersectionType", "span": { - "start": 137, - "end": 152, + "start": 134, + "end": 149, "ctxt": 0 }, "types": [ { "type": "TsKeywordType", "span": { - "start": 137, - "end": 143, + "start": 134, + "end": 140, "ctxt": 0 }, "kind": "number" @@ -298,8 +298,8 @@ { "type": "TsKeywordType", "span": { - "start": 146, - "end": 152, + "start": 143, + "end": 149, "ctxt": 0 }, "kind": "string" @@ -309,8 +309,8 @@ { "type": "TsKeywordType", "span": { - "start": 155, - "end": 162, + "start": 152, + "end": 159, "ctxt": 0 }, "kind": "boolean" diff --git a/testing/src/output.rs b/testing/src/output.rs index dd9b6ac457d..35ce2f59131 100644 --- a/testing/src/output.rs +++ b/testing/src/output.rs @@ -88,10 +88,16 @@ impl NormalizedOutput { path_for_actual.display() ); - Err(Diff { + let diff = Diff { expected: NormalizedOutput(expected), actual: self, - }) + }; + + if ::std::env::var("CI").unwrap_or(String::from("0")) == "1" { + println!("Diff:\n{:?}", diff); + } + + Err(diff) } }