master..7ca73c2 · bat · git.iko.soy

.github/.codecov.ymldeleted−1

since splitsnapshots

unifiedsplit

@@ -1 +0,0 @@

1−comment: false

.github/FUNDING.yml+3−1

@@ -1 +1,3 @@

1+# These are supported funding model platforms

2+

1−github: [sharkdp, keith-hall, Enselic]

3+github: sharkdp

.github/ISSUE_TEMPLATE/bug_report.mddeleted−64

@@ -1,64 +0,0 @@

1−---

2−name: Bug Report

3−about: Report a bug.

4−title: ""

5−labels: bug

6−assignees: ''

7−

8−---

9−

10−<!--

11−

12−Hey there, thank you for reporting a bug!

13−

14−Please note that the following bugs have already been reported:

15−

16−* dpkg: error processing archive /some/path/some-program.deb (--unpack):

17− trying to overwrite '/usr/.crates2.json'

18−

19− See https://github.com/sharkdp/bat/issues/938

20−

21−-->

22−

23−**What steps will reproduce the bug?**

24−

25−1. step 1

26−2. step 2

27−3. ...

28−

29−**What happens?**

30−

31−...

32−

33−**What did you expect to happen instead?**

34−

35−...

36−

37−

38−**How did you install `bat`?**

39−

40−

41−

42−---

43−

44−**bat version and environment**

45−

46−<!--

47−In order to reproduce your issue, please add some information about the environment

48−in which you're running bat. To do this, run the full `bat` command that demonstrates

49−the bug, and attach the `--diagnostic` option:

50−

51− bat [other options and arguments…] --diagnostic

52−

53−Finally, paste the Markdown output here. Please make sure that it does not reveal any

54−personal information.

55−

56−

57−If you are running bat 0.17.1 or older (where --diagnostic is not available), please

58−run the script at

59−

60− https://github.com/sharkdp/bat/blob/master/diagnostics/info.sh

61−

62−(click "Raw" to get the actual source code) and paste the Markdown output here. If you

63−are on Windows, please let us know your bat version and your Windows version.

64−-->

.github/ISSUE_TEMPLATE/config.ymldeleted−1

@@ -1 +0,0 @@

1−blank_issues_enabled: true

.github/ISSUE_TEMPLATE/feature_request.mddeleted−9

@@ -1,9 +0,0 @@

1−---

2−name: Feature Request

3−about: Suggest an idea for this project.

4−title: ''

5−labels: feature-request

6−assignees: ''

7−

8−---

9−

.github/ISSUE_TEMPLATE/question.mddeleted−11

@@ -1,11 +0,0 @@

1−---

2−name: Question

3−about: Ask a question about 'bat'.

4−title: ''

5−labels: question

6−assignees: ''

7−

8−---

9−

10−<!-- Using a normal ticket is still fine, but feel free to ask your

11−questions about bat on https://github.com/sharkdp/bat/discussions instead. -->

.github/ISSUE_TEMPLATE/syntax_request.mddeleted−29

@@ -1,29 +0,0 @@

1−---

2−name: Syntax Request

3−about: Request adding a new syntax to bat.

4−title: ""

5−labels: syntax-request

6−assignees: ''

7−

8−---

9−

10−<!--

11−BEFORE YOU MAKE A REQUEST:

12−

13−Are you looking to add a new syntax to use on one of your devices?

14−Bat supports locally-installed language definitions. See the link below:

15−

16−https://github.com/sharkdp/bat#adding-new-syntaxes--language-definitions

17−

18−If you think adding this syntax would help others as well, please make sure that it meets our

19−guidelines for adding new syntaxes:

20−

21− - 10,000 downloads on packagecontrol.io

22−-->

23−

24−

25−**Syntax:**

26−[Name or description of the syntax/language here]

27−

28−**Guideline Criteria:**

29−[packagecontro.io link here]

.github/dependabot.ymldeleted−18

@@ -1,18 +0,0 @@

1−version: 2

2−updates:

3−- package-ecosystem: cargo

4− directory: "/"

5− schedule:

6− interval: monthly

7− time: "04:00"

8− timezone: Europe/Berlin

9− ignore:

10− - dependency-name: git2

11− versions:

12− - 0.13.17

13−- package-ecosystem: gitsubmodule

14− directory: "/"

15− schedule:

16− interval: monthly

17− time: "04:00"

18− timezone: Europe/Berlin

.github/workflows/CICD.ymldeleted−482

@@ -1,482 +0,0 @@

1−name: CICD

2−

3−env:

4− MIN_SUPPORTED_RUST_VERSION: "1.51.0"

5− CICD_INTERMEDIATES_DIR: "_cicd-intermediates"

6−

7−on:

8− workflow_dispatch:

9− pull_request:

10− push:

11− branches:

12− - master

13− tags:

14− - '*'

15−

16−jobs:

17− ensure_cargo_fmt:

18− name: Ensure 'cargo fmt' has been run

19− runs-on: ubuntu-20.04

20− steps:

21− - uses: actions-rs/toolchain@v1

22− with:

23− toolchain: stable

24− default: true

25− profile: minimal

26− components: rustfmt

27− - uses: actions/checkout@v2

28− - run: cargo fmt -- --check

29−

30− license_checks:

31− name: License checks

32− runs-on: ubuntu-20.04

33− steps:

34− - uses: actions/checkout@v2

35− with:

36− submodules: true # we especially want to perform license checks on submodules

37− - run: tests/scripts/license-checks.sh

38−

39− min_version:

40− name: Minimum supported rust version

41− runs-on: ubuntu-20.04

42− steps:

43− - name: Checkout source code

44− uses: actions/checkout@v2

45−

46− - name: Install rust toolchain (v${{ env.MIN_SUPPORTED_RUST_VERSION }})

47− uses: actions-rs/toolchain@v1

48− with:

49− toolchain: ${{ env.MIN_SUPPORTED_RUST_VERSION }}

50− default: true

51− profile: minimal # minimal component installation (ie, no documentation)

52− components: clippy

53− - name: Run clippy (on minimum supported rust version to prevent warnings we can't fix)

54− uses: actions-rs/cargo@v1

55− with:

56− command: clippy

57− args: --locked --all-targets --all-features

58− - name: Run tests

59− uses: actions-rs/cargo@v1

60− with:

61− command: test

62− args: --locked

63−

64− test_with_new_syntaxes_and_themes:

65− name: Run tests with updated syntaxes and themes

66− runs-on: ubuntu-20.04

67− steps:

68− - name: Git checkout

69− uses: actions/checkout@v2

70− with:

71− submodules: true # we need all syntax and theme submodules

72− - name: Install Rust toolchain

73− uses: actions-rs/toolchain@v1

74− with:

75− toolchain: stable

76− default: true

77− profile: minimal

78− - name: Build and install bat

79− uses: actions-rs/cargo@v1

80− with:

81− command: install

82− args: --locked --path .

83− - name: Rebuild binary assets (syntaxes and themes)

84− run: bash assets/create.sh

85− - name: Build and install bat with updated assets

86− uses: actions-rs/cargo@v1

87− with:

88− command: install

89− args: --locked --path .

90− - name: Run unit tests with new syntaxes and themes

91− uses: actions-rs/cargo@v1

92− with:

93− command: test

94− args: --locked --release

95− - name: Run ignored-by-default unit tests with new syntaxes and themes

96− uses: actions-rs/cargo@v1

97− with:

98− command: test

99− args: --locked --release -- --ignored

100− - name: Syntax highlighting regression test

101− run: tests/syntax-tests/regression_test.sh

102− - name: List of languages

103− run: bat --list-languages

104− - name: List of themes

105− run: bat --list-themes

106− - name: Test custom assets

107− run: tests/syntax-tests/test_custom_assets.sh

108−

109− documentation:

110− name: Documentation

111− runs-on: ubuntu-20.04

112− steps:

113− - name: Git checkout

114− uses: actions/checkout@v2

115− - name: Install Rust toolchain

116− uses: actions-rs/toolchain@v1

117− with:

118− toolchain: stable

119− default: true

120− profile: minimal

121− - name: Print -h

122− uses: actions-rs/cargo@v1

123− with:

124− command: run

125− args: --locked -- -h

126− - name: Print --help

127− uses: actions-rs/cargo@v1

128− with:

129− command: run

130− args: --locked -- --help

131− - name: Show man page

132− run: man $(find . -name bat.1)

133− - name: Check documentation

134− env:

135− RUSTDOCFLAGS: -D warnings

136− uses: actions-rs/cargo@v1

137− with:

138− command: doc

139− args: --locked --no-deps --document-private-items --all-features

140−

141− build:

142− name: ${{ matrix.job.target }} (${{ matrix.job.os }})

143− runs-on: ${{ matrix.job.os }}

144− strategy:

145− fail-fast: false

146− matrix:

147− job:

148− - { target: aarch64-unknown-linux-gnu , os: ubuntu-20.04, use-cross: true }

149− - { target: arm-unknown-linux-gnueabihf , os: ubuntu-20.04, use-cross: true }

150− - { target: arm-unknown-linux-musleabihf, os: ubuntu-20.04, use-cross: true }

151− - { target: i686-pc-windows-msvc , os: windows-2019 }

152− - { target: i686-unknown-linux-gnu , os: ubuntu-20.04, use-cross: true }

153− - { target: i686-unknown-linux-musl , os: ubuntu-20.04, use-cross: true }

154− - { target: x86_64-apple-darwin , os: macos-10.15 }

155− - { target: x86_64-pc-windows-gnu , os: windows-2019 }

156− - { target: x86_64-pc-windows-msvc , os: windows-2019 }

157− - { target: x86_64-unknown-linux-gnu , os: ubuntu-20.04, use-cross: true }

158− - { target: x86_64-unknown-linux-musl , os: ubuntu-20.04, use-cross: true }

159− steps:

160− - name: Checkout source code

161− uses: actions/checkout@v2

162−

163− - name: Install prerequisites

164− shell: bash

165− run: |

166− case ${{ matrix.job.target }} in

167− arm-unknown-linux-*) sudo apt-get -y update ; sudo apt-get -y install gcc-arm-linux-gnueabihf ;;

168− aarch64-unknown-linux-gnu) sudo apt-get -y update ; sudo apt-get -y install gcc-aarch64-linux-gnu ;;

169− esac

170−

171− - name: Extract crate information

172− shell: bash

173− run: |

174− echo "PROJECT_NAME=$(sed -n 's/^name = "$.*$"/\1/p' Cargo.toml | head -n1)" >> $GITHUB_ENV

175− echo "PROJECT_VERSION=$(sed -n 's/^version = "$.*$"/\1/p' Cargo.toml | head -n1)" >> $GITHUB_ENV

176− echo "PROJECT_MAINTAINER=$(sed -n 's/^authors = \["$.*$"\]/\1/p' Cargo.toml)" >> $GITHUB_ENV

177− echo "PROJECT_HOMEPAGE=$(sed -n 's/^homepage = "$.*$"/\1/p' Cargo.toml)" >> $GITHUB_ENV

178−

179− - name: Install Rust toolchain

180− uses: actions-rs/toolchain@v1

181− with:

182− toolchain: stable

183− target: ${{ matrix.job.target }}

184− override: true

185− profile: minimal # minimal component installation (ie, no documentation)

186−

187− - name: Show version information (Rust, cargo, GCC)

188− shell: bash

189− run: |

190− gcc --version || true

191− rustup -V

192− rustup toolchain list

193− rustup default

194− cargo -V

195− rustc -V

196−

197− - name: Build

198− uses: actions-rs/cargo@v1

199− with:

200− use-cross: ${{ matrix.job.use-cross }}

201− command: build

202− args: --locked --release --target=${{ matrix.job.target }}

203−

204− - name: Strip debug information from executable

205− id: strip

206− shell: bash

207− run: |

208− # Figure out suffix of binary

209− EXE_suffix=""

210− case ${{ matrix.job.target }} in

211− *-pc-windows-*) EXE_suffix=".exe" ;;

212− esac;

213−

214− # Figure out what strip tool to use if any

215− STRIP="strip"

216− case ${{ matrix.job.target }} in

217− arm-unknown-linux-*) STRIP="arm-linux-gnueabihf-strip" ;;

218− aarch64-unknown-linux-gnu) STRIP="aarch64-linux-gnu-strip" ;;

219− *-pc-windows-msvc) STRIP="" ;;

220− esac;

221−

222− # Setup paths

223− BIN_DIR="${{ env.CICD_INTERMEDIATES_DIR }}/stripped-release-bin/"

224− mkdir -p "${BIN_DIR}"

225− BIN_NAME="${{ env.PROJECT_NAME }}${EXE_suffix}"

226− BIN_PATH="${BIN_DIR}/${BIN_NAME}"

227−

228− # Copy the release build binary to the result location

229− cp "target/${{ matrix.job.target }}/release/${BIN_NAME}" "${BIN_DIR}"

230−

231− # Also strip if possible

232− if [ -n "${STRIP}" ]; then

233− "${STRIP}" "${BIN_PATH}"

234− fi

235−

236− # Let subsequent steps know where to find the (stripped) bin

237− echo ::set-output name=BIN_PATH::${BIN_PATH}

238− echo ::set-output name=BIN_NAME::${BIN_NAME}

239−

240− - name: Set testing options

241− id: test-options

242− shell: bash

243− run: |

244− # test only library unit tests and binary for arm-type targets

245− unset CARGO_TEST_OPTIONS

246− unset CARGO_TEST_OPTIONS ; case ${{ matrix.job.target }} in arm-* | aarch64-*) CARGO_TEST_OPTIONS="--lib --bin ${PROJECT_NAME}" ;; esac;

247− echo ::set-output name=CARGO_TEST_OPTIONS::${CARGO_TEST_OPTIONS}

248−

249− - name: Run tests

250− uses: actions-rs/cargo@v1

251− with:

252− use-cross: ${{ matrix.job.use-cross }}

253− command: test

254− args: --locked --target=${{ matrix.job.target }} ${{ steps.test-options.outputs.CARGO_TEST_OPTIONS}}

255−

256− - name: Run bat

257− uses: actions-rs/cargo@v1

258− with:

259− use-cross: ${{ matrix.job.use-cross }}

260− command: run

261− args: --locked --target=${{ matrix.job.target }} -- --paging=never --color=always --theme=ansi Cargo.toml src/config.rs

262−

263− - name: Show diagnostics (bat --diagnostic)

264− uses: actions-rs/cargo@v1

265− with:

266− use-cross: ${{ matrix.job.use-cross }}

267− command: run

268− args: --locked --target=${{ matrix.job.target }} -- --paging=never --color=always --theme=ansi Cargo.toml src/config.rs --diagnostic

269−

270− - name: "Feature check: regex-onig"

271− uses: actions-rs/cargo@v1

272− with:

273− use-cross: ${{ matrix.job.use-cross }}

274− command: check

275− args: --locked --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig

276−

277− - name: "Feature check: regex-onig,git"

278− uses: actions-rs/cargo@v1

279− with:

280− use-cross: ${{ matrix.job.use-cross }}

281− command: check

282− args: --locked --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,git

283−

284− - name: "Feature check: regex-onig,paging"

285− uses: actions-rs/cargo@v1

286− with:

287− use-cross: ${{ matrix.job.use-cross }}

288− command: check

289− args: --locked --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,paging

290−

291− - name: "Feature check: regex-onig,git,paging"

292− uses: actions-rs/cargo@v1

293− with:

294− use-cross: ${{ matrix.job.use-cross }}

295− command: check

296− args: --locked --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,git,paging

297−

298− - name: "Feature check: minimal-application"

299− uses: actions-rs/cargo@v1

300− with:

301− use-cross: ${{ matrix.job.use-cross }}

302− command: check

303− args: --locked --target=${{ matrix.job.target }} --verbose --no-default-features --features minimal-application

304−

305− - name: Create tarball

306− id: package

307− shell: bash

308− run: |

309− PKG_suffix=".tar.gz" ; case ${{ matrix.job.target }} in *-pc-windows-*) PKG_suffix=".zip" ;; esac;

310− PKG_BASENAME=${PROJECT_NAME}-v${PROJECT_VERSION}-${{ matrix.job.target }}

311− PKG_NAME=${PKG_BASENAME}${PKG_suffix}

312− echo ::set-output name=PKG_NAME::${PKG_NAME}

313−

314− PKG_STAGING="${{ env.CICD_INTERMEDIATES_DIR }}/package"

315− ARCHIVE_DIR="${PKG_STAGING}/${PKG_BASENAME}/"

316− mkdir -p "${ARCHIVE_DIR}"

317− mkdir -p "${ARCHIVE_DIR}/autocomplete"

318−

319− # Binary

320− cp "${{ steps.strip.outputs.BIN_PATH }}" "$ARCHIVE_DIR"

321−

322− # Man page

323− cp 'target/${{ matrix.job.target }}/release/build/${{ env.PROJECT_NAME }}'-*/out/assets/manual/bat.1 "$ARCHIVE_DIR"

324−

325− # README, LICENSE and CHANGELOG files

326− cp "README.md" "LICENSE-MIT" "LICENSE-APACHE" "CHANGELOG.md" "$ARCHIVE_DIR"

327−

328− # Autocompletion files

329− cp 'target/${{ matrix.job.target }}/release/build/${{ env.PROJECT_NAME }}'-*/out/assets/completions/bat.bash "$ARCHIVE_DIR/autocomplete/${{ env.PROJECT_NAME }}.bash"

330− cp 'target/${{ matrix.job.target }}/release/build/${{ env.PROJECT_NAME }}'-*/out/assets/completions/bat.fish "$ARCHIVE_DIR/autocomplete/${{ env.PROJECT_NAME }}.fish"

331− cp 'target/${{ matrix.job.target }}/release/build/${{ env.PROJECT_NAME }}'-*/out/assets/completions/_bat.ps1 "$ARCHIVE_DIR/autocomplete/_${{ env.PROJECT_NAME }}.ps1"

332− cp 'target/${{ matrix.job.target }}/release/build/${{ env.PROJECT_NAME }}'-*/out/assets/completions/bat.zsh "$ARCHIVE_DIR/autocomplete/${{ env.PROJECT_NAME }}.zsh"

333−

334− # base compressed package

335− pushd "${PKG_STAGING}/" >/dev/null

336− case ${{ matrix.job.target }} in

337− *-pc-windows-*) 7z -y a "${PKG_NAME}" "${PKG_BASENAME}"/* | tail -2 ;;

338− *) tar czf "${PKG_NAME}" "${PKG_BASENAME}"/* ;;

339− esac;

340− popd >/dev/null

341−

342− # Let subsequent steps know where to find the compressed package

343− echo ::set-output name=PKG_PATH::"${PKG_STAGING}/${PKG_NAME}"

344−

345− - name: Create Debian package

346− id: debian-package

347− shell: bash

348− if: startsWith(matrix.job.os, 'ubuntu')

349− run: |

350− COPYRIGHT_YEARS="2018 - "$(date "+%Y")

351− DPKG_STAGING="${{ env.CICD_INTERMEDIATES_DIR }}/debian-package"

352− DPKG_DIR="${DPKG_STAGING}/dpkg"

353− mkdir -p "${DPKG_DIR}"

354−

355− DPKG_BASENAME=${PROJECT_NAME}

356− DPKG_CONFLICTS=${PROJECT_NAME}-musl

357− case ${{ matrix.job.target }} in *-musl) DPKG_BASENAME=${PROJECT_NAME}-musl ; DPKG_CONFLICTS=${PROJECT_NAME} ;; esac;

358− DPKG_VERSION=${PROJECT_VERSION}

359−

360− unset DPKG_ARCH

361− case ${{ matrix.job.target }} in

362− aarch64-*-linux-*) DPKG_ARCH=arm64 ;;

363− arm-*-linux-*hf) DPKG_ARCH=armhf ;;

364− i686-*-linux-*) DPKG_ARCH=i686 ;;

365− x86_64-*-linux-*) DPKG_ARCH=amd64 ;;

366− *) DPKG_ARCH=notset ;;

367− esac;

368−

369− DPKG_NAME="${DPKG_BASENAME}_${DPKG_VERSION}_${DPKG_ARCH}.deb"

370− echo ::set-output name=DPKG_NAME::${DPKG_NAME}

371−

372− # Binary

373− install -Dm755 "${{ steps.strip.outputs.BIN_PATH }}" "${DPKG_DIR}/usr/bin/${{ steps.strip.outputs.BIN_NAME }}"

374−

375− # Man page

376− install -Dm644 'target/${{ matrix.job.target }}/release/build/${{ env.PROJECT_NAME }}'-*/out/assets/manual/bat.1 "${DPKG_DIR}/usr/share/man/man1/${{ env.PROJECT_NAME }}.1"

377− gzip -n --best "${DPKG_DIR}/usr/share/man/man1/${{ env.PROJECT_NAME }}.1"

378−

379− # Autocompletion files

380− install -Dm644 'target/${{ matrix.job.target }}/release/build/${{ env.PROJECT_NAME }}'-*/out/assets/completions/bat.bash "${DPKG_DIR}/usr/share/bash-completion/completions/${{ env.PROJECT_NAME }}"

381− install -Dm644 'target/${{ matrix.job.target }}/release/build/${{ env.PROJECT_NAME }}'-*/out/assets/completions/bat.fish "${DPKG_DIR}/usr/share/fish/vendor_completions.d/${{ env.PROJECT_NAME }}.fish"

382− install -Dm644 'target/${{ matrix.job.target }}/release/build/${{ env.PROJECT_NAME }}'-*/out/assets/completions/bat.zsh "${DPKG_DIR}/usr/share/zsh/vendor-completions/_${{ env.PROJECT_NAME }}"

383−

384− # README and LICENSE

385− install -Dm644 "README.md" "${DPKG_DIR}/usr/share/doc/${DPKG_BASENAME}/README.md"

386− install -Dm644 "LICENSE-MIT" "${DPKG_DIR}/usr/share/doc/${DPKG_BASENAME}/LICENSE-MIT"

387− install -Dm644 "LICENSE-APACHE" "${DPKG_DIR}/usr/share/doc/${DPKG_BASENAME}/LICENSE-APACHE"

388− install -Dm644 "CHANGELOG.md" "${DPKG_DIR}/usr/share/doc/${DPKG_BASENAME}/changelog"

389− gzip -n --best "${DPKG_DIR}/usr/share/doc/${DPKG_BASENAME}/changelog"

390−

391− cat > "${DPKG_DIR}/usr/share/doc/${DPKG_BASENAME}/copyright" <<EOF

392− Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/

393− Upstream-Name: ${{ env.PROJECT_NAME }}

394− Source: ${{ env.PROJECT_HOMEPAGE }}

395−

396− Files: *

397− Copyright: ${{ env.PROJECT_MAINTAINER }}

398− Copyright: $COPYRIGHT_YEARS ${{ env.PROJECT_MAINTAINER }}

399− License: Apache-2.0 or MIT

400−

401− License: Apache-2.0

402− On Debian systems, the complete text of the Apache-2.0 can be found in the

403− file /usr/share/common-licenses/Apache-2.0.

404−

405− License: MIT

406− Permission is hereby granted, free of charge, to any

407− person obtaining a copy of this software and associated

408− documentation files (the "Software"), to deal in the

409− Software without restriction, including without

410− limitation the rights to use, copy, modify, merge,

411− publish, distribute, sublicense, and/or sell copies of

412− the Software, and to permit persons to whom the Software

413− is furnished to do so, subject to the following

414− conditions:

415− .

416− The above copyright notice and this permission notice

417− shall be included in all copies or substantial portions

418− of the Software.

419− .

420− THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF

421− ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED

422− TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A

423− PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT

424− SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

425− CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

426− OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR

427− IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

428− DEALINGS IN THE SOFTWARE.

429− EOF

430− chmod 644 "${DPKG_DIR}/usr/share/doc/${DPKG_BASENAME}/copyright"

431−

432− # control file

433− mkdir -p "${DPKG_DIR}/DEBIAN"

434− cat > "${DPKG_DIR}/DEBIAN/control" <<EOF

435− Package: ${DPKG_BASENAME}

436− Version: ${DPKG_VERSION}

437− Section: utils

438− Priority: optional

439− Maintainer: ${{ env.PROJECT_MAINTAINER }}

440− Homepage: ${{ env.PROJECT_HOMEPAGE }}

441− Architecture: ${DPKG_ARCH}

442− Provides: ${{ env.PROJECT_NAME }}

443− Conflicts: ${DPKG_CONFLICTS}

444− Description: cat(1) clone with wings.

445− A cat(1) clone with syntax highlighting and Git integration.

446− EOF

447−

448− DPKG_PATH="${DPKG_STAGING}/${DPKG_NAME}"

449− echo ::set-output name=DPKG_PATH::${DPKG_PATH}

450−

451− # build dpkg

452− fakeroot dpkg-deb --build "${DPKG_DIR}" "${DPKG_PATH}"

453−

454− - name: "Artifact upload: tarball"

455− uses: actions/upload-artifact@master

456− with:

457− name: ${{ steps.package.outputs.PKG_NAME }}

458− path: ${{ steps.package.outputs.PKG_PATH }}

459−

460− - name: "Artifact upload: Debian package"

461− uses: actions/upload-artifact@master

462− if: steps.debian-package.outputs.DPKG_NAME

463− with:

464− name: ${{ steps.debian-package.outputs.DPKG_NAME }}

465− path: ${{ steps.debian-package.outputs.DPKG_PATH }}

466−

467− - name: Check for release

468− id: is-release

469− shell: bash

470− run: |

471− unset IS_RELEASE ; if [[ $GITHUB_REF =~ ^refs/tags/v[0-9].* ]]; then IS_RELEASE='true' ; fi

472− echo ::set-output name=IS_RELEASE::${IS_RELEASE}

473−

474− - name: Publish archives and packages

475− uses: softprops/action-gh-release@v1

476− if: steps.is-release.outputs.IS_RELEASE

477− with:

478− files: |

479− ${{ steps.package.outputs.PKG_PATH }}

480− ${{ steps.debian-package.outputs.DPKG_PATH }}

481− env:

482− GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore−3

@@ -2,8 +2,5 @@

2**/*.rs.bk

3

4# Generated files

5−/assets/completions/bat.bash

6/assets/completions/bat.fish

5/assets/completions/bat.fish

7−/assets/completions/bat.zsh

8/assets/manual/bat.1

6/assets/manual/bat.1

9−/assets/metadata.yaml

.gitmodules+58−136

@@ -1,32 +1,32 @@

1[submodule "assets/syntaxes/Elixir"]

2− path = assets/syntaxes/02_Extra/Elixir

2+ path = assets/syntaxes/Elixir

3 url = https://github.com/princemaple/elixir-sublime-syntax/

4[submodule "assets/syntaxes/Packages"]

5− path = assets/syntaxes/01_Packages

5+ path = assets/syntaxes/Packages

6 url = https://github.com/sublimehq/Packages/

7[submodule "assets/syntaxes/TOML"]

8− path = assets/syntaxes/02_Extra/TOML

8+ path = assets/syntaxes/TOML

9 url = https://github.com/jasonwilliams/sublime_toml_highlighting

10[submodule "assets/syntaxes/Julia"]

11− path = assets/syntaxes/02_Extra/Julia

11+ path = assets/syntaxes/Julia

12 url = https://github.com/JuliaEditorSupport/Julia-sublime

13[submodule "assets/themes/sublime-monokai-extended"]

14 path = assets/themes/sublime-monokai-extended

15 url = https://github.com/jonschlinkert/sublime-monokai-extended

16[submodule "assets/syntaxes/Docker"]

17− path = assets/syntaxes/02_Extra/Docker

17+ path = assets/syntaxes/Docker

18 url = https://github.com/asbjornenge/Docker.tmbundle

19[submodule "assets/syntaxes/VimL"]

20− path = assets/syntaxes/02_Extra/VimL

20+ path = assets/syntaxes/VimL

21 url = https://github.com/SalGnt/Sublime-VimL

22[submodule "assets/syntaxes/INI"]

23− path = assets/syntaxes/02_Extra/INI

23+ path = assets/syntaxes/INI

24 url = https://github.com/clintberry/sublime-text-2-ini

25[submodule "assets/syntaxes/CMake"]

26− path = assets/syntaxes/02_Extra/CMake

26+ path = assets/syntaxes/CMake

27 url = https://github.com/zyxar/Sublime-CMakeLists

28[submodule "assets/syntaxes/LESS"]

29− path = assets/syntaxes/02_Extra/LESS

29+ path = assets/syntaxes/LESS

30 url = https://github.com/danro/LESS-sublime

31[submodule "assets/themes/DarkNeon"]

32 path = assets/themes/DarkNeon

@@ -41,206 +41,128 @@

41 path = assets/themes/TwoDark

42 url = https://github.com/erremauro/TwoDark

43[submodule "assets/syntaxes/AWK"]

44− path = assets/syntaxes/02_Extra/AWK

44+ path = assets/syntaxes/AWK

45 url = https://github.com/JohnNilsson/awk-sublime

46[submodule "assets/syntaxes/Nix"]

47− path = assets/syntaxes/02_Extra/Nix

47+ path = assets/syntaxes/Nix

48 url = https://github.com/wmertens/sublime-nix

49[submodule "assets/themes/zenburn"]

50 path = assets/themes/zenburn

51 url = https://github.com/colinta/zenburn.git

52[submodule "assets/syntaxes/Kotlin"]

53− path = assets/syntaxes/02_Extra/Kotlin

53+ path = assets/syntaxes/Kotlin

54 url = https://github.com/vkostyukov/kotlin-sublime-package

55[submodule "assets/syntaxes/Elm"]

56− path = assets/syntaxes/02_Extra/Elm

56+ path = assets/syntaxes/Elm

57 url = https://github.com/elm-community/SublimeElmLanguageSupport

58[submodule "assets/syntaxes/TypeScript"]

59− path = assets/syntaxes/02_Extra/TypeScript

59+ path = assets/syntaxes/TypeScript

60 url = https://github.com/Microsoft/TypeScript-Sublime-Plugin

61[submodule "assets/syntaxes/Puppet"]

62− path = assets/syntaxes/02_Extra/Puppet

62+ path = assets/syntaxes/Puppet

63 url = https://github.com/russCloak/SublimePuppet

64+[submodule "assets/syntaxes/CSV"]

65+ path = assets/syntaxes/CSV

66+ url = https://github.com/wadetb/Sublime-Text-Advanced-CSV

64[submodule "assets/themes/onehalf"]

67[submodule "assets/themes/onehalf"]

65 path = assets/themes/onehalf

68 path = assets/themes/onehalf

66 url = https://github.com/sonph/onehalf

69 url = https://github.com/sonph/onehalf

67[submodule "assets/syntaxes/JavaScript (Babel)"]

70[submodule "assets/syntaxes/JavaScript (Babel)"]

68− path = assets/syntaxes/02_Extra/JavaScript (Babel)

71+ path = assets/syntaxes/JavaScript (Babel)

69 url = https://github.com/babel/babel-sublime

72 url = https://github.com/babel/babel-sublime

73+[submodule "assets/syntaxes/Cabal"]

74+ path = assets/syntaxes/Cabal

75+ url = https://github.com/SublimeHaskell/SublimeHaskell

76+[submodule "assets/syntaxes/Dart"]

77+ path = assets/syntaxes/Dart

78+ url = https://github.com/guillermooo/dart-sublime-bundle

70[submodule "assets/syntaxes/FSharp"]

79[submodule "assets/syntaxes/FSharp"]

71− path = assets/syntaxes/02_Extra/FSharp

80+ path = assets/syntaxes/FSharp

72 url = https://github.com/hoest/sublimetext-fsharp

81 url = https://github.com/hoest/sublimetext-fsharp

73[submodule "assets/syntaxes/PureScript"]

82[submodule "assets/syntaxes/PureScript"]

74− path = assets/syntaxes/02_Extra/PureScript

83+ path = assets/syntaxes/PureScript

75 url = https://github.com/tellnobody1/sublime-purescript-syntax

84 url = https://github.com/tellnobody1/sublime-purescript-syntax

76[submodule "assets/syntaxes/Swift"]

85[submodule "assets/syntaxes/Swift"]

77− path = assets/syntaxes/02_Extra/Swift

86+ path = assets/syntaxes/Swift

78 url = https://github.com/quiqueg/Swift-Sublime-Package

87 url = https://github.com/quiqueg/Swift-Sublime-Package

79[submodule "assets/syntaxes/Crystal"]

88[submodule "assets/syntaxes/Crystal"]

80− path = assets/syntaxes/02_Extra/Crystal

89+ path = assets/syntaxes/Crystal

81 url = https://github.com/crystal-lang-tools/sublime-crystal.git

90 url = https://github.com/crystal-lang-tools/sublime-crystal.git

82[submodule "assets/syntaxes/PowerShell"]

91[submodule "assets/syntaxes/PowerShell"]

83− path = assets/syntaxes/02_Extra/PowerShell

92+ path = assets/syntaxes/PowerShell

84 url = https://github.com/PowerShell/EditorSyntax

93 url = https://github.com/PowerShell/EditorSyntax

85[submodule "assets/syntaxes/Robot"]

94[submodule "assets/syntaxes/Robot"]

86− path = assets/syntaxes/02_Extra/Robot

95+ path = assets/syntaxes/Robot

87 url = https://github.com/andriyko/sublime-robot-framework-assistant.git

96 url = https://github.com/andriyko/sublime-robot-framework-assistant.git

88[submodule "assets/themes/sublime-snazzy"]

97[submodule "assets/themes/sublime-snazzy"]

89 path = assets/themes/sublime-snazzy

98 path = assets/themes/sublime-snazzy

90 url = https://github.com/greggb/sublime-snazzy

99 url = https://github.com/greggb/sublime-snazzy

100+[submodule "assets/syntaxes/AsciiDoc"]

101+ path = assets/syntaxes/AsciiDoc

102+ url = https://github.com/SublimeText/AsciiDoc.git

91[submodule "assets/syntaxes/Assembly (ARM)"]

103[submodule "assets/syntaxes/Assembly (ARM)"]

92− path = assets/syntaxes/02_Extra/Assembly (ARM)

104+ path = assets/syntaxes/Assembly (ARM)

93 url = https://github.com/tvi/Sublime-ARM-Assembly

105 url = https://github.com/tvi/Sublime-ARM-Assembly

106+[submodule "assets/syntaxes/syslog-syntax"]

107+ path = assets/syntaxes/Syslog

108+ url = https://github.com/caos21/syslog-syntax.git

109+ branch = master

94[submodule "assets/syntaxes/protobuf-syntax-highlighting"]

110[submodule "assets/syntaxes/protobuf-syntax-highlighting"]

95− path = assets/syntaxes/02_Extra/Protobuf

111+ path = assets/syntaxes/Protobuf

96 url = https://github.com/VcamX/protobuf-syntax-highlighting.git

112 url = https://github.com/VcamX/protobuf-syntax-highlighting.git

97 branch = master

113 branch = master

98[submodule "assets/syntaxes/Terraform"]

114[submodule "assets/syntaxes/Terraform"]

99− path = assets/syntaxes/02_Extra/Terraform

115+ path = assets/syntaxes/Terraform

100 url = https://github.com/alexlouden/Terraform.tmLanguage.git

116 url = https://github.com/alexlouden/Terraform.tmLanguage.git

101[submodule "assets/syntaxes/Jsonnet"]

117[submodule "assets/syntaxes/Jsonnet"]

102− path = assets/syntaxes/02_Extra/Jsonnet

118+ path = assets/syntaxes/Jsonnet

103 url = https://github.com/gburiola/sublime-jsonnet-syntax.git

119 url = https://github.com/gburiola/sublime-jsonnet-syntax.git

104[submodule "assets/syntaxes/varlink"]

120[submodule "assets/syntaxes/varlink"]

105− path = assets/syntaxes/02_Extra/varlink

121+ path = assets/syntaxes/varlink

106 url = https://github.com/varlink/syntax-highlight-varlink.git

122 url = https://github.com/varlink/syntax-highlight-varlink.git

107[submodule "assets/syntaxes/sublime-fish"]

123[submodule "assets/syntaxes/sublime-fish"]

108− path = assets/syntaxes/02_Extra/Fish

124+ path = assets/syntaxes/Fish

109 url = https://github.com/Phidica/sublime-fish.git

125 url = https://github.com/Phidica/sublime-fish.git

110[submodule "assets/syntaxes/Org mode"]

126[submodule "assets/syntaxes/Org mode"]

111− path = assets/syntaxes/02_Extra/Org mode

127+ path = assets/syntaxes/Org mode

112 url = https://github.com/jezcope/Org.tmbundle.git

128 url = https://github.com/jezcope/Org.tmbundle.git

129+[submodule "assets/syntaxes/requirementstxt"]

130+ path = assets/syntaxes/requirementstxt

131+ url = https://github.com/wuub/requirementstxt

113[submodule "assets/syntaxes/DotENV"]

132[submodule "assets/syntaxes/DotENV"]

114− path = assets/syntaxes/02_Extra/DotENV

133+ path = assets/syntaxes/DotENV

115 url = https://github.com/zaynali53/DotENV

134 url = https://github.com/zaynali53/DotENV

116[submodule "assets/syntaxes/hosts"]

135[submodule "assets/syntaxes/hosts"]

117− path = assets/syntaxes/02_Extra/hosts

136+ path = assets/syntaxes/hosts

118 url = https://github.com/brandonwamboldt/sublime-hosts

137 url = https://github.com/brandonwamboldt/sublime-hosts

119[submodule "assets/syntaxes/ssh-config"]

138[submodule "assets/syntaxes/ssh-config"]

120− path = assets/syntaxes/02_Extra/ssh-config

139+ path = assets/syntaxes/ssh-config

121 url = https://github.com/robballou/sublimetext-sshconfig.git

140 url = https://github.com/robballou/sublimetext-sshconfig.git

122[submodule "assets/syntaxes/GraphQL"]

141[submodule "assets/syntaxes/GraphQL"]

123− path = assets/syntaxes/02_Extra/GraphQL

142+ path = assets/syntaxes/GraphQL

124 url = https://github.com/dncrews/GraphQL-SublimeText3.git

143 url = https://github.com/dncrews/GraphQL-SublimeText3.git

125[submodule "assets/syntaxes/Verilog"]

144[submodule "assets/syntaxes/Verilog"]

126− path = assets/syntaxes/02_Extra/Verilog

145+ path = assets/syntaxes/Verilog

127 url = https://github.com/pro711/sublime-verilog

146 url = https://github.com/pro711/sublime-verilog

128[submodule "assets/syntaxes/SCSS_Sass"]

147[submodule "assets/syntaxes/SCSS_Sass"]

129− path = assets/syntaxes/02_Extra/SCSS_Sass

148+ path = assets/syntaxes/SCSS_Sass

130 url = https://github.com/braver/SublimeSass

149 url = https://github.com/braver/SublimeSass

131[submodule "assets/syntaxes/Strace"]

150[submodule "assets/syntaxes/Strace"]

132− path = assets/syntaxes/02_Extra/Strace

151+ path = assets/syntaxes/Strace

133 url = https://github.com/djuretic/SublimeStrace

152 url = https://github.com/djuretic/SublimeStrace

134[submodule "assets/syntaxes/Jinja2"]

153[submodule "assets/syntaxes/Jinja2"]

135− path = assets/syntaxes/02_Extra/Jinja2

154+ path = assets/syntaxes/Jinja2

136 url = https://github.com/Martin819/sublime-jinja2

155 url = https://github.com/Martin819/sublime-jinja2

137[submodule "assets/syntaxes/SLS"]

156[submodule "assets/syntaxes/SLS"]

138− path = assets/syntaxes/02_Extra/SLS

157+ path = assets/syntaxes/SLS

139 url = https://github.com/saltstack/sublime-text

158 url = https://github.com/saltstack/sublime-text

140 branch = master

159 branch = master

141[submodule "assets/themes/dracula-sublime"]

160[submodule "assets/themes/dracula-sublime"]

142 path = assets/themes/dracula-sublime

161 path = assets/themes/dracula-sublime

143 url = https://github.com/dracula/sublime.git

162 url = https://github.com/dracula/sublime.git

144[submodule "assets/syntaxes/HTML (Twig)"]

163[submodule "assets/syntaxes/HTML (Twig)"]

145− path = assets/syntaxes/02_Extra/HTML (Twig)

164+ path = assets/syntaxes/HTML (Twig)

146 url = https://github.com/Anomareh/PHP-Twig.tmbundle.git

165 url = https://github.com/Anomareh/PHP-Twig.tmbundle.git

147[submodule "assets/themes/Nord-sublime"]

166[submodule "assets/themes/Nord-sublime"]

148 path = assets/themes/Nord-sublime

167 path = assets/themes/Nord-sublime

149 url = https://github.com/crabique/Nord-plist.git

168 url = https://github.com/crabique/Nord-plist.git

150−[submodule "assets/syntaxes/Vue"]

151− path = assets/syntaxes/02_Extra/Vue

152− url = https://github.com/vuejs/vue-syntax-highlight.git

153− branch = new

154−[submodule "assets/syntaxes/CoffeeScript"]

155− path = assets/syntaxes/02_Extra/CoffeeScript

156− url = https://github.com/sustained/CoffeeScript-Sublime-Plugin

157−[submodule "assets/syntaxes/02_Extra/Stylus"]

158− path = assets/syntaxes/02_Extra/Stylus

159− url = https://github.com/billymoon/Stylus

160−[submodule "assets/themes/Solarized"]

161− path = assets/themes/Solarized

162− url = https://github.com/braver/Solarized

163−[submodule "assets/syntaxes/02_Extra/Fortran"]

164− path = assets/syntaxes/02_Extra/Fortran

165− url = https://github.com/315234/SublimeFortran

166−[submodule "assets/syntaxes/02_Extra/Email"]

167− path = assets/syntaxes/02_Extra/Email

168− url = https://github.com/mariozaizar/email.sublime-syntax.git

169−[submodule "assets/syntaxes/02_Extra/QML"]

170− path = assets/syntaxes/02_Extra/QML

171− url = https://github.com/skozlovf/Sublime-QML

172−[submodule "assets/syntaxes/02_Extra/AsciiDoc"]

173− path = assets/syntaxes/02_Extra/AsciiDoc

174− url = https://github.com/asciidoctor/sublimetext-asciidoc.git

175−[submodule "assets/syntaxes/02_Extra/GLSL"]

176− path = assets/syntaxes/02_Extra/GLSL

177− url = https://github.com/euler0/sublime-glsl

178−[submodule "assets/syntaxes/02_Extra/Nginx"]

179− path = assets/syntaxes/02_Extra/Nginx

180− url = https://github.com/brandonwamboldt/sublime-nginx

181−[submodule "assets/syntaxes/02_Extra/Apache"]

182− path = assets/syntaxes/02_Extra/Apache

183− url = https://github.com/colinta/ApacheConf.tmLanguage

184−[submodule "assets/syntaxes/02_Extra/Ninja"]

185− path = assets/syntaxes/02_Extra/Ninja

186− url = https://github.com/pope/SublimeNinja.git

187−[submodule "assets/syntaxes/02_Extra/Svelte"]

188− path = assets/syntaxes/02_Extra/Svelte

189− url = https://github.com/corneliusio/svelte-sublime

190−[submodule "assets/themes/Coldark"]

191− path = assets/themes/Coldark

192− url = https://github.com/ArmandPhilippot/coldark-bat.git

193−[submodule "assets/themes/gruvbox"]

194− path = assets/themes/gruvbox

195− url = https://github.com/subnut/gruvbox-tmTheme.git

196− branch = bat-source

197−[submodule "assets/syntaxes/02_Extra/Lean"]

198− path = assets/syntaxes/02_Extra/Lean

199− url = https://github.com/leanprover/vscode-lean.git

200−[submodule "assets/syntaxes/02_Extra/LiveScript"]

201− path = assets/syntaxes/02_Extra/LiveScript

202− url = https://github.com/paulmillr/LiveScript.tmbundle

203−[submodule "assets/syntaxes/02_Extra/Zig"]

204− path = assets/syntaxes/02_Extra/Zig

205− url = https://github.com/ziglang/sublime-zig-language.git

206−[submodule "assets/syntaxes/02_Extra/gnuplot"]

207− path = assets/syntaxes/02_Extra/gnuplot

208− url = https://github.com/hesstobi/sublime_gnuplot

209−[submodule "assets/syntaxes/02_Extra/SystemVerilog"]

210− path = assets/syntaxes/02_Extra/SystemVerilog

211− url = https://github.com/TheClams/SystemVerilog.git

212−[submodule "assets/themes/visual-studio-dark-plus"]

213− path = assets/themes/visual-studio-dark-plus

214− url = https://github.com/vidann1/visual-studio-dark-plus.git

215−[submodule "assets/syntaxes/02_Extra/SublimeEthereum"]

216− path = assets/syntaxes/02_Extra/SublimeEthereum

217− url = https://github.com/davidhq/SublimeEthereum.git

218−[submodule "assets/syntaxes/02_Extra/Groff"]

219− path = assets/syntaxes/02_Extra/Groff

220− url = https://github.com/carsonoid/sublime_man_page_support

221−[submodule "assets/syntaxes/02_Extra/http-request-response"]

222− path = assets/syntaxes/02_Extra/http-request-response

223− url = https://github.com/keith-hall/http-request-response-syntax.git

224−[submodule "assets/syntaxes/02_Extra/LLVM"]

225− path = assets/syntaxes/02_Extra/LLVM

226− url = https://github.com/ioncodes/LLVM.tmBundle

227−[submodule "assets/syntaxes/02_Extra/Slim"]

228− path = assets/syntaxes/02_Extra/Slim

229− url = https://github.com/slim-template/ruby-slim.tmbundle.git

230−[submodule "assets/syntaxes/02_Extra/Racket"]

231− path = assets/syntaxes/02_Extra/Racket

232− url = https://github.com/follesoe/sublime-racket.git

233−[submodule "assets/syntaxes/02_Extra/MediaWiki"]

234− path = assets/syntaxes/02_Extra/MediaWiki

235− url = https://github.com/tosher/Mediawiker.git

236−[submodule "assets/syntaxes/02_Extra/Dart"]

237− path = assets/syntaxes/02_Extra/Dart

238− url = https://github.com/elMuso/Dartlight.git

239−[submodule "assets/syntaxes/02_Extra/SublimeJQ"]

240− path = assets/syntaxes/02_Extra/SublimeJQ

241− url = https://github.com/zogwarg/SublimeJQ.git

242−[submodule "assets/syntaxes/02_Extra/cmd-help"]

243− path = assets/syntaxes/02_Extra/cmd-help

244− url = https://github.com/victor-gp/cmd-help-sublime-syntax.git

245− branch = main

246− shallow = true

.travis.ymlnew file+113

@@ -0,0 +1,113 @@

1+language: rust

2+

3+matrix:

4+ include:

5+ # Stable channel.

6+ - os: linux

7+ rust: stable

8+ env: TARGET=x86_64-unknown-linux-gnu

9+ - os: linux

10+ rust: stable

11+ env:

12+ - TARGET=x86_64-unknown-linux-musl

13+ - CC_x86_64_unknown_linux_musl=/usr/bin/musl-gcc

14+ - os: linux

15+ rust: stable

16+ env: TARGET=i686-unknown-linux-gnu

17+ - os: osx

18+ rust: stable

19+ env: TARGET=x86_64-apple-darwin

20+ - os: linux

21+ rust: stable

22+ env:

23+ - TARGET=arm-unknown-linux-gnueabihf

24+ - CC_arm_unknown_linux_gnueabihf=/usr/bin/arm-linux-gnueabihf-gcc-4.8

25+ - CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc-4.8

26+ - os: linux

27+ rust: stable

28+ env:

29+ - TARGET=aarch64-unknown-linux-gnu

30+ - CC_aarch64-unknown-linux-gnu=/usr/bin/aarch64-linux-gnu-gcc-4.8

31+ - CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc-4.8

32+

33+ # Minimum Rust supported channel.

34+ - os: linux

35+ rust: 1.35.0

36+ env: TARGET=x86_64-unknown-linux-gnu

37+ - os: linux

38+ rust: 1.35.0

39+ env:

40+ - TARGET=x86_64-unknown-linux-musl

41+ - CC_x86_64_unknown_linux_musl=/usr/bin/musl-gcc

42+ - os: osx

43+ rust: 1.35.0

44+ env: TARGET=x86_64-apple-darwin

45+

46+ # Disable nightly for now

47+ # # Code formatting check

48+ # - os: linux

49+ # rust: nightly

50+ # # skip the global install step

51+ # install:

52+ # - cargo install --debug --force rustfmt-nightly

53+ # script: cargo fmt -- --check

54+

55+sudo: required

56+

57+before_install:

58+ - ci/before_install.bash

59+

60+env:

61+ global:

62+ # Default target on travis-ci.

63+ # Used as conditional check in the install stage

64+ - HOST=x86_64-unknown-linux-gnu

65+ # Used on the deployment script

66+ - PROJECT_NAME=bat

67+

68+install:

69+ # prevent target re-add error from rustup

70+ - if [[ $TRAVIS_OS_NAME = linux && $HOST != $TARGET ]]; then rustup target add $TARGET; fi

71+

72+script:

73+ - ci/script.bash

74+

75+before_deploy:

76+ - bash ci/before_deploy.bash

77+

78+deploy:

79+ provider: releases

80+ # NOTE updating the `api_key.secure`

81+ # - go to: https://github.com/settings/tokens/new

82+ # - generate new token using `public_repo` scope

83+ # - encrypt it using: `travis encrypt API_KEY_HERE`

84+ # - paste the output below

85+ api_key:

86+ secure: "GZL8nYk+/MZGEqejpP0UMMGVmwUEdxiF9CflFIGccu+/tznDyHnHOpyJmbH3M5IKWIxa7xFgqOE8pHuD4oQXt4mzyJGB0KMKKEFLW7ckbTYKya5bw0heKznaqGnS0Yz+vpfqYR25eiPFYCz7mDsGsCzH5QZqt3cdn9MDQGu1D0IaxPjuBNH3T9kBblR0ifBd3Diy0JYhiVcMSI3V1rkel18F1yBHO2GQ95hkWxVgjANQnefq5+zdzbx4ki539ewYENShA8N0w6ULJVY9LmWRWJIp90ggOD3JCH6Nz/fBpYBqwfABO6Dr7Csw7IRm7pM4IVkFZS1taiDYFX9thxZh3UTmI4YYtSTPxH9NGV47kxPipbf4vAXFwW+1VcHKMpBzz+5IVsHnk1Pfx9/GZsXbqXM3PUWCStec36Xtqh5vQapDKEg9khkEs4b1X7/E73gvpRuQl9gbnyufSVWgDsXIWqM+0aDbqQz1FpLmVxz6eij0cB9vR+8kbNoe/CEPHPO9ZllvAHseukOeHPzSBd8rILORXaaGmQausXz2wWgSsffUSYz4705P8joI0zFCfmkHjL+kA1ZUx5SxLCc1ID7CFFZChhAxHoPL7xc21snswwr8QeheERdwvuzKNaerBGZEw8dmMMx98YkjftIj65DDySr2mRZuufBQeQpmMhFyIT4="

87+ # for uploading multiple files

88+ file_glob: true

89+ # NOTE explanation on each env variable

90+ # - PROJECT_NAME: name of the project, set on the `env.global` above

91+ # - TRAVIS_TAG: tag name that the build is being deployed for, usually the version number

92+ # - TARGET: target triple of the build

93+ file:

94+ - $PROJECT_NAME-$TRAVIS_TAG-$TARGET.*

95+ - $PROJECT_NAME*.deb

96+ # don't delete artifacts from previous stage

97+ skip_cleanup: true

98+ on:

99+ # deploy only if we push a tag

100+ tags: true

101+ # deploy only on stable channel that has TARGET env variable sets

102+ condition: $TRAVIS_RUST_VERSION = stable && $TARGET != ""

103+

104+notifications:

105+ email:

106+ on_success: never

107+

108+# Caching

109+cache:

110+ directories:

111+ - /home/travis/.cargo

112+before_cache:

113+ - rm -rf /home/travis/.cargo/registry

CHANGELOG.mddeleted−1020

@@ -1,1020 +0,0 @@

1−# unreleased

2−

3−## Features

4−

5−- Make the default macOS theme depend on Dark Mode. See #2197, #1746 (@Enselic)

6−

7−## Bugfixes

8−

9−## Other

10−

11−- Relaxed glibc requirements on amd64, see #2106 and #2194 (@sharkdp)

12−

13−## Syntaxes

14−

15−## Themes

16−

17−## `bat` as a library

18−

19−

20−# v0.21.0

21−

22−## Features

23−

24−- Correctly render tab stops in `--show-all`, see #2038 (@Synthetica9)

25−- Add a `--style=default` option and make it the default. It is less verbose than `full`, see #2061 (@IsaacHorvath)

26−- Enable BusyBox `less` as pager, see #2162 (@nfisher1226)

27−- File extensions are now matched case-insensitively. See #1854, #2181 (@Enselic)

28−

29−## Bugfixes

30−

31−- Bump `regex` dependency from 1.5.4 to 1.5.5 to fix [CVE-2022-24713](https://blog.rust-lang.org/2022/03/08/cve-2022-24713.html), see #2145, #2139 (@Enselic)

32−- `bat` no longer crashes when encountering files that references missing syntaxes. See #915, #2181 (@Enselic)

33−

34−## Performance

35−

36−- Skip syntax highlighting on long lines (> 16384 chars) to help improve performance. See #2165 (@keith-hall)

37−- Vastly improve startup time by lazy-loading syntaxes via syntect 5.0.0. This makes bat display small files ~75% faster than before. See #951, #2181 (@Enselic)

38−

39−## Other

40−

41−- Include info about custom assets in `--diagnostics` if used. See #2107, #2144 (@Enselic)

42−

43−## Syntaxes

44−

45−- Mapped clang-format config file (.clang-format) to YAML syntax (@TruncatedDinosour)

46−- log syntax: improved handling of escape characters in double quoted strings. See #2123 (@keith-hall)

47−- Associate `/var/spool/mail/*` and `/var/mail/*` with the `Email` syntax. See #2156 (@cyqsimon)

48−- Added cmd-help syntax to scope --help messages. See #2148 (@victor-gp)

49−- Slightly adjust Zig syntax. See #2136 (@Enselic)

50−- Associate `.inf` files with the `INI` syntax. See #2190 (@Enselic)

51−

52−## `bat` as a library

53−

54−- Allow configuration of `show_nonprintable` with `PrettyPrinter`, see #2142

55−- The binary format of syntaxes.bin has been changed due to syntaxes now being lazy-loaded via syntect 5.0.0. See #2181 (@Enselic)

56−- Mark `bat::error::Error` enum as `#[non_exhaustive]` to allow adding new variants without future semver breakage. See #2181 (@Enselic)

57−- Change `Error::SyntectError(syntect::LoadingError)` to `Error::SyntectError(syntect::Error)`. See #2181 (@Enselic)

58−- Add `Error::SyntectLoadingError(syntect::LoadingError)` enum variant. See #2181 (@Enselic)

59−

60−

61−# v0.20.0

62−

63−## Features

64−

65−- New style component `header-filesize` to show size of the displayed file in the header. See #1988 (@mdibaiee)

66−- Use underline for line highlighting on ANSI, see #1730 (@mdibaiee)

67−

68−## Bugfixes

69−

70−- Fix bash completion on bash 3.x and bash-completion 1.x. See #2066 (@joshpencheon)

71−

72−## Syntaxes

73−

74−- `GraphQL`: Add support for interfaces implementing interfaces and consider ampersand an operator. See #2000

75−- Associate `_vimrc` and `_gvimrc` files with the `VimL` syntax. See #2002

76−- Associate `poetry.lock` files with the `TOML` syntax. See #2049

77−- Associate `.mesh`, `.task`, `.rgen`, `.rint`, `.rahit`, `.rchit`, `.rmiss`, and `.rcall` with the `GLSL` syntax. See #2050

78−- Added support for `JQ` syntax, see #2072

79−- Properly associate global git config files rooted in `$XDG_CONFIG_HOME/git/` or `$HOME/.config/git/`. See #2067 (@cyqsimon)

80−

81−## `bat` as a library

82−

83−- Exposed `get_syntax_set` and `get_theme` methods on `HighlightingAssets`. See #2030 (@dandavison)

84−- Added `HeaderFilename` and `HeaderFilesize` to `StyleComponent` enum, and mark it `#[non_exhaustive]`. See #1988 (@mdibaiee)

85−

86−

87−# v0.19.0

88−

89−## Performance

90−

91−- Reduce startup time in loop-through mode (e.g. when redirecting output) by 90%. See #1747 (@Enselic)

92−- Load themes lazily to make bat start 25% faster when disregarding syntax load time. See #1969 (@Enselic)

93−- Python syntax highlighting no longer suffers from abysmal performance in specific scenarios. See #1688 (@keith-hall)

94−- Fix for poor performance when ANSI escape sequences are piped to `bat`, see #1596 (@eth-p)

95−- Fix for incorrect handling of ANSI escape sequences when using `--wrap=never`, see #1596 (@eth-p)

96−- Load custom assets as fast as integrated assets, see #1753 (@Enselic)

97−

98−## Features

99−

100−- Support for `x:-delta` (minus) syntax in line ranges (e.g. `20:-10`). See #1901 (@bojan88)

101−- Support for `--ignored-suffix` argument. See #1892 (@bojan88)

102−- `$BAT_CONFIG_DIR` is now a recognized environment variable. It has precedence over `$XDG_CONFIG_HOME`, see #1727 (@billrisher)

103−- Support for `x:+delta` syntax in line ranges (e.g. `20:+10`). See #1810 (@bojan88)

104−- Add new `--acknowledgements` option that gives credit to theme and syntax definition authors. See #1971 (@Enselic)

105−- Include git hash in `bat -V` and `bat --version` output if present. See #1921 (@Enselic)

106−

107−## Bugfixes

108−

109−- First line not shown in diff context. See #1891 (@divagant-martian)

110−- Do not ignore syntaxes that handle file names with a `*.conf` extension. See #1703 (@cbolgiano)

111−

112−## Other

113−

114−- Add PowerShell completion, see #1826 (@rashil2000)

115−- Minimum supported Rust version (MSRV) bumped to 1.51, see #1994 (@mdibaiee)

116−

117−## Syntaxes

118−

119−- Groff, see #1685 (@scop)

120−- HTTP Requests and Responses, see #1748 (@keith-hall)

121−- LLVM, see #1777 (@ioncodes)

122−- Highlight for `vimrc` and `gvimrc` files, see #1763 (@SuperSandro2000)

123−- Syslog highlighting improvements, see #1793 (@scop)

124−- Added support for `slim` syntax, see #1693 (@mfinelli)

125−- Racket, see #1884 (@jubnzv)

126−- LiveScript, see #1915 (@Enselic)

127−- MediaWiki, see #1925 (@sorairolake)

128−- The `requirements.txt` syntax has been removed due to incompatible license requirements.

129−- Dart, new highlighter, see #1959 (@Ersikan)

130−- SCSS and Sass syntaxes updated, see #1766 (@Enselic)

131−- PowerShell syntax updated, see #1935 (@Enselic)

132−- TypeScript syntax updated, see #1834 (@Enselic)

133−

134−## `bat` as a library

135−

136−- Deprecate `HighlightingAssets::syntaxes()` and `HighlightingAssets::syntax_for_file_name()`. Use `HighlightingAssets::get_syntaxes()` and `HighlightingAssets::get_syntax_for_path()` instead. They return a `Result` which is needed for upcoming lazy-loading work to improve startup performance. They also return which `SyntaxSet` the returned `SyntaxReference` belongs to. See #1747, #1755, #1776, #1862 (@Enselic)

137−- Remove `HighlightingAssets::from_files` and `HighlightingAssets::save_to_cache`. Instead of calling the former and then the latter you now make a single call to `bat::assets::build`. See #1802, #1971 (@Enselic)

138−- Replace the `error::Error(error::ErrorKind, _)` struct and enum with an `error::Error` enum. `Error(ErrorKind::UnknownSyntax, _)` becomes `Error::UnknownSyntax`, etc. Also remove the `error::ResultExt` trait. These changes stem from replacing `error-chain` with `thiserror`. See #1820 (@Enselic)

139−- Add new `MappingTarget` enum variant `MapExtensionToUnknown`. Refer to its documentation for more information. Also mark `MappingTarget` as `#[non_exhaustive]` since more enum variants might be added in the future. See #1703 (@cbolgiano), #2012 (@Enselic)

140−

141−

142−# v0.18.3

143−

144−## Bugfixes

145−

146−- Bump `git2` dependency to fix build with Rust 1.54, see #1761

147−

148−

149−# v0.18.2

150−

151−## Features

152−

153−- Ignore known backup/template filename suffixes when selecting the syntax, see #1687 (@scop)

154−

155−## Bugfixes

156−

157−- Fix for a security vulnerability on Windows. Prior to this release, `bat` would execute programs called `less`/`less.exe` from the current working directory (instead of the one from `PATH`) with priority. An attacker might be able to use this by placing a malicious program in a shared directory where the user would execute `bat`. `bat` users on Windows are advised to upgrade to this version. See #1724 and #1472 (@Ry0taK).

158−

159−## Other

160−

161−- Add bash completion, see #1678 (@scop)

162−- Fix Clippy lints, see #1661 (@mohamed-abdelnour)

163−- Add syntax highlighting test files, see #1213 and #1668 (@mohamed-abdelnour)

164−

165−## Syntaxes

166−

167−- Upgraded Julia syntax to fix a highlighting bug, see #1692

168−- Added support for `dash` syntax, see #1654 (@mohamed-abdelnour)

169−- Added support for `XAML` syntax, see #1590 and #1655 (@mohamed-abdelnour)

170−- Apply `DotENV` syntax also for `.env.default` and `.env.defaults` files, see #1669

171−

172−

173−# v0.18.1

174−

175−## Bugfixes

176−

177−- Mouse support and screen clearing broken for `less` versions with minor version number (581.2), see #1629 and #1639 (@aswild)

178−

179−## Other

180−

181−- `Input::ordinary_file` and `Input::with_name` now accept `Path` rather than `OsStr` see #1571 (@matklad)

182−- The `LESS` environment variable is now included in `bat --diagnostic`, see #1589 (@Enselic)

183−- Increased min. required Rust version to 1.45

184−

185−## Syntaxes

186−

187−- Improved the Syslog syntax highlighting, see #1606 (@keith-hall)

188−- Replaced "Advanced CSV" with a custom CSV syntax definition written especially for `bat`; see #1574 (@keith-hall)

189−- Added SystemVerilog file syntax, see #1580 (@SeanMcLoughlin)

190−- Added Solidity and Vyper syntax, see #1602 (@Ersikan)

191−

192−## New themes

193−

194−- Dark+ VS Code theme, see #1588 and #1598 (@PatriotRossii)

195−

196−

197−

198−# v0.18.0

199−

200−## Features

201−

202−- Use a pager when `bat --list-languages` is called, see #1394 (@stku1985)

203−

204−## Bugfixes

205−

206−- If the last line doesn't end with a newline character, don't add it if `--style=plain`, see #1438 (@Enselic)

207−- Only print themes hint in interactive mode (`bat --list-themes`), see #1439 (@rsteube)

208−- Make ./tests/syntax-tests/regression_test.sh work on recent versions of macOS, see #1443 (@Enselic)

209−- VimL syntax highlighting fix, see #1450 (@esensar)

210−- Print an 'Invalid syntax theme settings' error message if a custom theme is broken, see #614 (@Enselic)

211−- If plain mode is set and wrap is not explicitly opted in, long lines will no be truncated, see #1426

212−- If `PAGER` (but not `BAT_PAGER` or `--pager`) is `more` or `most`, silently use `less` instead to ensure support for colors, see #1063 (@Enselic)

213−- If `PAGER` is `bat`, silently use `less` to prevent recursion. For `BAT_PAGER` or `--pager`, exit with error, see #1413 (@Enselic)

214−- Manpage highlighting fix, see #1511 (@keith-hall)

215−- `BAT_CONFIG_PATH` ignored by `bat` if non-existent, see #1550 (@sharkdp)

216−

217−## Other

218−

219−- Performance improvements, see #1421 (@LovecraftianHorror)

220−- Added a new `--diagnostic` option to collect information for bug reports, see #1459 (@sharkdp)

221−- Modified default theme colors to differentiate between a JSON key and a string value, see #1400 (@keith-hall)

222−- Upped min required Rust version to 1.42

223−

224−## Syntaxes

225−

226−- Added Zig syntax, see #1470 (@paulsmith)

227−- Added Lean syntax, see #1446 (@Julian)

228−- Added `.resource` extension for Robot Framework files, see #1386

229−- Added `gnuplot` syntax, see #1431 (@sharkdp)

230−- Highlight *.pac (Proxy auto-config) files as JavaScript, see #1515 (@sharkdp)

231−

232−## New themes

233−

234−- `ansi` replaces `ansi-dark` and `ansi-light`, see #1104 and #1412 (@mk12). **Breaking change:** users that were previously using one of the `ansi-*` themes should switch to `ansi`.

235−- The Gruvbox theme has been updated, see #1291 (@j0hnmeow). **Breaking change:** users that were previously using `gruvbox` or `gruvbox-white` should update and use `gruvbox-dark`/`gruvbox-light` instead.

236−

237−## `bat` as a library

238−

239−- The following `PrettyPrinter` methods have been removed (they were previously deprecated):

240− - `input_stdin_with_name`

241− - `input_from_bytes_with_name`

242− - `input_from_reader_with_name`

243− - `vcs_modification_markers` (if the `git` feature is not enabled)

244−

245−

246−# v0.17.1

247−

248−## Bugfixes

249−

250−- Running `bat` without arguments fails ("output file is also an input"), see #1396

251−

252−

253−# v0.17.0

254−

255−## Features

256−

257−- Added a new `--style` value, `rule`, which adds a simple horizontal ruled line between files, see #1276 (@tommilligan)

258−- Pass `-S` ("chop long lines") to `less` if `--wrap=never` is set in `bat`, see #1255 (@gahag)

259−

260−## Bugfixes

261−

262−- Detect infinite loop when input and output are the same, see #1193 and #1197 (@niklasmohrin)

263−- Throw an error when `bat` is being used as `pager`, see #1343 (@adrian-rivera)

264−- Bash syntax highlighting not selected for `*.ebuild` and `*.eclass` files, see #1292 (@sharkdp)

265−- Fix `zsh` completion when using `-p`, see #1320 (@xzfc)

266−

267−## Other

268−

269−- Add note to refer to see detailed help with `--help` (and vice versa with `-h`), see #1215 (@henil)

270−- Add a `Contributors` section to `README`, see #1348 (@adrian-rivera)

271−

272−## Syntaxes

273−

274−- Manpage syntax highlighting has been improved, see #1315 (@keith-hall)

275−- Add Svelte file syntax, see #1285 (@kjmph)

276−

277−## New themes

278−

279−- Coldark, see #1329 (@armandphilippot)

280−

281−

282−# v0.16.0

283−

284−## Features

285−

286−- Added support for the `NO_COLOR` environment variable, see #1021 and #1031 (@eth-p)

287−- Added `-P` short flag to disable paging, see #1075 and #1082 (@LordFlashmeow)

288−- Added `--force-colorization`/`-f` flag to provide an alias for forced color and decoration output, see #1141 (@alexanderkarlis)

289−

290−## Bugfixes

291−

292−- Fixed non-printable characters display for redirected output, see #1061 (@gsomix)

293−- Handle file extension conflicts in `--list-languages`, see #1076 and #1135 (@Kienyew)

294−

295−## Other

296−

297−- Switched to "·" (U+00B7) Middle Dot from "•" (U+2022) Bullet for non-printing spaces, see #1056 and #1100 (@LordFlashmeow)

298−- Added zsh shell completion script, see #1136 (@Kienyew)

299−- Improved `--help` text (@sharkdp)

300−- Added custom languages/themes sections to manpage (@eth-p)

301−

302−## Syntaxes

303−

304−- Update AsciiDoc syntax, see #1034 (@rxt1077)

305−- GLSL (@caioalonso)

306−- Add Nginx and Apache config file syntax, see #1137 (@kjmph, @niklasmohrin)

307−- Use `fstab` syntax for `crypttab` files, see #1073 (@sharkdp)

308−- Support syntax highlighting for files in `$XDG_CONFIG_HOME/git/`, see #1191 (@ahmedelgabri)

309−

310−## New themes

311−

312−- Gruvbox, see #1069 (@kyleondy)

313−- base16-256 for [base16-shell](https://github.com/chriskempson/base16-shell) users, see #1111 (@mk12)

314−

315−## `bat` as a library

316−

317−- Add APIs to provide `Input` descriptions with `InputDescription` (@eth-p)

318−- Add function to directly provide `Input`s to `PrettyPrinter` (@eth-p)

319−- **Breaking:** `Input::theme_preview_file` is no longer available. (@eth-p)

320−

321−## Packaging

322−

323−- Removed build dependency on `liquid` (@sharkdp).

324−

325−# v0.15.4

326−

327−## Bugfixes

328−

329−- Added missing Solarized themes, see #1027

330−- Fixed highlighting bug in Haskell source files, see #1026

331−

332−# v0.15.3

333−

334−## Bugfixes

335−

336−- Cannot run `bat` with relative paths, see #1022

337−- bat mishighlights Users that start with digits in SSH config, see #984

338−

339−## New syntaxes

340−

341−- SML, see #1005 (@kopecs)

342−

343−## Other

344−

345−- Some syntaxes and themes have been updated to the latest version

346−

347−# v0.15.2

348−

349−## Bugfixes

350−

351−- Fix syntax detection for files called 'rails', see #1008

352−- Fix potential errors with syntax detection for symlinked files, see #1001

353−- `--map-syntax` doesn't work with names provided through `--file-name` (@eth-p)

354−

355−## Other

356−

357−- Add padding above headers when not using a grid, see #968 and #981 (@pt2121)

358−- bat now prints an error if an invalid syntax is specified via `-l` or `--map-syntax`, see #1004 (@eth-p)

359−

360−## `bat` as a library

361−

362−- `PrettyPrinter::vcs_modification_markers` has been marked deprecated when building without the `git` feature, see #997 and #1020 (@eth-p, @sharkdp)

363−

364−## Packaging

365−

366−- Compilation problems with `onig_sys` on various platforms have been resolved by upgrading to `syntect 4.2`, which includes a new `onig` version that allows to build `onig_sys` without the `bindgen` dependency. This removes the need for `libclang(-dev)` to be installed to compile `bat`. Package maintainers might want to remove `clang` as a build dependency. See #650 for more details.

367−

368−# v0.15.1

369−

370−## Bugfixes

371−

372−- Fix highlighting of Markdown files, see #963 and #977

373−- Fix `base16` theme (was broken since in v0.14), see #972, #934 and #979 (@mk12).

374− Users suffering from #865 ("no color for bat in ssh from a Windows client") can use the `ansi-dark` and `ansi-light` themes from now on.

375−

376−## New syntaxes

377−

378−- Fortran, see #957

379−- Email (@mariozaizar)

380−- QML, see #962 (@pylipp)

381−

382−# v0.15.0

383−

384−## Features

385−

386−- Add a new `--diff`/`-d` option that can be used to only show lines surrounding

387− Git changes, i.e. added, removed or modified lines. The amount of additional

388− context can be controlled with `--diff-context=N`. See #23 and #940

389−

390−## Bugfixes

391−

392−- Error message printed in the middle of the output for another file, see #946

393−- Performance improvements when using custom caches (via `bat cache --build`): the `bat` startup time should now be twice as fast (@lzutao).

394−

395−## Themes

396−

397−- Updated version of the Solarized dark/light themes, see #941

398−

399−## `bat` as a library

400−

401−- There are a few changes in the "low level" API (the `Config` struct has changed and

402− the error handler needs a new `&mut dyn Write` argument). The high-level API is not

403− affected.

404−

405−# v0.14.0

406−

407−## Features

408−

409−- Added a new `--file-name <name>…` option to overwrite the displayed filename(s)

410− in the header. This is useful when piping input into `bat`. See #654 and #892 (@neuronull).

411−- Added a new `--generate-config-file` option to create an initial configuration file

412− at the right place. See #870 (@jmick414)

413−

414−## Bugfixes

415−

416−- Performance problems with C# source code have been fixed, see #677 (@keith-hall)

417−- Performance problems with Makefiles have been fixed, see #750 (@keith-hall)

418−- Fix bug when highlighting Ruby files with unindented heredocs, see #914 (@keith-hall)

419−- A highlighting problem with Rust source code has been fixed, see #924 (@keith-hall)

420−- Windows: short files that do not require paging are displayed and then lost, see #887

421−- `--highlight-line` did not work correctly in combination with `--tabs=0` and `--wrap=never`,

422− see #937

423−

424−## Other

425−

426−- When saving/reading user-provided syntaxes or themes, `bat` will now maintain a

427− `metadata.yaml` file which includes information about the `bat` version which was

428− used to create the cached files. When loading cached files, we now print an error

429− if they have been created with an incompatible version. See #882

430−- Updated `liquid` dependency to 0.20, see #880 (@ignatenkobrain)

431−

432−## `bat` as a library

433−

434−- A completely new "high level" API has been added that is much more convenient

435− to use. See the `examples` folder for the updated code. The older "low level"

436− API is still available (basically everything that is not in the root `bat`

437− module), but has been refactored quite a bit. It is recommended to only use

438− the new "high level" API, if possible. This will be much easier to keep stable.

439− Note that this should still be considered a "beta" release of `bat`-as-a-library.

440− For more details and some screenshots of the example programs, see #936.

441−- Stripped out a lot of binary-only dependencies, see #895 and #899 (@dtolnay)

442−

443− This introduces a `features = ["application"]` which is enabled by default and pulls in

444− everything required by `bat` the application. When depending on bat as a library, downstream

445− `Cargo.toml` should disable this feature to cut out inapplicable heavy dependencies:

446− ``` toml

447− [dependencies]

448− bat = { version = "0.14", default-features = false }

449− ```

450− Other optional functionality has also been put behind features: `paging` and `git` support.

451−- Allow using the library with older syntect, see #896 and #898 (@dtolnay)

452−

453−## New syntaxes

454−

455−- Rego, see #872 (@patrick-east)

456−- Stylo, see #917

457−

458−

459−# v0.13.0

460−

461−## `bat` as a library

462−

463−Beginning with this release, `bat` can be used as a library (#423).

464−

465−This was a huge effort and I want to thank all people who made this possible: @DrSensor, @mitsuhiko, @mre, @eth-p!

466−

467−- Initial attempt in #469 (@mitsuhiko)

468−- Second attempt, complete restructuring of the `bat` crate, see #679 (@DrSensor)

469−- Updates to example, public API, error handling, further refactoring: #693 #873 #875 (@sharkdp)

470−

471−I want to stress that this is the very first release of the library. Things are very likely to change. A lot of things are still missing (including the documentation).

472−

473−That being said, you can start using it! See the example programs in [`examples/`](https://github.com/sharkdp/bat/tree/master/examples).

474−

475−You can see the API documentation here: https://docs.rs/bat/

476−

477−## Features

478−

479−- (**Breaking change**) Glob-based syntax mapping, see #877 and #592. With this change,

480− users need to update their bat config files (`bat --config-file`), if they have any `--map-syntax` settings

481− present.

482−

483− The option now works like this:

484− ```bash

485− --map-syntax <glob-pattern>:<syntax-name>

486− ```

487−

488− For more information, see the `--help` text, the man page or the README.

489−

490− This new feature allows us to properly highlight files like:

491− * `/etc/profile`

492− * `~/.ssh/config`

493−

494−- `--highlight-line` now accepts line ranges, see #809 (@lkalir)

495−- Proper wrapping support for output with wide Unicode characters, see #811 #787 and #815 (@Kogia-sima)

496−- A lot of updates to existing syntaxes via #644 (@benwaffle, @keith-hall)

497−- `BAT_CACHE_PATH` can be used to place cached `bat` assets in a non-standard path, see #829 (@neuronull)

498−- Support combination of multiple styles at the same time, see #857 (@aslpavel)

499−

500−## Bugfixes

501−

502−- Do not pass '--no-init' on newer less versions, see #749 and #786 (@sharkdp)

503−- 'bat cache' still takes precedence over existing files, see #666 (@sharkdp)

504−- `.sc` files should be treated as scala files, see #443 (@benwaffle)

505−- Allow underscores and dashes in page names, see #670 (@LunarLambda)

506−- Keep empty lines empty, see #601 (@mbarbar)

507−- Wrapping does not work when piping, see #758 (@fusillicode, @allevo, @gildo)

508−- Allow for non-unicode filenames, see #225 (@sharkdp)

509−- Empty file without header produces incomplete grid, see #798 (@eth-p)

510−- Files named `build` don't respect shebang lines, see #685 (@sharkdp)

511−

512−## Other

513−

514−- Parametrizable names for man page and shell completion files, see #659 #673 #656 (@eth-p)

515−- Enabled LTO, making `bat` about 10% faster, see #719 (@bolinfest, @sharkdp)

516−- Suggestions non how to configure `bat` for MacOS dark mode, see README (@jerguslejko)

517−- Extended ["Integration with other tools"](https://github.com/sharkdp/bat#integration-with-other-tools) section (@eth-p)

518−- Updated [instrutions on how to use `bat` as a `man`-pager](https://github.com/sharkdp/bat#man), see #652, see #667 (@sharkdp)

519−- Add section concerning file encodings, see #688 and #568 (@sharkdp)

520−- Updated sort order of command-line options in `--help` text and manpage, see #653 and #700 (@hrlmartins)

521−- Updates to the man page syntax, see #718 (@sharkdp)

522−- Japanese documentation updates, see #863 (@k-ta-yamada, @sorairolake and @wt-l00)

523−- Accept "default" as a theme, see #757 (@fvictorio)

524−- Updated Windows installation instructions, see #852 (@sorenbug)

525−- Updated man page, see #573 (@sharkdp)

526−

527−## New syntaxes

528−

529−- Jinja2, see #648 (@Martin819)

530−- SaltStack SLS, see #658 (@Martin819)

531−- `/etc/fstab`, see #696 (@flopp and @eth-p)

532−- `/etc/group` and `/etc/passwd`, see #698 (@argentite)

533−- `/proc/cpuinfo` and `/proc/meminfo`, see #593 (@sharkdp)

534−- Nim, see #542 (@sharkdp)

535−- Vue, see #826 (@chaaaaarlotte)

536−- CoffeScript, see #833 (@sharkdp)

537−

538−## New themes

539−

540−- Dracula, see #687 (@clarfon)

541−- Nord, see #760 (@crabique)

542−- Solarized light and dark, see #768 (@hakamadare)

543−

544−## Packaging

545−

546−- `bat` is now in the official Ubuntu and Debian repositories, see #323 and #705 (@MarcoFalke)

547−- `bat` can now be installed via MacPorts, see #675 (@bn3t)

548−- Install fish completions into 'vendor_completions.d', see #651 (@sharkdp)

549−

550−## Thanks

551−

552−- To @eth-p for joining me as a maintainer! I'm very grateful for all the work you put into

553− managing and responding to issues, improving our deployment, adding PR/issue templates (#837) as

554− well as fixing bugs and implementing new features.

555−

556−# v0.12.1

557−

558−## Bugfixes

559−

560−- Fixes a bug for older Windows versions (*"The procedure entry point `CreateFile2` could not be located"*), see #643 (@rivy)

561−

562−# v0.12.0

563−

564−## Features

565−

566−- Binary file content can now be viewed with `bat -A`, see #623, #640 (@pjsier and @sharkdp)

567−- `bat` can now be used as a man pager. Take a look at the README and #523 for more details.

568−- Add new style component to separate multiple `--line-range`s, see #570 (@eth-p)

569−- Added `-L` as an alias for `--list-languages`

570−

571−## Bugfixes

572−

573−- Output looks unbalanced when using '--style=grid,numbers' without 'header', see #571 (@eth-p)

574−- issues with filenames starting with "cache", see #584

575−- Can't build cache with new theme without creating cache dir, see #576 (@frm)

576−- `--terminal-width -10` is parsed incorrectly, see #611

577−

578−## Other

579−

580−- Added fish completions to DEB package, see #554

581−

582−## New syntaxes

583−

584−- Emacs Org mode, see #36 (@bricewge)

585−- `requirements.txt`

586−- DotENV `.env`

587−- SSH config syntax (`-l ssh_config`), see #582 (@issmirnov)

588−- `/etc/hosts`, see #583 (@issmirnov)

589−- GraphQL, see #625 (@dandavison)

590−- Verilog, see #616

591−- SCSS and Sass, see #637

592−- `strace` syntax, see #599

593−

594−## Packaging

595−

596−- `bat` is now in the official Gentoo repositories, see #588 (@toku-sa-n)

597−- `bat` is now in the official Alpine Linux repositories, see #586 (@5paceToast)

598−- `bat` is in the official Fedora repositories, see #610 (@ignatenkobrain)

599−

600−# v0.11.0

601−

602−## Features

603−

604−- Three new special color themes are available: `ansi-light`, `ansi-dark` and `base16`. These

605− are useful for people that often switch from dark to light themes in their terminal emulator

606− or for people that want the colors to match their terminal theme colors. For more details,

607− see #543 and #490 (@mk12, implementation idea by @trishume)

608−- Hand-written auto completion script for Fish shell, see #524 and #555 (@ev-dev and @eth-p)

609−- The `-p`/`--plain` option can now be used twice (typically `-pp`). The first `-p` switches the

610− `--style` to "plain". The second `-p` disables the pager. See #560 and #552 (@eth-p)

611−

612−## Bugfixes

613−

614−- Do not replace arguments to `less` when using `--pager`, see #509

615−- Binary files will now be indicated by a warning in interactive mode, see #530 #466 #550 (@maxfilov)

616−- Empty files are (once again) printed with a single header line, see #504 and #566 (@reidwagner

617− and @sharkdp)

618−- `--terminal-width=0` is now disallowed, see #559 (@eth-p)

619−- Accidental printing of files named `cache`, see #557

620−

621−## Other

622−

623−- New integration tests, see #500 and #502 (@reidwagner and @sharkdp)

624−- New ["Integration with other tools"](https://github.com/sharkdp/bat#integration-with-other-tools) section in the README.

625−- Migrated to Rust 2018 (@expobrain)

626−

627−## New syntaxes

628−

629−- F# syntax has been updated, see #531 (@stroborobo)

630−- Fish shell, see #548 (@sanga)

631−

632−## Packaging

633−

634−- `bat` is now available on Chocolatey, see #541 (@rasmuskriest)

635−

636−# v0.10.0

637−

638−## Features

639−

640−- Added new `--highlight-line <N>` option, see #453, #346 and #175 (@tskinn and @sharkdp)

641−

642−## Changes

643−

644−- **Change the default configuration directory on macOS** to `~/.config/bat`, see #442 (@lavifb). If you are on macOS, you need to copy your configuration directory from the previous place (`~/Library/Preferences/bat`) to the new place (`~/.config/bat`).

645−- Completely disabled the generation of shell completion files, see #372

646−- Properly set arguments to `less` if `PAGER` environment variable contains something like `less -F` (which is missing the `-R` option), see #430 (@majecty)

647−- Report the name of missing files, see #444 (@ufuji1984)

648−- Don't start pager if file doesn't exist, see #387

649−- Rename `bat cache --init` to `bat cache --build`, see #498

650−- Move the `--config-dir` and `--cache-dir` options from `bat cache` to `bat` and hide them from the help text.

651−

652−## Bugfixes

653−

654−- Blank line at the end of output when using `--style=plain`, see #379

655−- EOF must be sent twice on stdin if no other input is sent, see #477 (@reidwagner)

656−

657−## New syntaxes

658−

659−- Twig (@ahmedelgabri)

660−- `.desktop` files (@jleclanche)

661−- AsciiDoc (@markusthoemmes)

662−- Assembly (x86_64 and ARM)

663−- Log files (@caos21)

664−- Protobuf and ProtobufText (@caos21)

665−- Terraform (@caos21)

666−- Jsonnet (@hfm)

667−- Varlink (@haraldh)

668−

669−## Other

670−

671−- Added Japanese version of README (@sh-tech and @object1037)

672−- Code improvements (@barskern)

673−

674−# v0.9.0

675−

676−## Features

677−

678−- A new `-A`/`--show-all` option has been added to show and highlight non-printable characters (in analogy to GNU `cat`s option):

679−

680− ![](https://camo.githubusercontent.com/c3e769482ef3184f6be6adaa34bdc8d19c378254/68747470733a2f2f692e696d6775722e636f6d2f324b54486859542e706e67)

681−

682− see #395 and #381 for more details.

683−

684−- Added `--pager` option (to configure the pager from the configuration file), see #362 (@majecty)

685−

686−- Added `BAT_CONFIG_PATH` environment variable to set a non-default path for `bat`s configuration file, see #375 (@deg4uss3r)

687−

688−- Allow for multiple occurrences of `--style` to allow for the configuration

689− of styles from the config file, see #367 (@sindreij)

690−

691−- Allow for multiple `--line-range` arguments, see #23

692−

693−- The `--terminal-width` option can now also accept offsets, see #376

694−

695−## Changes

696−

697−- Use of italics is now *disabled by default* (see #389 for details). They can be

698− re-enabled by adding `--italic-text=always` to your configuration file.

699−

700−- The default tab-width has been set to 4.

701−

702−- Added new "Sublime Snazzy" theme.

703−

704−- Shell completions are currently *not* shipped anymore, see #372 for details.

705−

706−## Bugfixes

707−

708−- Avoid endless recursion when `PAGER="bat"`, see #383 (@rodorgas)

709−

710−## Other

711−

712−- `bat` is now available on openSUSE, see #405 (@dmarcoux)

713−

714−- Added section about the new configuration file in the README (@deg4uss3r)

715−

716−- Chinese translation of README (@chinanf-boy)

717−

718−- Re-written tests for `--tabs` (@choznerol)

719−

720−- Speed up integration tests, see #394

721−

722−# v0.8.0

723−

724−## Features

725−

726−- Support for a configuration file with the following simple format:

727−

728− ```bash

729− --tabs=4

730− --theme="Sublime Snazzy"

731−

732− # A line-comment

733− --map-syntax .ignore:.gitignore

734− --map-syntax PKGBUILD:bash

735− --map-syntax Podfile:ruby

736−

737− # Flags and options can also be on a single line:

738− --wrap=never --paging=never

739− ```

740−

741− The configuration file path can be accessed via `bat --config-file`. On Linux,

742− it is stored in `~/.config/bat/config`.

743−

744−- Support for the `BAT_OPTS` environment variable with the same format as specified

745− above (in a single line). This takes precedence over the configuration file.

746−

747− See also #310.

748−

749−- Support for custom syntax mappings via the `-m`/`--max-syntax` option.

750−

751− This allows users to (re)map certain file extensions or file names to an existing syntax:

752−

753− ``` bash

754− bat --map-syntax .config:json ...

755− ```

756−

757− The option can be use multiple times. Note that you can easily make these mappings permanent by using bats new configuration file.

758−

759− See #169

760−

761−- Support pager command-line arguments in `PAGER` and `BAT_PAGER`, see #352 (@Foxboron)

762−

763−- Add support for wildcards in Windows CMD, see #309 (@zxey)

764−

765−- First-line syntax detection for all input types, see #205

766−

767−- Encoding support for UTF-16LE and UTF-16BE, see #285

768−

769−- New syntaxes: Robot framework (@sanga)

770−

771−## Changes

772−

773−- Binary files are now detected and not displayed when the output goes to an interactive terminal, see #205

774−

775−## Bugfixes

776−

777−- JavaDoc comments break syntax highlighting in .java files, see #81

778−

779−- Bat Panics on Haskell Source Code, see #314

780−

781−## Other

782−

783−- Better `-h` and `--help` texts.

784−

785−- Updated documentation on how to configure `bat`s pager

786−

787−- Updated documentation for light backgrounds, see #328 (@russtaylor)

788−

789−- Generate shell completions during build, see #115 (@davideGiovannini)

790−

791−- A lot of new tests have been written

792−

793−- `bat` is now available via [Termux](https://termux.com/), see #341 (@fornwall)

794−

795−- `bat` is now available via [nix](https://nixos.org/nix), see #344 (@mgttlinger)

796−

797−- `bat` is now available via [Docker](https://hub.docker.com/r/danlynn/bat/), see #331 (@danlynn)

798−

799−# v0.7.1

800−

801−## Features

802−

803−- Use the `ansi_colours` package by @mina86 for better true-color approximation on 8 bit color terminals, see #319 and #202.

804−

805−## Bugfixes

806−

807−- Bat Panics on Haskell Source Code, see #314

808−- Disable wrapping when `--style=plain`/`-p` is used, see #289

809−

810−## Other

811−

812−- Added Ansible install instructions (@aeimer)

813−- Added section about Cygwin to the README (@eth-p)

814−

815−# v0.7.0

816−

817−## Features

818−

819−- Tabs are now (optionally) expanded to spaces. This can be controlled with the new

820− `--tabs` command-line option or the `BAT_TABS` environment variable. The

821− new feature also closes two bugs #166 and #184. For more information, see #302 (@eth-p).

822−

823−- Added support for the `BAT_STYLE` environment variable, see #208 (@ms2300)

824−

825−- Added `OneHalf` theme for terminals with a light-gray background, see #256

826−

827−- Added new syntaxes for CSV, JSX in JavaScript and TypeScript, Cabal, Dart,

828− F#, PureScript, Swift, Crystal, PowerShell (Many Thanks to @tobenna and @mimadrid)

829−

830−## Changes

831−

832−- Query `git diff` only when needed, see #303 (@ShikChen)

833−

834−- Disable wrapping when `--plain` is used, see #289 (@eth-p)

835−

836−## Bugfixes

837−

838−- Can read files named `cache`, see #275 (@BK1603)

839−

840−- A lot of bugfixes for Windows, see #252, #264

841−

842−- Detect `less` reliably and in a portable way, see #271 and #290 (@Aankhen)

843−

844−- last decoration line is not formatted properly with `--wrap never`, see #299 (@Rogach)

845−

846−- Do not show file header for directories, see #292

847−

848−## Other

849−

850−- Enabled a new `aarch64` build target, see #258 (@rachitchokshi)

851−

852−- Provide Debian packages for `armhf`, see #280 (@rachitchokshi)

853−

854−- Added README section about "`bat` on Windows" (@Aankhen)

855−

856−- Windows installation via scoop (@meltinglava)

857−

858−# v0.6.1

859−

860−## Bugfixes

861−

862−- Fixed panic when running `bat --list-languages | head`, see #232 (@mchlrhw)

863−- Respect `--color` settings for `--list-themes` and `--list-languages`, see #233

864−- Git modifications now work on Windows

865−

866−## Other

867−

868−- There will be auto-generated Windows releases, starting with this version (@anykao)

869−

870−# v0.6.0

871−

872−## Features

873−

874−- The `--list-themes` option now shows a preview for each highlighting theme (@ms2300)

875−- Added `-p`/`--plain` as an alias for `--style=plain`, see #212 (@ms2300)

876−- Major refactorings, enabling some progress on #150. In non-interactive mode, `bat` will now copy input bytes 1:1.

877−- New languages: Elm, Kotlin, Puppet, TypeScript, see #215 #216 #217 #218

878−- New syntax highlighting theme: zenburn (@colindean)

879−

880−## Changes

881−

882−- New themes in `$BAT_CONFIG_DIR/themes` are now loaded *in addition* to

883− the default themes (they may also override), see #172

884−- The `Default.tmTheme` symlink is not necessary anymore.

885−

886−## Bugfixes

887−

888−* Using `bat cache --init` leads to duplicated syntaxes, see #206

889−

890−## Other

891−

892−* Extended and cleaned-up `--help` text.

893−* Added initial version of a man page, see #52

894−* New README sections: *Development* and *Troubleshooting*, see #220

895−

896−# v0.5.0

897−

898−## Features

899−

900−- Added `--line-range n:m` option to print a range of lines, see #159 (@tskinn)

901−- The syntax highlighting theme can now be controlled by the `BAT_THEME` environment variable, see [README](https://github.com/sharkdp/bat#highlighting-theme) and #177 (@mandx)

902−- The `PAGER` and `BAT_PAGER` environment variables can be used to control the pager that `bat` uses, see #158 and the [new README section](https://github.com/sharkdp/bat#using-a-different-pager)

903−- Added syntax highlighting for Nix, see #180

904−- Added syntax highlighting for AWK (Gert Hulselmans)

905−

906−## Changes

907−

908−- The customization of syntax sets and theme sets is now separated. Syntax definitions are now loaded *in addition* to the ones that are stored in the `bat` binary by default. Please refer to these new sections in the README: [Adding new syntaxes](https://github.com/sharkdp/bat#adding-new-syntaxes--language-definitions), [Adding new themes](https://github.com/sharkdp/bat#adding-new-themes), also see #172

909−- The color for the filename is now the default foreground color. The colors for the grid and the line numbers is now determined from the syntax highlighting theme, which now also works for light backgrounds, see #178.

910−

911−## Bugfixes

912−

913−- Escape Sequences get partially stripped, see #182 (@eth-p)

914−- Use separate Git repository for snapshot testing, see #165 and #161

915−- Markdown breaking on JavaScript, see #183

916−

917−## Other

918−

919−- Binaries for armv7 are now provided, see #196

920−- `bat` is now in the official [Arch package repositories](https://www.archlinux.org/packages/community/x86_64/bat/).

921−- Optimizations in the RGB => 8-bit conversion (@mina86)

922−

923−# v0.4.1

924−

925−(this is just a small bugfix release, see 0.4.0 for all features and changes)

926−

927−## Bugfixes

928−

929−- Fix problem with `cargo test` when `bat` is not checked out in a Git repository, see #161

930−

931−# v0.4.0

932−

933−## Features

934−

935−* Support for line-wrapping, see #54 and #102 (@eth-p)

936−* New and updated `--style` parameter, see #74 and README (@pitkley)

937−* Added `--theme` and `--list-themes` options, see #89 (@rleungx)

938−* Added syntax highlighting for: Julia (@iamed2), Dockerfiles, VimL, CMake, INI, Less

939−* Added a few popular Sublime Text highlighting themes, see #133

940−* Support for bold, italic and underline font styles, see #96

941−* Support for 32bit systems is now available, see #84

942−* Added `-u` and `-n` options, see #134

943−* ANSI color support on Windows 10

944−

945−## Changes

946−

947−* The customization folder for own syntaxes has been renamed from `syntax` to `syntaxes`, see README.

948−* Changed Markdown syntax to the default Sublime Text syntax, see #157

949−* Sorted language listing (@rleungx)

950−* Command line arguments like `--theme` or `--color` can now override themselves.

951−* Improved `--help` text.

952−

953−## Bugfixes

954−

955−- Fixed crash for (really) small terminal sizes, see #117 (@eth-p)

956−- Syntax detection for `.bashrc`, `CMakeLists.txt` etc., see #100

957−- Properly handle lines with invalid UTF-8, see #7 (@BrainMaestro)

958−- Better error handling, see #17 (@rleungx and @sharkdp)

959−- Proper handling of UTF-8 characters in `less`, see #98 (@ghuls)

960−- Build fix on nightly, see #148 (@tathanhdinh)

961−

962−## Other

963−

964−- [Comparison with alternative projects](https://github.com/sharkdp/bat/blob/master/doc/alternatives.md).

965−- New "bat" logo in the README, see #119 (@jraulhernandezi)

966−- Output test cases (@BrainMaestro)

967−- Lots of great refactoring work (@BrainMaestro)

968−

969−# v0.3.0

970−

971−## Features

972−

973−* Automatic paging by integrating with `less`, see #29 (@BrainMaestro)

974−* Added support for reading from standard input, see #2

975−* Added support for writing to non-interactive terminals (pipes, files, ..); new

976− `--color=auto/always/never` option, see #26 (@BrainMaestro)

977−* Added `--list-languages` option to print all available syntaxes, see #69 (@connorkuehl)

978−* New option to specify the syntax via `-l`/`--language`, see #19 (@BrainMaestro)

979−* New option to control the output style (`--style`), see #5 (@nakulcg)

980−* Added syntax highlighting support for TOML files, see #37

981−

982−## Changes

983−

984−* The `init-cache` sub-command has been removed. The cache can now be controlled via

985− `bat cache`. See `bat cache -h` for all available commands.

986−

987−## Bug fixes

988−

989−* Get git repository from file path instead of current directory, see #22 (@nakulcg)

990−* Process substitution can now be used with bat (`bat <(echo a) <(echo b)`), see #80

991−

992−## Thanks

993−

994−I'd like to say a big THANK YOU to all contributors and everyone that has given us

995−some form of feedback.

996−

997−Special thanks go to @BrainMaestro for his huge support with new features, bug reports

998−and code reviews!

999−

1000−# v0.2.3

1001−

1002−- Added a new statically linked version of bat (`..-musl-..`)

1003−

1004−# v0.2.2

1005−

1006−- Remove openssl dependency completely, see #30.

1007−

1008−# v0.2.1

1009−

1010−- Added Elixir syntax, see #25.

1011−- Use libcurl-openssl instead of libcurl-gnutls, see #30.

1012−

1013−# v0.2.0

1014−

1015−- Support for custom syntaxes, add 'Markdown extended' theme

1016−- Bugfix: Git modifications not shown from child folder

1017−

1018−# v0.1.0

1019−

1020−Initial release

CONTRIBUTING.mddeleted−70

@@ -1,70 +0,0 @@

1−# Contributing

2−

3−Thank you for considering to contribute to `bat`!

4−

5−

6−

7−## Add an entry to the changelog

8−

9−If your contribution changes the behavior of `bat` (as opposed to a typo-fix

10−in the documentation), please update the [`CHANGELOG.md`](CHANGELOG.md) file

11−and describe your changes. This makes the release process much easier and

12−therefore helps to get your changes into a new `bat` release faster.

13−

14−The top of the `CHANGELOG` contains a *"unreleased"* section with a few

15−subsections (Features, Bugfixes, …). Please add your entry to the subsection

16−that best describes your change.

17−

18−Entries follow this format:

19−```

20−- Short description of what has been changed, see #123 (@user)

21−```

22−Here, `#123` is the number of the original issue and/or your pull request.

23−Please replace `@user` by your GitHub username.

24−

25−

26−## Development

27−

28−Please check out the [Development](https://github.com/sharkdp/bat#development)

29−section in the README.

30−

31−

32−## Adding a new feature

33−

34−Please consider opening a

35−[feature request ticket](https://github.com/sharkdp/bat/issues/new?assignees=&labels=feature-request&template=feature_request.md)

36−first in order to give us a chance to discuss the feature first.

37−

38−

39−## Adding new syntaxes/languages or themes

40−

41−Before you make a pull request that adds a new syntax or theme, please read

42−the [Customization](https://github.com/sharkdp/bat#customization) section

43−in the README first.

44−

45−If you really think that a particular syntax or theme should be added for all

46−users, please read the corresponding

47−[documentation](https://github.com/sharkdp/bat/blob/master/doc/assets.md)

48−first.

49−

50−

51−## Regression tests

52−

53−You are strongly encouraged to add regression tests. Regression tests are great,

54−not least because they:

55−

56−* ensure that your contribution will never completely stop working,

57−

58−* makes code review easier, because it becomes very clear what the code is

59− supposed to do.

60−

61−For functional changes, you most likely want to add a test to

62−[`tests/integration_tests.rs`](https://github.com/sharkdp/bat/blob/master/tests/integration_tests.rs).

63−Look at existing tests to know how to write a new test. In short, you will

64−invoke the `bat` binary with a certain set of arguments, and then assert on

65−stdout/stderr.

66−

67−To learn how to write regression tests for theme and syntax changes, read the

68−[Syntax

69−tests](https://github.com/sharkdp/bat/blob/master/doc/assets.md#syntax-tests)

70−section in `assets.md`.

Cargo.lock+1003−655

@@ -1,1340 +1,1688 @@

1# This file is automatically @generated by Cargo.

2# It is not intended for manual editing.

3−version = 3

4−

5[[package]]

3[[package]]

6−name = "adler"

4+name = "adler32"

7−version = "1.0.2"

5+version = "1.0.3"

8source = "registry+https://github.com/rust-lang/crates.io-index"

6source = "registry+https://github.com/rust-lang/crates.io-index"

9−checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"

10

7

11[[package]]

8[[package]]

12name = "aho-corasick"

9name = "aho-corasick"

13−version = "0.7.18"

10+version = "0.7.6"

14source = "registry+https://github.com/rust-lang/crates.io-index"

11source = "registry+https://github.com/rust-lang/crates.io-index"

15−checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"

16dependencies = [

12dependencies = [

17− "memchr",

13+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",

18]

14]

19

15

20[[package]]

16[[package]]

21name = "ansi_colours"

17name = "ansi_colours"

22−version = "1.1.1"

18+version = "1.0.1"

23source = "registry+https://github.com/rust-lang/crates.io-index"

19source = "registry+https://github.com/rust-lang/crates.io-index"

24−checksum = "32678233b67f9056b0c144b39d46dc3218637e8d84ad6038ded339e08b19620d"

25dependencies = [

20dependencies = [

26− "rgb",

21+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",

22+]

23+

24+[[package]]

25+name = "ansi_term"

26+version = "0.11.0"

27+source = "registry+https://github.com/rust-lang/crates.io-index"

28+dependencies = [

29+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",

27]

30]

28

31

29[[package]]

32[[package]]

30name = "ansi_term"

33name = "ansi_term"

31version = "0.12.1"

34version = "0.12.1"

32source = "registry+https://github.com/rust-lang/crates.io-index"

35source = "registry+https://github.com/rust-lang/crates.io-index"

33−checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"

34dependencies = [

36dependencies = [

35− "winapi",

37+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",

38+]

39+

40+[[package]]

41+name = "anymap"

42+version = "0.12.1"

43+source = "registry+https://github.com/rust-lang/crates.io-index"

44+

45+[[package]]

46+name = "arrayref"

47+version = "0.3.5"

48+source = "registry+https://github.com/rust-lang/crates.io-index"

49+

50+[[package]]

51+name = "arrayvec"

52+version = "0.4.11"

53+source = "registry+https://github.com/rust-lang/crates.io-index"

54+dependencies = [

55+ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",

36]

56]

37

57

38[[package]]

58[[package]]

39name = "assert_cmd"

59name = "assert_cmd"

40−version = "2.0.4"

60+version = "0.11.1"

41source = "registry+https://github.com/rust-lang/crates.io-index"

61source = "registry+https://github.com/rust-lang/crates.io-index"

42−checksum = "93ae1ddd39efd67689deb1979d80bad3bf7f2b09c6e6117c8d1f2443b5e2f83e"

43dependencies = [

62dependencies = [

44− "bstr",

63+ "escargot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",

45− "doc-comment",

64+ "predicates 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",

46− "predicates",

65+ "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",

47− "predicates-core",

66+ "predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",

48− "predicates-tree",

49− "wait-timeout",

50]

67]

51

68

52[[package]]

69[[package]]

53name = "atty"

70name = "atty"

54−version = "0.2.14"

71+version = "0.2.13"

55source = "registry+https://github.com/rust-lang/crates.io-index"

72source = "registry+https://github.com/rust-lang/crates.io-index"

56−checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"

57dependencies = [

73dependencies = [

58− "hermit-abi",

74+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",

59− "libc",

75+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",

60− "winapi",

61]

76]

62

77

63[[package]]

78[[package]]

64name = "autocfg"

79name = "autocfg"

65−version = "1.0.1"

80+version = "0.1.6"

66source = "registry+https://github.com/rust-lang/crates.io-index"

81source = "registry+https://github.com/rust-lang/crates.io-index"

67−checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"

82+

83+[[package]]

84+name = "backtrace"

85+version = "0.3.35"

86+source = "registry+https://github.com/rust-lang/crates.io-index"

87+dependencies = [

88+ "backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",

89+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",

90+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",

91+ "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",

92+]

93+

94+[[package]]

95+name = "backtrace-sys"

96+version = "0.1.31"

97+source = "registry+https://github.com/rust-lang/crates.io-index"

98+dependencies = [

99+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",

100+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",

101+]

68

102

69[[package]]

103[[package]]

70name = "base64"

104name = "base64"

71−version = "0.13.0"

105+version = "0.10.1"

72source = "registry+https://github.com/rust-lang/crates.io-index"

106source = "registry+https://github.com/rust-lang/crates.io-index"

73−checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"

107+dependencies = [

108+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",

109+]

74

110

75[[package]]

111[[package]]

76name = "bat"

112name = "bat"

77−version = "0.21.0"

113+version = "0.12.1"

78−dependencies = [

114+dependencies = [

79− "ansi_colours",

115+ "ansi_colours 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",

80− "ansi_term",

116+ "ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",

81− "assert_cmd",

117+ "assert_cmd 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",

82− "atty",

118+ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",

83− "bincode",

119+ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",

84− "bugreport",

120+ "console 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",

85− "bytesize",

86− "clap",

87− "clircle",

88− "console",

89− "content_inspector",

121+ "content_inspector 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",

90− "dirs-next",

122+ "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",

91− "encoding",

123+ "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",

92− "flate2",

124+ "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",

93− "git2",

125+ "escargot 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",

94− "globset",

126+ "git2 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",

95− "grep-cli",

127+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",

96− "nix",

128+ "liquid 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",

97− "once_cell",

129+ "shell-words 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",

98− "path_abs",

130+ "syntect 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)",

99− "predicates",

131+ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",

100− "regex",

132+ "wild 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",

101− "semver",

102− "serde",

103− "serde_yaml",

104− "serial_test",

105− "shell-words",

106− "syntect",

107− "tempfile",

108− "thiserror",

109− "unicode-width",

110− "wait-timeout",

111− "walkdir",

112− "wild",

113]

133]

114

134

115[[package]]

135[[package]]

116name = "bincode"

136name = "bincode"

117−version = "1.3.3"

137+version = "1.1.4"

118source = "registry+https://github.com/rust-lang/crates.io-index"

138source = "registry+https://github.com/rust-lang/crates.io-index"

119−checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"

120dependencies = [

139dependencies = [

121− "serde",

140+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",

141+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",

142+ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",

122]

143]

123

144

124[[package]]

145[[package]]

125−name = "bit-set"

146+name = "bindgen"

126−version = "0.5.2"

147+version = "0.50.0"

127source = "registry+https://github.com/rust-lang/crates.io-index"

148source = "registry+https://github.com/rust-lang/crates.io-index"

128−checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de"

129dependencies = [

149dependencies = [

130− "bit-vec",

150+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",

151+ "cexpr 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",

152+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",

153+ "clang-sys 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)",

154+ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",

155+ "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",

156+ "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",

157+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",

158+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",

159+ "peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",

160+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",

161+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",

162+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

163+ "shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",

164+ "which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",

131]

165]

132

166

133[[package]]

167[[package]]

134−name = "bit-vec"

168+name = "bitflags"

135−version = "0.6.3"

169+version = "1.1.0"

136source = "registry+https://github.com/rust-lang/crates.io-index"

170source = "registry+https://github.com/rust-lang/crates.io-index"

137−checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"

138

171

139[[package]]

172[[package]]

140−name = "bitflags"

173+name = "blake2b_simd"

141−version = "1.3.2"

174+version = "0.5.7"

142source = "registry+https://github.com/rust-lang/crates.io-index"

175source = "registry+https://github.com/rust-lang/crates.io-index"

143−checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

176+dependencies = [

177+ "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",

178+ "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",

179+ "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",

180+]

144

181

145[[package]]

182[[package]]

146−name = "bstr"

183+name = "block-buffer"

147−version = "0.2.17"

184+version = "0.7.3"

148source = "registry+https://github.com/rust-lang/crates.io-index"

185source = "registry+https://github.com/rust-lang/crates.io-index"

149−checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"

150dependencies = [

186dependencies = [

151− "lazy_static",

187+ "block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",

152− "memchr",

188+ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

153− "regex-automata",

189+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",

190+ "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",

154]

191]

155

192

156[[package]]

193[[package]]

157−name = "bugreport"

194+name = "block-padding"

158−version = "0.5.0"

195+version = "0.1.4"

159source = "registry+https://github.com/rust-lang/crates.io-index"

196source = "registry+https://github.com/rust-lang/crates.io-index"

160−checksum = "535120b8182547808081a66f1f77a64533c780b23da26763e0ee34dfb94f98c9"

161dependencies = [

197dependencies = [

162− "git-version",

198+ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

163− "shell-escape",

164− "sys-info",

165]

199]

166

200

167[[package]]

201[[package]]

168−name = "bytemuck"

202+name = "byte-tools"

169−version = "1.7.3"

203+version = "0.3.1"

170source = "registry+https://github.com/rust-lang/crates.io-index"

204source = "registry+https://github.com/rust-lang/crates.io-index"

171−checksum = "439989e6b8c38d1b6570a384ef1e49c8848128f5a97f3914baef02920842712f"

172

205

173[[package]]

206[[package]]

174−name = "bytesize"

207+name = "byteorder"

175−version = "1.1.0"

208+version = "1.3.2"

176source = "registry+https://github.com/rust-lang/crates.io-index"

209source = "registry+https://github.com/rust-lang/crates.io-index"

177−checksum = "6c58ec36aac5066d5ca17df51b3e70279f5670a72102f5752cb7e7c856adfc70"

178

210

179[[package]]

211[[package]]

180name = "cc"

212name = "cc"

181−version = "1.0.72"

213+version = "1.0.45"

214+source = "registry+https://github.com/rust-lang/crates.io-index"

215+dependencies = [

216+ "jobserver 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",

217+ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",

218+]

219+

220+[[package]]

221+name = "cexpr"

222+version = "0.3.5"

182source = "registry+https://github.com/rust-lang/crates.io-index"

223source = "registry+https://github.com/rust-lang/crates.io-index"

183−checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"

184dependencies = [

224dependencies = [

185− "jobserver",

225+ "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",

186]

226]

187

227

188[[package]]

228[[package]]

189name = "cfg-if"

229name = "cfg-if"

190−version = "1.0.0"

230+version = "0.1.9"

191source = "registry+https://github.com/rust-lang/crates.io-index"

231source = "registry+https://github.com/rust-lang/crates.io-index"

192−checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

232+

233+[[package]]

234+name = "chrono"

235+version = "0.4.9"

236+source = "registry+https://github.com/rust-lang/crates.io-index"

237+dependencies = [

238+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",

239+ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",

240+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",

241+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",

242+]

243+

244+[[package]]

245+name = "clang-sys"

246+version = "0.28.1"

247+source = "registry+https://github.com/rust-lang/crates.io-index"

248+dependencies = [

249+ "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",

250+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",

251+ "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",

252+]

193

253

194[[package]]

254[[package]]

195name = "clap"

255name = "clap"

196−version = "2.34.0"

256+version = "2.33.0"

197source = "registry+https://github.com/rust-lang/crates.io-index"

257source = "registry+https://github.com/rust-lang/crates.io-index"

198−checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"

199dependencies = [

258dependencies = [

200− "ansi_term",

259+ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",

201− "atty",

260+ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",

202− "bitflags",

261+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",

203− "strsim",

262+ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",

204− "term_size",

263+ "term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

205− "textwrap",

264+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",

206− "unicode-width",

265+ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",

207− "vec_map",

266+ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",

208]

267]

209

268

210[[package]]

269[[package]]

211−name = "clircle"

270+name = "clicolors-control"

212−version = "0.3.0"

271+version = "1.0.1"

213source = "registry+https://github.com/rust-lang/crates.io-index"

272source = "registry+https://github.com/rust-lang/crates.io-index"

214−checksum = "e68bbd985a63de680ab4d1ad77b6306611a8f961b282c8b5ab513e6de934e396"

215dependencies = [

273dependencies = [

216− "cfg-if",

274+ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",

217− "libc",

275+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",

218− "serde",

276+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",

219− "winapi",

277+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",

278+]

279+

280+[[package]]

281+name = "cloudabi"

282+version = "0.0.3"

283+source = "registry+https://github.com/rust-lang/crates.io-index"

284+dependencies = [

285+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",

220]

286]

221

287

222[[package]]

288[[package]]

223name = "console"

289name = "console"

224−version = "0.15.0"

290+version = "0.9.1"

225source = "registry+https://github.com/rust-lang/crates.io-index"

291source = "registry+https://github.com/rust-lang/crates.io-index"

226−checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31"

227dependencies = [

292dependencies = [

228− "encode_unicode",

293+ "clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",

229− "libc",

294+ "encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",

230− "once_cell",

295+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",

231− "regex",

296+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",

232− "terminal_size",

297+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

233− "unicode-width",

298+ "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

234− "winapi",

299+ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",

300+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",

235]

301]

236

302

303+[[package]]

304+name = "constant_time_eq"

305+version = "0.1.4"

306+source = "registry+https://github.com/rust-lang/crates.io-index"

307+

237[[package]]

308[[package]]

238name = "content_inspector"

309name = "content_inspector"

239version = "0.2.4"

310version = "0.2.4"

240source = "registry+https://github.com/rust-lang/crates.io-index"

311source = "registry+https://github.com/rust-lang/crates.io-index"

241−checksum = "b7bda66e858c683005a53a9a60c69a4aca7eeaa45d124526e389f7aec8e62f38"

242dependencies = [

312dependencies = [

243− "memchr",

313+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",

244]

314]

245

315

246[[package]]

316[[package]]

247name = "crc32fast"

317name = "crc32fast"

248−version = "1.3.0"

318+version = "1.2.0"

249source = "registry+https://github.com/rust-lang/crates.io-index"

319source = "registry+https://github.com/rust-lang/crates.io-index"

250−checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836"

251dependencies = [

320dependencies = [

252− "cfg-if",

321+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",

253]

322]

254

323

255[[package]]

324[[package]]

256−name = "difflib"

325+name = "crossbeam-utils"

257−version = "0.4.0"

326+version = "0.6.6"

327+source = "registry+https://github.com/rust-lang/crates.io-index"

328+dependencies = [

329+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",

330+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",

331+]

332+

333+[[package]]

334+name = "deunicode"

335+version = "1.0.0"

258source = "registry+https://github.com/rust-lang/crates.io-index"

336source = "registry+https://github.com/rust-lang/crates.io-index"

259−checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"

260

337

261[[package]]

338[[package]]

262−name = "dirs-next"

339+name = "difference"

263version = "2.0.0"

340version = "2.0.0"

264source = "registry+https://github.com/rust-lang/crates.io-index"

341source = "registry+https://github.com/rust-lang/crates.io-index"

265−checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"

342+

343+[[package]]

344+name = "digest"

345+version = "0.8.1"

346+source = "registry+https://github.com/rust-lang/crates.io-index"

266dependencies = [

347dependencies = [

267− "cfg-if",

348+ "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",

268− "dirs-sys-next",

269]

349]

270

350

271[[package]]

351[[package]]

272−name = "dirs-sys-next"

352+name = "dirs"

273−version = "0.1.2"

353+version = "2.0.2"

274source = "registry+https://github.com/rust-lang/crates.io-index"

354source = "registry+https://github.com/rust-lang/crates.io-index"

275−checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"

276dependencies = [

355dependencies = [

277− "libc",

356+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",

278− "redox_users",

357+ "dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",

279− "winapi",

358+]

359+

360+[[package]]

361+name = "dirs-sys"

362+version = "0.3.4"

363+source = "registry+https://github.com/rust-lang/crates.io-index"

364+dependencies = [

365+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",

366+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",

367+ "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

368+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",

280]

369]

281

370

282[[package]]

371[[package]]

283name = "doc-comment"

372name = "doc-comment"

284−version = "0.3.3"

373+version = "0.3.1"

285source = "registry+https://github.com/rust-lang/crates.io-index"

374source = "registry+https://github.com/rust-lang/crates.io-index"

286−checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"

287

375

288[[package]]

376[[package]]

289name = "either"

377name = "either"

290−version = "1.6.1"

378+version = "1.5.3"

291source = "registry+https://github.com/rust-lang/crates.io-index"

379source = "registry+https://github.com/rust-lang/crates.io-index"

292−checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"

293

380

294[[package]]

381[[package]]

295name = "encode_unicode"

382name = "encode_unicode"

296version = "0.3.6"

383version = "0.3.6"

297source = "registry+https://github.com/rust-lang/crates.io-index"

384source = "registry+https://github.com/rust-lang/crates.io-index"

298−checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"

299

385

300[[package]]

386[[package]]

301name = "encoding"

387name = "encoding"

302version = "0.2.33"

388version = "0.2.33"

303source = "registry+https://github.com/rust-lang/crates.io-index"

389source = "registry+https://github.com/rust-lang/crates.io-index"

304−checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"

305dependencies = [

390dependencies = [

306− "encoding-index-japanese",

391+ "encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",

307− "encoding-index-korean",

392+ "encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",

308− "encoding-index-simpchinese",

393+ "encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",

309− "encoding-index-singlebyte",

394+ "encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",

310− "encoding-index-tradchinese",

395+ "encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",

311]

396]

312

397

313[[package]]

398[[package]]

314name = "encoding-index-japanese"

399name = "encoding-index-japanese"

315version = "1.20141219.5"

400version = "1.20141219.5"

316source = "registry+https://github.com/rust-lang/crates.io-index"

401source = "registry+https://github.com/rust-lang/crates.io-index"

317−checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"

318dependencies = [

402dependencies = [

319− "encoding_index_tests",

403+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",

320]

404]

321

405

322[[package]]

406[[package]]

323name = "encoding-index-korean"

407name = "encoding-index-korean"

324version = "1.20141219.5"

408version = "1.20141219.5"

325source = "registry+https://github.com/rust-lang/crates.io-index"

409source = "registry+https://github.com/rust-lang/crates.io-index"

326−checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81"

327dependencies = [

410dependencies = [

328− "encoding_index_tests",

411+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",

329]

412]

330

413

331[[package]]

414[[package]]

332name = "encoding-index-simpchinese"

415name = "encoding-index-simpchinese"

333version = "1.20141219.5"

416version = "1.20141219.5"

334source = "registry+https://github.com/rust-lang/crates.io-index"

417source = "registry+https://github.com/rust-lang/crates.io-index"

335−checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7"

336dependencies = [

418dependencies = [

337− "encoding_index_tests",

419+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",

338]

420]

339

421

340[[package]]

422[[package]]

341name = "encoding-index-singlebyte"

423name = "encoding-index-singlebyte"

342version = "1.20141219.5"

424version = "1.20141219.5"

343source = "registry+https://github.com/rust-lang/crates.io-index"

425source = "registry+https://github.com/rust-lang/crates.io-index"

344−checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"

345dependencies = [

426dependencies = [

346− "encoding_index_tests",

427+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",

347]

428]

348

429

349[[package]]

430[[package]]

350name = "encoding-index-tradchinese"

431name = "encoding-index-tradchinese"

351version = "1.20141219.5"

432version = "1.20141219.5"

352source = "registry+https://github.com/rust-lang/crates.io-index"

433source = "registry+https://github.com/rust-lang/crates.io-index"

353−checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"

354dependencies = [

434dependencies = [

355− "encoding_index_tests",

435+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",

356]

436]

357

437

358[[package]]

438[[package]]

359name = "encoding_index_tests"

439name = "encoding_index_tests"

360version = "0.1.4"

440version = "0.1.4"

361source = "registry+https://github.com/rust-lang/crates.io-index"

441source = "registry+https://github.com/rust-lang/crates.io-index"

362−checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"

363

442

364[[package]]

443[[package]]

365−name = "fancy-regex"

444+name = "env_logger"

366−version = "0.7.1"

445+version = "0.6.2"

367source = "registry+https://github.com/rust-lang/crates.io-index"

446source = "registry+https://github.com/rust-lang/crates.io-index"

368−checksum = "9d6b8560a05112eb52f04b00e5d3790c0dd75d9d980eb8a122fb23b92a623ccf"

369dependencies = [

447dependencies = [

370− "bit-set",

448+ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",

371− "regex",

449+ "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",

450+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",

451+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

452+ "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",

372]

453]

373

454

374[[package]]

455[[package]]

375−name = "fastrand"

456+name = "error-chain"

376−version = "1.7.0"

457+version = "0.12.1"

377source = "registry+https://github.com/rust-lang/crates.io-index"

458source = "registry+https://github.com/rust-lang/crates.io-index"

378−checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"

379dependencies = [

459dependencies = [

380− "instant",

460+ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",

381]

461]

382

462

383[[package]]

463[[package]]

384−name = "flate2"

464+name = "escargot"

385−version = "1.0.23"

465+version = "0.4.0"

386source = "registry+https://github.com/rust-lang/crates.io-index"

466source = "registry+https://github.com/rust-lang/crates.io-index"

387−checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af"

388dependencies = [

467dependencies = [

389− "cfg-if",

468+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",

390− "crc32fast",

469+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",

391− "libc",

470+ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",

392− "miniz_oxide",

471+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",

393]

472]

394

473

395[[package]]

474[[package]]

396−name = "float-cmp"

475+name = "escargot"

397−version = "0.9.0"

476+version = "0.5.0"

398source = "registry+https://github.com/rust-lang/crates.io-index"

477source = "registry+https://github.com/rust-lang/crates.io-index"

399−checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"

400dependencies = [

478dependencies = [

401− "num-traits",

479+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",

480+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",

481+ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",

482+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",

402]

483]

403

484

404[[package]]

485[[package]]

405−name = "fnv"

486+name = "failure"

406−version = "1.0.7"

487+version = "0.1.5"

407−source = "registry+https://github.com/rust-lang/crates.io-index"

408−checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"

409−

410−[[package]]

411−name = "form_urlencoded"

412−version = "1.0.1"

413source = "registry+https://github.com/rust-lang/crates.io-index"

488source = "registry+https://github.com/rust-lang/crates.io-index"

414−checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"

415dependencies = [

489dependencies = [

416− "matches",

490+ "backtrace 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)",

417− "percent-encoding",

491+ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",

418]

492]

419

493

420[[package]]

494[[package]]

421−name = "getrandom"

495+name = "failure_derive"

422−version = "0.2.3"

496+version = "0.1.5"

423source = "registry+https://github.com/rust-lang/crates.io-index"

497source = "registry+https://github.com/rust-lang/crates.io-index"

424−checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"

425dependencies = [

498dependencies = [

426− "cfg-if",

499+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",

427− "libc",

500+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",

428− "wasi",

501+ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",

502+ "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",

429]

503]

430

504

431[[package]]

505[[package]]

432−name = "git-version"

506+name = "fake-simd"

433−version = "0.3.5"

507+version = "0.1.2"

434source = "registry+https://github.com/rust-lang/crates.io-index"

508source = "registry+https://github.com/rust-lang/crates.io-index"

435−checksum = "f6b0decc02f4636b9ccad390dcbe77b722a77efedfa393caf8379a51d5c61899"

436−dependencies = [

437− "git-version-macro",

438− "proc-macro-hack",

439−]

440

509

441[[package]]

510[[package]]

442−name = "git-version-macro"

511+name = "flate2"

443−version = "0.3.5"

512+version = "1.0.11"

444source = "registry+https://github.com/rust-lang/crates.io-index"

513source = "registry+https://github.com/rust-lang/crates.io-index"

445−checksum = "fe69f1cbdb6e28af2bac214e943b99ce8a0a06b447d15d3e61161b0423139f3f"

446dependencies = [

514dependencies = [

447− "proc-macro-hack",

515+ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",

448− "proc-macro2",

516+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",

449− "quote",

517+ "miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",

450− "syn",

518+ "miniz_oxide 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",

451]

519]

452

520

453[[package]]

521[[package]]

454−name = "git2"

522+name = "fnv"

455−version = "0.14.2"

523+version = "1.0.6"

456source = "registry+https://github.com/rust-lang/crates.io-index"

524source = "registry+https://github.com/rust-lang/crates.io-index"

457−checksum = "3826a6e0e2215d7a41c2bfc7c9244123969273f3476b939a226aac0ab56e9e3c"

458−dependencies = [

459− "bitflags",

460− "libc",

461− "libgit2-sys",

462− "log",

463− "url",

464−]

465

525

466[[package]]

526[[package]]

467−name = "glob"

527+name = "fuchsia-cprng"

468−version = "0.3.0"

528+version = "0.1.1"

469source = "registry+https://github.com/rust-lang/crates.io-index"

529source = "registry+https://github.com/rust-lang/crates.io-index"

470−checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"

471

530

472[[package]]

531[[package]]

473−name = "globset"

532+name = "fxhash"

474−version = "0.4.8"

533+version = "0.2.1"

475source = "registry+https://github.com/rust-lang/crates.io-index"

534source = "registry+https://github.com/rust-lang/crates.io-index"

476−checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd"

477dependencies = [

535dependencies = [

478− "aho-corasick",

536+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",

479− "bstr",

480− "fnv",

481− "log",

482− "regex",

483]

537]

484

538

485[[package]]

539[[package]]

486−name = "grep-cli"

540+name = "generic-array"

487−version = "0.1.6"

541+version = "0.12.3"

488source = "registry+https://github.com/rust-lang/crates.io-index"

542source = "registry+https://github.com/rust-lang/crates.io-index"

489−checksum = "2dd110c34bb4460d0de5062413b773e385cbf8a85a63fc535590110a09e79e8a"

490dependencies = [

543dependencies = [

491− "atty",

544+ "typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)",

492− "bstr",

493− "globset",

494− "lazy_static",

495− "log",

496− "regex",

497− "same-file",

498− "termcolor",

499− "winapi-util",

500]

545]

501

546

502[[package]]

547[[package]]

503−name = "hashbrown"

548+name = "getrandom"

504−version = "0.11.2"

549+version = "0.1.12"

505source = "registry+https://github.com/rust-lang/crates.io-index"

550source = "registry+https://github.com/rust-lang/crates.io-index"

506−checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"

551+dependencies = [

552+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",

553+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",

554+ "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",

555+]

507

556

508[[package]]

557[[package]]

509−name = "hermit-abi"

558+name = "git2"

510−version = "0.1.19"

559+version = "0.10.2"

511source = "registry+https://github.com/rust-lang/crates.io-index"

560source = "registry+https://github.com/rust-lang/crates.io-index"

512−checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"

513dependencies = [

561dependencies = [

514− "libc",

562+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",

563+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",

564+ "libgit2-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",

565+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",

566+ "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",

515]

567]

516

568

517[[package]]

569[[package]]

518−name = "idna"

570+name = "glob"

519−version = "0.2.3"

571+version = "0.3.0"

572+source = "registry+https://github.com/rust-lang/crates.io-index"

573+

574+[[package]]

575+name = "humantime"

576+version = "1.2.0"

520source = "registry+https://github.com/rust-lang/crates.io-index"

577source = "registry+https://github.com/rust-lang/crates.io-index"

521−checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"

522dependencies = [

578dependencies = [

523− "matches",

579+ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",

524− "unicode-bidi",

525− "unicode-normalization",

526]

580]

527

581

528[[package]]

582[[package]]

529−name = "indexmap"

583+name = "idna"

530−version = "1.7.0"

584+version = "0.1.5"

531source = "registry+https://github.com/rust-lang/crates.io-index"

585source = "registry+https://github.com/rust-lang/crates.io-index"

532−checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"

533dependencies = [

586dependencies = [

534− "autocfg",

587+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",

535− "hashbrown",

588+ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",

589+ "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",

536]

590]

537

591

538[[package]]

592[[package]]

539−name = "instant"

593+name = "idna"

540−version = "0.1.12"

594+version = "0.2.0"

541source = "registry+https://github.com/rust-lang/crates.io-index"

595source = "registry+https://github.com/rust-lang/crates.io-index"

542−checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"

543dependencies = [

596dependencies = [

544− "cfg-if",

597+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",

598+ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",

599+ "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",

545]

600]

546

601

547[[package]]

602[[package]]

548name = "itertools"

603name = "itertools"

549−version = "0.10.3"

604+version = "0.8.0"

550source = "registry+https://github.com/rust-lang/crates.io-index"

605source = "registry+https://github.com/rust-lang/crates.io-index"

551−checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"

552dependencies = [

606dependencies = [

553− "either",

607+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",

554]

608]

555

609

556[[package]]

610[[package]]

557name = "itoa"

611name = "itoa"

558−version = "0.4.8"

612+version = "0.4.4"

559source = "registry+https://github.com/rust-lang/crates.io-index"

613source = "registry+https://github.com/rust-lang/crates.io-index"

560−checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"

561

614

562[[package]]

615[[package]]

563−name = "itoa"

616+name = "jobserver"

564−version = "1.0.1"

617+version = "0.1.17"

565source = "registry+https://github.com/rust-lang/crates.io-index"

618source = "registry+https://github.com/rust-lang/crates.io-index"

566−checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"

619+dependencies = [

620+ "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",

621+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",

622+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",

623+]

567

624

568[[package]]

625[[package]]

569−name = "jobserver"

626+name = "kernel32-sys"

570−version = "0.1.24"

627+version = "0.2.2"

571source = "registry+https://github.com/rust-lang/crates.io-index"

628source = "registry+https://github.com/rust-lang/crates.io-index"

572−checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"

573dependencies = [

629dependencies = [

574− "libc",

630+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",

631+ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",

575]

632]

576

633

577[[package]]

634[[package]]

578name = "lazy_static"

635name = "lazy_static"

579version = "1.4.0"

636version = "1.4.0"

580source = "registry+https://github.com/rust-lang/crates.io-index"

637source = "registry+https://github.com/rust-lang/crates.io-index"

581−checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

638+

639+[[package]]

640+name = "lazycell"

641+version = "1.2.1"

642+source = "registry+https://github.com/rust-lang/crates.io-index"

582

643

583[[package]]

644[[package]]

584name = "libc"

645name = "libc"

585−version = "0.2.125"

646+version = "0.2.62"

586source = "registry+https://github.com/rust-lang/crates.io-index"

647source = "registry+https://github.com/rust-lang/crates.io-index"

587−checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b"

588

648

589[[package]]

649[[package]]

590name = "libgit2-sys"

650name = "libgit2-sys"

591−version = "0.13.2+1.4.2"

651+version = "0.9.2"

592source = "registry+https://github.com/rust-lang/crates.io-index"

652source = "registry+https://github.com/rust-lang/crates.io-index"

593−checksum = "3a42de9a51a5c12e00fc0e4ca6bc2ea43582fc6418488e8f615e905d886f258b"

594dependencies = [

653dependencies = [

595− "cc",

654+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",

596− "libc",

655+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",

597− "libz-sys",

656+ "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",

598− "pkg-config",

657+ "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",

658+]

659+

660+[[package]]

661+name = "libloading"

662+version = "0.5.2"

663+source = "registry+https://github.com/rust-lang/crates.io-index"

664+dependencies = [

665+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",

666+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",

599]

667]

600

668

601[[package]]

669[[package]]

602name = "libz-sys"

670name = "libz-sys"

603−version = "1.1.3"

671+version = "1.0.25"

604source = "registry+https://github.com/rust-lang/crates.io-index"

672source = "registry+https://github.com/rust-lang/crates.io-index"

605−checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66"

606dependencies = [

673dependencies = [

607− "cc",

674+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",

608− "libc",

675+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",

609− "pkg-config",

676+ "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",

610− "vcpkg",

677+ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",

611]

678]

612

679

613[[package]]

680[[package]]

614name = "line-wrap"

681name = "line-wrap"

615version = "0.1.1"

682version = "0.1.1"

616source = "registry+https://github.com/rust-lang/crates.io-index"

683source = "registry+https://github.com/rust-lang/crates.io-index"

617−checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9"

618dependencies = [

684dependencies = [

619− "safemem",

685+ "safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",

620]

686]

621

687

622[[package]]

688[[package]]

623name = "linked-hash-map"

689name = "linked-hash-map"

624−version = "0.5.4"

690+version = "0.5.2"

691+source = "registry+https://github.com/rust-lang/crates.io-index"

692+

693+[[package]]

694+name = "liquid"

695+version = "0.19.0"

625source = "registry+https://github.com/rust-lang/crates.io-index"

696source = "registry+https://github.com/rust-lang/crates.io-index"

626−checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"

697+dependencies = [

698+ "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",

699+ "deunicode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",

700+ "doc-comment 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

701+ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",

702+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",

703+ "liquid-compiler 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",

704+ "liquid-derive 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",

705+ "liquid-error 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",

706+ "liquid-interpreter 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",

707+ "liquid-value 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",

708+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

709+ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",

710+ "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",

711+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",

712+]

627

713

628[[package]]

714[[package]]

629−name = "lock_api"

715+name = "liquid-compiler"

630−version = "0.4.5"

716+version = "0.19.0"

631source = "registry+https://github.com/rust-lang/crates.io-index"

717source = "registry+https://github.com/rust-lang/crates.io-index"

632−checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109"

633dependencies = [

718dependencies = [

634− "scopeguard",

719+ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",

720+ "liquid-error 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",

721+ "liquid-interpreter 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",

722+ "liquid-value 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",

723+ "pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",

724+ "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",

725+]

726+

727+[[package]]

728+name = "liquid-derive"

729+version = "0.19.0"

730+source = "registry+https://github.com/rust-lang/crates.io-index"

731+dependencies = [

732+ "liquid-compiler 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",

733+ "liquid-error 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",

734+ "liquid-interpreter 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",

735+ "liquid-value 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",

736+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",

737+ "proc-quote 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",

738+ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",

739+]

740+

741+[[package]]

742+name = "liquid-error"

743+version = "0.19.0"

744+source = "registry+https://github.com/rust-lang/crates.io-index"

745+

746+[[package]]

747+name = "liquid-interpreter"

748+version = "0.19.0"

749+source = "registry+https://github.com/rust-lang/crates.io-index"

750+dependencies = [

751+ "anymap 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",

752+ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",

753+ "liquid-error 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",

754+ "liquid-value 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",

755+]

756+

757+[[package]]

758+name = "liquid-value"

759+version = "0.19.0"

760+source = "registry+https://github.com/rust-lang/crates.io-index"

761+dependencies = [

762+ "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",

763+ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",

764+ "liquid-error 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",

765+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",

766+ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",

635]

767]

636

768

637[[package]]

769[[package]]

638name = "log"

770name = "log"

639−version = "0.4.14"

771+version = "0.4.8"

640source = "registry+https://github.com/rust-lang/crates.io-index"

772source = "registry+https://github.com/rust-lang/crates.io-index"

641−checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"

642dependencies = [

773dependencies = [

643− "cfg-if",

774+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",

644]

775]

645

776

777+[[package]]

778+name = "maplit"

779+version = "1.0.2"

780+source = "registry+https://github.com/rust-lang/crates.io-index"

781+

646[[package]]

782[[package]]

647name = "matches"

783name = "matches"

648−version = "0.1.9"

784+version = "0.1.8"

649source = "registry+https://github.com/rust-lang/crates.io-index"

785source = "registry+https://github.com/rust-lang/crates.io-index"

650−checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"

651

786

652[[package]]

787[[package]]

653name = "memchr"

788name = "memchr"

654−version = "2.4.1"

789+version = "2.2.1"

655source = "registry+https://github.com/rust-lang/crates.io-index"

790source = "registry+https://github.com/rust-lang/crates.io-index"

656−checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"

791+

792+[[package]]

793+name = "miniz-sys"

794+version = "0.1.12"

795+source = "registry+https://github.com/rust-lang/crates.io-index"

796+dependencies = [

797+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",

798+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",

799+]

657

800

658[[package]]

801[[package]]

659name = "miniz_oxide"

802name = "miniz_oxide"

660−version = "0.5.1"

803+version = "0.3.2"

661source = "registry+https://github.com/rust-lang/crates.io-index"

804source = "registry+https://github.com/rust-lang/crates.io-index"

662−checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082"

663dependencies = [

805dependencies = [

664− "adler",

806+ "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",

665]

807]

666

808

667[[package]]

809[[package]]

668−name = "nix"

810+name = "nodrop"

669−version = "0.24.1"

811+version = "0.1.13"

812+source = "registry+https://github.com/rust-lang/crates.io-index"

813+

814+[[package]]

815+name = "nom"

816+version = "4.2.3"

670source = "registry+https://github.com/rust-lang/crates.io-index"

817source = "registry+https://github.com/rust-lang/crates.io-index"

671−checksum = "8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9"

672dependencies = [

818dependencies = [

673− "bitflags",

819+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",

674− "cfg-if",

820+ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",

675− "libc",

676]

821]

677

822

678[[package]]

823[[package]]

679−name = "normalize-line-endings"

824+name = "num-integer"

680−version = "0.3.0"

825+version = "0.1.41"

681source = "registry+https://github.com/rust-lang/crates.io-index"

826source = "registry+https://github.com/rust-lang/crates.io-index"

682−checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"

827+dependencies = [

828+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",

829+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",

830+]

683

831

684[[package]]

832[[package]]

685name = "num-traits"

833name = "num-traits"

686−version = "0.2.14"

834+version = "0.2.8"

687source = "registry+https://github.com/rust-lang/crates.io-index"

835source = "registry+https://github.com/rust-lang/crates.io-index"

688−checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"

689dependencies = [

836dependencies = [

690− "autocfg",

837+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",

691]

838]

692

839

693[[package]]

840[[package]]

694−name = "once_cell"

841+name = "num_cpus"

695−version = "1.10.0"

842+version = "1.10.1"

696source = "registry+https://github.com/rust-lang/crates.io-index"

843source = "registry+https://github.com/rust-lang/crates.io-index"

697−checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"

844+dependencies = [

845+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",

846+]

698

847

699[[package]]

848[[package]]

700name = "onig"

849name = "onig"

701−version = "6.3.1"

850+version = "5.0.0"

702source = "registry+https://github.com/rust-lang/crates.io-index"

851source = "registry+https://github.com/rust-lang/crates.io-index"

703−checksum = "67ddfe2c93bb389eea6e6d713306880c7f6dcc99a75b659ce145d962c861b225"

704dependencies = [

852dependencies = [

705− "bitflags",

853+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",

706− "lazy_static",

854+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",

707− "libc",

855+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",

708− "onig_sys",

856+ "onig_sys 69.2.0 (registry+https://github.com/rust-lang/crates.io-index)",

709]

857]

710

858

711[[package]]

859[[package]]

712name = "onig_sys"

860name = "onig_sys"

713−version = "69.7.1"

861+version = "69.2.0"

714source = "registry+https://github.com/rust-lang/crates.io-index"

862source = "registry+https://github.com/rust-lang/crates.io-index"

715−checksum = "5dd3eee045c84695b53b20255bb7317063df090b68e18bfac0abb6c39cf7f33e"

716dependencies = [

863dependencies = [

717− "cc",

864+ "bindgen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",

718− "pkg-config",

865+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",

866+ "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",

719]

867]

720

868

721[[package]]

869[[package]]

722−name = "parking_lot"

870+name = "opaque-debug"

871+version = "0.2.3"

872+source = "registry+https://github.com/rust-lang/crates.io-index"

873+

874+[[package]]

875+name = "peeking_take_while"

876+version = "0.1.2"

877+source = "registry+https://github.com/rust-lang/crates.io-index"

878+

879+[[package]]

880+name = "percent-encoding"

723−version = "0.11.2"

881+version = "1.0.1"

882+source = "registry+https://github.com/rust-lang/crates.io-index"

883+

884+[[package]]

885+name = "percent-encoding"

886+version = "2.1.0"

887+source = "registry+https://github.com/rust-lang/crates.io-index"

888+

889+[[package]]

890+name = "pest"

891+version = "2.1.2"

724source = "registry+https://github.com/rust-lang/crates.io-index"

892source = "registry+https://github.com/rust-lang/crates.io-index"

725−checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"

726dependencies = [

893dependencies = [

727− "instant",

894+ "ucd-trie 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",

728− "lock_api",

729− "parking_lot_core",

730]

895]

731

896

732[[package]]

897[[package]]

733−name = "parking_lot_core"

898+name = "pest_derive"

734−version = "0.8.5"

899+version = "2.1.0"

735source = "registry+https://github.com/rust-lang/crates.io-index"

900source = "registry+https://github.com/rust-lang/crates.io-index"

736−checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"

737dependencies = [

901dependencies = [

738− "cfg-if",

902+ "pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",

739− "instant",

903+ "pest_generator 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",

740− "libc",

741− "redox_syscall",

742− "smallvec",

743− "winapi",

744]

904]

745

905

746[[package]]

906[[package]]

747−name = "path_abs"

907+name = "pest_generator"

748−version = "0.5.1"

908+version = "2.1.1"

749source = "registry+https://github.com/rust-lang/crates.io-index"

909source = "registry+https://github.com/rust-lang/crates.io-index"

750−checksum = "05ef02f6342ac01d8a93b65f96db53fe68a92a15f41144f97fb00a9e669633c3"

751dependencies = [

910dependencies = [

752− "std_prelude",

911+ "pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",

912+ "pest_meta 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",

913+ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",

914+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",

915+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",

753]

916]

754

917

755[[package]]

918[[package]]

756−name = "percent-encoding"

919+name = "pest_meta"

757−version = "2.1.0"

920+version = "2.1.2"

758source = "registry+https://github.com/rust-lang/crates.io-index"

921source = "registry+https://github.com/rust-lang/crates.io-index"

759−checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"

922+dependencies = [

923+ "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",

924+ "pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",

925+ "sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",

926+]

760

927

761[[package]]

928[[package]]

762name = "pkg-config"

929name = "pkg-config"

763−version = "0.3.24"

930+version = "0.3.15"

764source = "registry+https://github.com/rust-lang/crates.io-index"

931source = "registry+https://github.com/rust-lang/crates.io-index"

765−checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe"

766

932

767[[package]]

933[[package]]

768name = "plist"

934name = "plist"

769−version = "1.3.1"

935+version = "0.4.2"

770source = "registry+https://github.com/rust-lang/crates.io-index"

936source = "registry+https://github.com/rust-lang/crates.io-index"

771−checksum = "bd39bc6cdc9355ad1dc5eeedefee696bb35c34caf21768741e81826c0bbd7225"

772dependencies = [

937dependencies = [

773− "base64",

938+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",

774− "indexmap",

939+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",

775− "line-wrap",

940+ "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",

776− "serde",

941+ "line-wrap 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",

777− "time",

942+ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",

778− "xml-rs",

943+ "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",

779]

944]

780

945

781[[package]]

946[[package]]

782name = "predicates"

947name = "predicates"

783−version = "2.1.1"

948+version = "1.0.1"

784source = "registry+https://github.com/rust-lang/crates.io-index"

949source = "registry+https://github.com/rust-lang/crates.io-index"

785−checksum = "a5aab5be6e4732b473071984b3164dbbfb7a3674d30ea5ff44410b6bcd960c3c"

786dependencies = [

950dependencies = [

787− "difflib",

951+ "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",

788− "float-cmp",

952+ "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",

789− "itertools",

790− "normalize-line-endings",

791− "predicates-core",

792− "regex",

793]

953]

794

954

795[[package]]

955[[package]]

796name = "predicates-core"

956name = "predicates-core"

797−version = "1.0.2"

957+version = "1.0.0"

798source = "registry+https://github.com/rust-lang/crates.io-index"

958source = "registry+https://github.com/rust-lang/crates.io-index"

799−checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451"

800

959

801[[package]]

960[[package]]

802name = "predicates-tree"

961name = "predicates-tree"

803−version = "1.0.4"

962+version = "1.0.0"

804source = "registry+https://github.com/rust-lang/crates.io-index"

963source = "registry+https://github.com/rust-lang/crates.io-index"

805−checksum = "338c7be2905b732ae3984a2f40032b5e94fd8f52505b186c7d4d68d193445df7"

806dependencies = [

964dependencies = [

807− "predicates-core",

965+ "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",

808− "termtree",

966+ "treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",

809]

967]

810

968

811[[package]]

969[[package]]

812−name = "proc-macro-error"

970+name = "proc-macro-hack"

813−version = "1.0.4"

971+version = "0.5.9"

814source = "registry+https://github.com/rust-lang/crates.io-index"

972source = "registry+https://github.com/rust-lang/crates.io-index"

815−checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"

816dependencies = [

973dependencies = [

817− "proc-macro-error-attr",

974+ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",

818− "proc-macro2",

975+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",

819− "quote",

976+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",

820− "syn",

821− "version_check",

822]

977]

823

978

824[[package]]

979[[package]]

825−name = "proc-macro-error-attr"

980+name = "proc-macro2"

826−version = "1.0.4"

981+version = "0.4.30"

827source = "registry+https://github.com/rust-lang/crates.io-index"

982source = "registry+https://github.com/rust-lang/crates.io-index"

828−checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"

829dependencies = [

983dependencies = [

830− "proc-macro2",

984+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",

831− "quote",

832− "version_check",

833]

985]

834

986

835[[package]]

987[[package]]

836−name = "proc-macro-hack"

988+name = "proc-macro2"

837−version = "0.5.19"

989+version = "1.0.2"

838source = "registry+https://github.com/rust-lang/crates.io-index"

990source = "registry+https://github.com/rust-lang/crates.io-index"

839−checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"

991+dependencies = [

992+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",

993+]

840

994

841[[package]]

995[[package]]

842−name = "proc-macro2"

996+name = "proc-quote"

843−version = "1.0.36"

997+version = "0.2.2"

844source = "registry+https://github.com/rust-lang/crates.io-index"

998source = "registry+https://github.com/rust-lang/crates.io-index"

845−checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"

846dependencies = [

999dependencies = [

847− "unicode-xid",

1000+ "proc-macro-hack 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",

1001+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",

1002+ "proc-quote-impl 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",

1003+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",

1004+ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",

848]

1005]

849

1006

850[[package]]

1007[[package]]

851−name = "quote"

1008+name = "proc-quote-impl"

852−version = "1.0.14"

1009+version = "0.2.2"

853source = "registry+https://github.com/rust-lang/crates.io-index"

1010source = "registry+https://github.com/rust-lang/crates.io-index"

854−checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d"

855dependencies = [

1011dependencies = [

856− "proc-macro2",

1012+ "proc-macro-hack 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",

1013+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",

1014+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",

857]

1015]

858

1016

859[[package]]

1017[[package]]

860−name = "redox_syscall"

1018+name = "quick-error"

1019+version = "1.2.2"

1020+source = "registry+https://github.com/rust-lang/crates.io-index"

1021+

1022+[[package]]

1023+name = "quote"

861−version = "0.2.10"

1024+version = "0.6.13"

862source = "registry+https://github.com/rust-lang/crates.io-index"

1025source = "registry+https://github.com/rust-lang/crates.io-index"

863−checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"

864dependencies = [

1026dependencies = [

865− "bitflags",

1027+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",

866]

1028]

867

1029

868[[package]]

1030[[package]]

869−name = "redox_users"

1031+name = "quote"

870−version = "0.4.0"

1032+version = "1.0.2"

871source = "registry+https://github.com/rust-lang/crates.io-index"

1033source = "registry+https://github.com/rust-lang/crates.io-index"

872−checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"

873dependencies = [

1034dependencies = [

874− "getrandom",

1035+ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",

875− "redox_syscall",

876]

1036]

877

1037

878[[package]]

1038[[package]]

879−name = "regex"

1039+name = "rand"

880−version = "1.5.5"

1040+version = "0.4.6"

881source = "registry+https://github.com/rust-lang/crates.io-index"

1041source = "registry+https://github.com/rust-lang/crates.io-index"

882−checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"

883dependencies = [

1042dependencies = [

884− "aho-corasick",

1043+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",

885− "memchr",

1044+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",

886− "regex-syntax",

1045+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

1046+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",

1047+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",

887]

1048]

888

1049

889[[package]]

1050[[package]]

890−name = "regex-automata"

1051+name = "rand_core"

891−version = "0.1.10"

1052+version = "0.3.1"

892source = "registry+https://github.com/rust-lang/crates.io-index"

1053source = "registry+https://github.com/rust-lang/crates.io-index"

893−checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"

1054+dependencies = [

1055+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",

1056+]

894

1057

895[[package]]

1058[[package]]

896−name = "regex-syntax"

1059+name = "rand_core"

897−version = "0.6.25"

1060+version = "0.4.2"

898source = "registry+https://github.com/rust-lang/crates.io-index"

1061source = "registry+https://github.com/rust-lang/crates.io-index"

899−checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"

900

1062

901[[package]]

1063[[package]]

902−name = "remove_dir_all"

1064+name = "rand_os"

903−version = "0.5.3"

1065+version = "0.1.3"

904source = "registry+https://github.com/rust-lang/crates.io-index"

1066source = "registry+https://github.com/rust-lang/crates.io-index"

905−checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"

906dependencies = [

1067dependencies = [

907− "winapi",

1068+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",

1069+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",

1070+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",

1071+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",

1072+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",

1073+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",

908]

1074]

909

1075

910[[package]]

1076[[package]]

911−name = "rgb"

1077+name = "rdrand"

912−version = "0.8.31"

1078+version = "0.4.0"

913source = "registry+https://github.com/rust-lang/crates.io-index"

1079source = "registry+https://github.com/rust-lang/crates.io-index"

914−checksum = "9a374af9a0e5fdcdd98c1c7b64f05004f9ea2555b6c75f211daa81268a3c50f1"

915dependencies = [

1080dependencies = [

916− "bytemuck",

1081+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

917]

1082]

918

1083

919[[package]]

1084[[package]]

920−name = "rustversion"

1085+name = "redox_syscall"

921−version = "1.0.6"

1086+version = "0.1.56"

922source = "registry+https://github.com/rust-lang/crates.io-index"

1087source = "registry+https://github.com/rust-lang/crates.io-index"

923−checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f"

924

1088

925[[package]]

1089[[package]]

926−name = "ryu"

1090+name = "redox_users"

927−version = "1.0.9"

1091+version = "0.3.1"

928source = "registry+https://github.com/rust-lang/crates.io-index"

1092source = "registry+https://github.com/rust-lang/crates.io-index"

929−checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"

1093+dependencies = [

1094+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",

1095+ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",

1096+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",

1097+ "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",

1098+]

930

1099

931[[package]]

1100[[package]]

932−name = "safemem"

1101+name = "regex"

933−version = "0.3.3"

1102+version = "1.3.1"

934source = "registry+https://github.com/rust-lang/crates.io-index"

1103source = "registry+https://github.com/rust-lang/crates.io-index"

935−checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"

1104+dependencies = [

1105+ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",

1106+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",

1107+ "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",

1108+ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",

1109+]

936

1110

937[[package]]

1111[[package]]

938−name = "same-file"

1112+name = "regex-syntax"

939−version = "1.0.6"

1113+version = "0.6.12"

1114+source = "registry+https://github.com/rust-lang/crates.io-index"

1115+

1116+[[package]]

1117+name = "remove_dir_all"

1118+version = "0.5.2"

940source = "registry+https://github.com/rust-lang/crates.io-index"

1119source = "registry+https://github.com/rust-lang/crates.io-index"

941−checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"

942dependencies = [

1120dependencies = [

943− "winapi-util",

1121+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",

944]

1122]

945

1123

946[[package]]

1124[[package]]

947−name = "scopeguard"

1125+name = "rust-argon2"

948−version = "1.1.0"

1126+version = "0.5.1"

949source = "registry+https://github.com/rust-lang/crates.io-index"

1127source = "registry+https://github.com/rust-lang/crates.io-index"

950−checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"

1128+dependencies = [

1129+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",

1130+ "blake2b_simd 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",

1131+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",

1132+]

951

1133

952[[package]]

1134[[package]]

953−name = "semver"

1135+name = "rustc-demangle"

954−version = "1.0.7"

1136+version = "0.1.16"

955source = "registry+https://github.com/rust-lang/crates.io-index"

1137source = "registry+https://github.com/rust-lang/crates.io-index"

956−checksum = "d65bd28f48be7196d222d95b9243287f48d27aca604e08497513019ff0502cc4"

957

1138

958[[package]]

1139[[package]]

959−name = "serde"

1140+name = "ryu"

960−version = "1.0.136"

1141+version = "1.0.0"

961source = "registry+https://github.com/rust-lang/crates.io-index"

1142source = "registry+https://github.com/rust-lang/crates.io-index"

962−checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"

963−dependencies = [

964− "serde_derive",

965−]

966

1143

967[[package]]

1144[[package]]

968−name = "serde_derive"

1145+name = "safemem"

969−version = "1.0.136"

1146+version = "0.3.2"

970source = "registry+https://github.com/rust-lang/crates.io-index"

1147source = "registry+https://github.com/rust-lang/crates.io-index"

971−checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"

972−dependencies = [

973− "proc-macro2",

974− "quote",

975− "syn",

976−]

977

1148

978[[package]]

1149[[package]]

979−name = "serde_json"

1150+name = "same-file"

980−version = "1.0.74"

1151+version = "1.0.5"

981source = "registry+https://github.com/rust-lang/crates.io-index"

1152source = "registry+https://github.com/rust-lang/crates.io-index"

982−checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142"

983dependencies = [

1153dependencies = [

984− "itoa 1.0.1",

1154+ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",

985− "ryu",

986− "serde",

987]

1155]

988

1156

989[[package]]

1157[[package]]

990−name = "serde_yaml"

1158+name = "serde"

991−version = "0.8.23"

1159+version = "1.0.99"

992source = "registry+https://github.com/rust-lang/crates.io-index"

1160source = "registry+https://github.com/rust-lang/crates.io-index"

993−checksum = "a4a521f2940385c165a24ee286aa8599633d162077a54bdcae2a6fd5a7bfa7a0"

994dependencies = [

1161dependencies = [

995− "indexmap",

1162+ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",

996− "ryu",

997− "serde",

998− "yaml-rust",

999]

1163]

1000

1164

1001[[package]]

1165[[package]]

1002−name = "serial_test"

1166+name = "serde_derive"

1003−version = "0.6.0"

1167+version = "1.0.99"

1004source = "registry+https://github.com/rust-lang/crates.io-index"

1168source = "registry+https://github.com/rust-lang/crates.io-index"

1005−checksum = "e5bcc41d18f7a1d50525d080fd3e953be87c4f9f1a974f3c21798ca00d54ec15"

1006dependencies = [

1169dependencies = [

1007− "lazy_static",

1170+ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",

1008− "parking_lot",

1171+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",

1009− "serial_test_derive",

1172+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",

1010]

1173]

1011

1174

1012[[package]]

1175[[package]]

1013−name = "serial_test_derive"

1176+name = "serde_json"

1014−version = "0.6.0"

1177+version = "1.0.40"

1015source = "registry+https://github.com/rust-lang/crates.io-index"

1178source = "registry+https://github.com/rust-lang/crates.io-index"

1016−checksum = "2881bccd7d60fb32dfa3d7b3136385312f8ad75e2674aab2852867a09790cae8"

1017dependencies = [

1179dependencies = [

1018− "proc-macro-error",

1180+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",

1019− "proc-macro2",

1181+ "ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",

1020− "quote",

1182+ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",

1021− "rustversion",

1022− "syn",

1023]

1183]

1024

1184

1025[[package]]

1185[[package]]

1026−name = "shell-escape"

1186+name = "sha-1"

1027−version = "0.1.5"

1187+version = "0.8.1"

1028source = "registry+https://github.com/rust-lang/crates.io-index"

1188source = "registry+https://github.com/rust-lang/crates.io-index"

1029−checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f"

1189+dependencies = [

1190+ "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",

1191+ "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",

1192+ "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",

1193+ "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",

1194+]

1030

1195

1031[[package]]

1196[[package]]

1032name = "shell-words"

1197name = "shell-words"

1033−version = "1.1.0"

1198+version = "0.1.0"

1034source = "registry+https://github.com/rust-lang/crates.io-index"

1199source = "registry+https://github.com/rust-lang/crates.io-index"

1035−checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"

1036

1200

1037[[package]]

1201[[package]]

1038−name = "smallvec"

1202+name = "shlex"

1039−version = "1.7.0"

1203+version = "0.1.1"

1040source = "registry+https://github.com/rust-lang/crates.io-index"

1204source = "registry+https://github.com/rust-lang/crates.io-index"

1041−checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"

1042

1205

1043[[package]]

1206[[package]]

1044−name = "std_prelude"

1207+name = "smallvec"

1045−version = "0.2.12"

1208+version = "0.6.10"

1046source = "registry+https://github.com/rust-lang/crates.io-index"

1209source = "registry+https://github.com/rust-lang/crates.io-index"

1047−checksum = "8207e78455ffdf55661170876f88daf85356e4edd54e0a3dbc79586ca1e50cbe"

1048

1210

1049[[package]]

1211[[package]]

1050name = "strsim"

1212name = "strsim"

1051version = "0.8.0"

1213version = "0.8.0"

1052source = "registry+https://github.com/rust-lang/crates.io-index"

1214source = "registry+https://github.com/rust-lang/crates.io-index"

1053−checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"

1054

1215

1055[[package]]

1216[[package]]

1056name = "syn"

1217name = "syn"

1057−version = "1.0.85"

1218+version = "0.15.44"

1058source = "registry+https://github.com/rust-lang/crates.io-index"

1219source = "registry+https://github.com/rust-lang/crates.io-index"

1059−checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7"

1060dependencies = [

1220dependencies = [

1061− "proc-macro2",

1221+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",

1062− "quote",

1222+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",

1063− "unicode-xid",

1223+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",

1064]

1224]

1065

1225

1066[[package]]

1226[[package]]

1067−name = "syntect"

1227+name = "syn"

1068−version = "5.0.0"

1228+version = "1.0.5"

1069source = "registry+https://github.com/rust-lang/crates.io-index"

1229source = "registry+https://github.com/rust-lang/crates.io-index"

1070−checksum = "c6c454c27d9d7d9a84c7803aaa3c50cd088d2906fe3c6e42da3209aa623576a8"

1071dependencies = [

1230dependencies = [

1072− "bincode",

1231+ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",

1073− "bitflags",

1232+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",

1074− "fancy-regex",

1233+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",

1075− "flate2",

1076− "fnv",

1077− "lazy_static",

1078− "once_cell",

1079− "onig",

1080− "plist",

1081− "regex-syntax",

1082− "serde",

1083− "serde_derive",

1084− "serde_json",

1085− "thiserror",

1086− "walkdir",

1087− "yaml-rust",

1088]

1234]

1089

1235

1090[[package]]

1236[[package]]

1091−name = "sys-info"

1237+name = "synstructure"

1092−version = "0.9.1"

1238+version = "0.10.2"

1093source = "registry+https://github.com/rust-lang/crates.io-index"

1239source = "registry+https://github.com/rust-lang/crates.io-index"

1094−checksum = "0b3a0d0aba8bf96a0e1ddfdc352fc53b3df7f39318c71854910c3c4b024ae52c"

1095dependencies = [

1240dependencies = [

1096− "cc",

1241+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",

1097− "libc",

1242+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",

1243+ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",

1244+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",

1098]

1245]

1099

1246

1100[[package]]

1247[[package]]

1101−name = "tempfile"

1248+name = "syntect"

1102version = "3.3.0"

1249version = "3.3.0"

1103source = "registry+https://github.com/rust-lang/crates.io-index"

1250source = "registry+https://github.com/rust-lang/crates.io-index"

1104−checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"

1105dependencies = [

1251dependencies = [

1106− "cfg-if",

1252+ "bincode 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)",

1107− "fastrand",

1253+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",

1108− "libc",

1254+ "flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",

1109− "redox_syscall",

1255+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",

1110− "remove_dir_all",

1256+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",

1111− "winapi",

1257+ "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",

1258+ "onig 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)",

1259+ "plist 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",

1260+ "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",

1261+ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",

1262+ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",

1263+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",

1264+ "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)",

1265+ "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",

1112]

1266]

1113

1267

1114[[package]]

1268[[package]]

1115−name = "term_size"

1269+name = "tempdir"

1116−version = "0.3.2"

1270+version = "0.3.7"

1117source = "registry+https://github.com/rust-lang/crates.io-index"

1271source = "registry+https://github.com/rust-lang/crates.io-index"

1118−checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9"

1119dependencies = [

1272dependencies = [

1120− "libc",

1273+ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",

1121− "winapi",

1274+ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",

1122]

1275]

1123

1276

1124[[package]]

1277[[package]]

1125−name = "termcolor"

1278+name = "term_size"

1126−version = "1.1.2"

1279+version = "0.3.1"

1127source = "registry+https://github.com/rust-lang/crates.io-index"

1280source = "registry+https://github.com/rust-lang/crates.io-index"

1128−checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"

1129dependencies = [

1281dependencies = [

1130− "winapi-util",

1282+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",

1283+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",

1284+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",

1131]

1285]

1132

1286

1133[[package]]

1287[[package]]

1134−name = "terminal_size"

1288+name = "termcolor"

1135−version = "0.1.17"

1289+version = "1.0.5"

1136source = "registry+https://github.com/rust-lang/crates.io-index"

1290source = "registry+https://github.com/rust-lang/crates.io-index"

1137−checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df"

1138dependencies = [

1291dependencies = [

1139− "libc",

1292+ "wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",

1140− "winapi",

1141]

1293]

1142

1294

1143[[package]]

1295[[package]]

1144−name = "termtree"

1296+name = "termios"

1145−version = "0.2.3"

1297+version = "0.3.1"

1146source = "registry+https://github.com/rust-lang/crates.io-index"

1298source = "registry+https://github.com/rust-lang/crates.io-index"

1147−checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16"

1299+dependencies = [

1300+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",

1301+]

1148

1302

1149[[package]]

1303[[package]]

1150name = "textwrap"

1304name = "textwrap"

1151version = "0.11.0"

1305version = "0.11.0"

1152source = "registry+https://github.com/rust-lang/crates.io-index"

1306source = "registry+https://github.com/rust-lang/crates.io-index"

1153−checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"

1154dependencies = [

1307dependencies = [

1155− "term_size",

1308+ "term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

1156− "unicode-width",

1309+ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",

1157]

1310]

1158

1311

1159[[package]]

1312[[package]]

1160−name = "thiserror"

1313+name = "thread_local"

1161−version = "1.0.31"

1314+version = "0.3.6"

1162source = "registry+https://github.com/rust-lang/crates.io-index"

1315source = "registry+https://github.com/rust-lang/crates.io-index"

1163−checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"

1164dependencies = [

1316dependencies = [

1165− "thiserror-impl",

1317+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",

1166]

1318]

1167

1319

1168[[package]]

1320[[package]]

1169−name = "thiserror-impl"

1321+name = "time"

1170−version = "1.0.31"

1322+version = "0.1.42"

1171source = "registry+https://github.com/rust-lang/crates.io-index"

1323source = "registry+https://github.com/rust-lang/crates.io-index"

1172−checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"

1173dependencies = [

1324dependencies = [

1174− "proc-macro2",

1325+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",

1175− "quote",

1326+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",

1176− "syn",

1327+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",

1177]

1328]

1178

1329

1179[[package]]

1330[[package]]

1180−name = "time"

1331+name = "treeline"

1181−version = "0.3.5"

1332+version = "0.1.0"

1182source = "registry+https://github.com/rust-lang/crates.io-index"

1333source = "registry+https://github.com/rust-lang/crates.io-index"

1183−checksum = "41effe7cfa8af36f439fac33861b66b049edc6f9a32331e2312660529c1c24ad"

1184−dependencies = [

1185− "itoa 0.4.8",

1186− "libc",

1187−]

1188

1334

1189[[package]]

1335[[package]]

1190−name = "tinyvec"

1336+name = "typenum"

1191−version = "1.5.1"

1337+version = "1.11.2"

1192source = "registry+https://github.com/rust-lang/crates.io-index"

1338source = "registry+https://github.com/rust-lang/crates.io-index"

1193−checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2"

1194−dependencies = [

1195− "tinyvec_macros",

1196−]

1197

1339

1198[[package]]

1340[[package]]

1199−name = "tinyvec_macros"

1341+name = "ucd-trie"

1200−version = "0.1.0"

1342+version = "0.1.2"

1201source = "registry+https://github.com/rust-lang/crates.io-index"

1343source = "registry+https://github.com/rust-lang/crates.io-index"

1202−checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"

1203

1344

1204[[package]]

1345[[package]]

1205name = "unicode-bidi"

1346name = "unicode-bidi"

1206−version = "0.3.7"

1347+version = "0.3.4"

1207source = "registry+https://github.com/rust-lang/crates.io-index"

1348source = "registry+https://github.com/rust-lang/crates.io-index"

1208−checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"

1349+dependencies = [

1350+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",

1351+]

1209

1352

1210[[package]]

1353[[package]]

1211name = "unicode-normalization"

1354name = "unicode-normalization"

1212−version = "0.1.19"

1355+version = "0.1.8"

1213source = "registry+https://github.com/rust-lang/crates.io-index"

1356source = "registry+https://github.com/rust-lang/crates.io-index"

1214−checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"

1215dependencies = [

1357dependencies = [

1216− "tinyvec",

1358+ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",

1217]

1359]

1218

1360

1361+[[package]]

1362+name = "unicode-segmentation"

1363+version = "1.3.0"

1364+source = "registry+https://github.com/rust-lang/crates.io-index"

1365+

1219[[package]]

1366[[package]]

1220name = "unicode-width"

1367name = "unicode-width"

1221−version = "0.1.9"

1368+version = "0.1.6"

1222source = "registry+https://github.com/rust-lang/crates.io-index"

1369source = "registry+https://github.com/rust-lang/crates.io-index"

1223−checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"

1224

1370

1225[[package]]

1371[[package]]

1226name = "unicode-xid"

1372name = "unicode-xid"

1227−version = "0.2.2"

1373+version = "0.1.0"

1374+source = "registry+https://github.com/rust-lang/crates.io-index"

1375+

1376+[[package]]

1377+name = "unicode-xid"

1378+version = "0.2.0"

1379+source = "registry+https://github.com/rust-lang/crates.io-index"

1380+

1381+[[package]]

1382+name = "url"

1383+version = "1.7.2"

1228source = "registry+https://github.com/rust-lang/crates.io-index"

1384source = "registry+https://github.com/rust-lang/crates.io-index"

1229−checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"

1385+dependencies = [

1386+ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",

1387+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",

1388+ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",

1389+]

1230

1390

1231[[package]]

1391[[package]]

1232name = "url"

1392name = "url"

1233−version = "2.2.2"

1393+version = "2.1.0"

1234source = "registry+https://github.com/rust-lang/crates.io-index"

1394source = "registry+https://github.com/rust-lang/crates.io-index"

1235−checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"

1236dependencies = [

1395dependencies = [

1237− "form_urlencoded",

1396+ "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",

1238− "idna",

1397+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",

1239− "matches",

1398+ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",

1240− "percent-encoding",

1241]

1399]

1242

1400

1243[[package]]

1401[[package]]

1244name = "vcpkg"

1402name = "vcpkg"

1245−version = "0.2.15"

1403+version = "0.2.7"

1246source = "registry+https://github.com/rust-lang/crates.io-index"

1404source = "registry+https://github.com/rust-lang/crates.io-index"

1247−checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"

1248

1405

1249[[package]]

1406[[package]]

1250name = "vec_map"

1407name = "vec_map"

1251−version = "0.8.2"

1408+version = "0.8.1"

1252source = "registry+https://github.com/rust-lang/crates.io-index"

1409source = "registry+https://github.com/rust-lang/crates.io-index"

1253−checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"

1254

1410

1255[[package]]

1411[[package]]

1256name = "version_check"

1412name = "version_check"

1257−version = "0.9.4"

1413+version = "0.1.5"

1258source = "registry+https://github.com/rust-lang/crates.io-index"

1414source = "registry+https://github.com/rust-lang/crates.io-index"

1259−checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"

1260

1415

1261[[package]]

1416[[package]]

1262−name = "wait-timeout"

1417+name = "walkdir"

1263−version = "0.2.0"

1418+version = "2.2.9"

1264source = "registry+https://github.com/rust-lang/crates.io-index"

1419source = "registry+https://github.com/rust-lang/crates.io-index"

1265−checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"

1266dependencies = [

1420dependencies = [

1267− "libc",

1421+ "same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",

1422+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",

1423+ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",

1268]

1424]

1269

1425

1270[[package]]

1426[[package]]

1271−name = "walkdir"

1427+name = "wasi"

1272−version = "2.3.2"

1428+version = "0.7.0"

1273source = "registry+https://github.com/rust-lang/crates.io-index"

1429source = "registry+https://github.com/rust-lang/crates.io-index"

1274−checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"

1275−dependencies = [

1276− "same-file",

1277− "winapi",

1278− "winapi-util",

1279−]

1280

1430

1281[[package]]

1431[[package]]

1282−name = "wasi"

1432+name = "which"

1283−version = "0.10.2+wasi-snapshot-preview1"

1433+version = "2.0.1"

1284source = "registry+https://github.com/rust-lang/crates.io-index"

1434source = "registry+https://github.com/rust-lang/crates.io-index"

1285−checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"

1435+dependencies = [

1436+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",

1437+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",

1438+]

1286

1439

1287[[package]]

1440[[package]]

1288name = "wild"

1441name = "wild"

1289−version = "2.0.4"

1442+version = "2.0.2"

1290source = "registry+https://github.com/rust-lang/crates.io-index"

1443source = "registry+https://github.com/rust-lang/crates.io-index"

1291−checksum = "035793abb854745033f01a07647a79831eba29ec0be377205f2a25b0aa830020"

1292dependencies = [

1444dependencies = [

1293− "glob",

1445+ "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",

1294]

1446]

1295

1447

1296[[package]]

1448[[package]]

1297name = "winapi"

1449name = "winapi"

1298−version = "0.3.9"

1450+version = "0.2.8"

1451+source = "registry+https://github.com/rust-lang/crates.io-index"

1452+

1453+[[package]]

1454+name = "winapi"

1455+version = "0.3.8"

1299source = "registry+https://github.com/rust-lang/crates.io-index"

1456source = "registry+https://github.com/rust-lang/crates.io-index"

1300−checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"

1301dependencies = [

1457dependencies = [

1302− "winapi-i686-pc-windows-gnu",

1458+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",

1303− "winapi-x86_64-pc-windows-gnu",

1459+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",

1304]

1460]

1305

1461

1462+[[package]]

1463+name = "winapi-build"

1464+version = "0.1.1"

1465+source = "registry+https://github.com/rust-lang/crates.io-index"

1466+

1306[[package]]

1467[[package]]

1307name = "winapi-i686-pc-windows-gnu"

1468name = "winapi-i686-pc-windows-gnu"

1308version = "0.4.0"

1469version = "0.4.0"

1309source = "registry+https://github.com/rust-lang/crates.io-index"

1470source = "registry+https://github.com/rust-lang/crates.io-index"

1310−checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"

1311

1471

1312[[package]]

1472[[package]]

1313name = "winapi-util"

1473name = "winapi-util"

1314−version = "0.1.5"

1474+version = "0.1.2"

1315source = "registry+https://github.com/rust-lang/crates.io-index"

1475source = "registry+https://github.com/rust-lang/crates.io-index"

1316−checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"

1317dependencies = [

1476dependencies = [

1318− "winapi",

1477+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",

1319]

1478]

1320

1479

1321[[package]]

1480[[package]]

1322name = "winapi-x86_64-pc-windows-gnu"

1481name = "winapi-x86_64-pc-windows-gnu"

1323version = "0.4.0"

1482version = "0.4.0"

1324source = "registry+https://github.com/rust-lang/crates.io-index"

1483source = "registry+https://github.com/rust-lang/crates.io-index"

1325−checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

1484+

1485+[[package]]

1486+name = "wincolor"

1487+version = "1.0.2"

1488+source = "registry+https://github.com/rust-lang/crates.io-index"

1489+dependencies = [

1490+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",

1491+ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",

1492+]

1326

1493

1327[[package]]

1494[[package]]

1328name = "xml-rs"

1495name = "xml-rs"

1329−version = "0.8.4"

1496+version = "0.8.0"

1330source = "registry+https://github.com/rust-lang/crates.io-index"

1497source = "registry+https://github.com/rust-lang/crates.io-index"

1331−checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"

1332

1498

1333[[package]]

1499[[package]]

1334name = "yaml-rust"

1500name = "yaml-rust"

1335−version = "0.4.5"

1501+version = "0.4.3"

1336−source = "registry+https://github.com/rust-lang/crates.io-index"

1502+source = "registry+https://github.com/rust-lang/crates.io-index"

1337−checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"

1503+dependencies = [

1338−dependencies = [

1504+ "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",

1339− "linked-hash-map",

1505+]

1340−]

1506+

1507+[metadata]

1508+"checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c"

1509+"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"

1510+"checksum ansi_colours 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1d0f302a81afc6a7f4350c04f0ba7cfab529cc009bca3324b3fb5764e6add8b6"

1511+"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"

1512+"checksum ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"

1513+"checksum anymap 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344"

1514+"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee"

1515+"checksum arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d73f9beda665eaa98ab9e4f7442bd4e7de6652587de55b2525e52e29c1b0ba"

1516+"checksum assert_cmd 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2dc477793bd82ec39799b6f6b3df64938532fdf2ab0d49ef817eac65856a5a1e"

1517+"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"

1518+"checksum autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875"

1519+"checksum backtrace 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)" = "1371048253fa3bac6704bfd6bbfc922ee9bdcee8881330d40f308b81cc5adc55"

1520+"checksum backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b"

1521+"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"

1522+"checksum bincode 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9f04a5e50dc80b3d5d35320889053637d15011aed5e66b66b37ae798c65da6f7"

1523+"checksum bindgen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "65a913de3fa2fa95f2c593bb7e33b1be1ce1ce8a83f34b6bb02e6f01400b96cc"

1524+"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd"

1525+"checksum blake2b_simd 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)" = "bf775a81bb2d464e20ff170ac20316c7b08a43d11dbc72f0f82e8e8d3d6d0499"

1526+"checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"

1527+"checksum block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6d4dc3af3ee2e12f3e5d224e5e1e3d73668abbeb69e566d361f7d5563a4fdf09"

1528+"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"

1529+"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"

1530+"checksum cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "4fc9a35e1f4290eb9e5fc54ba6cf40671ed2a2514c3eeb2b2a908dda2ea5a1be"

1531+"checksum cexpr 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a7fa24eb00d5ffab90eaeaf1092ac85c04c64aaf358ea6f84505b8116d24c6af"

1532+"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"

1533+"checksum chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68"

1534+"checksum clang-sys 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)" = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853"

1535+"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"

1536+"checksum clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e"

1537+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"

1538+"checksum console 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f5d540c2d34ac9dd0deb5f3b5f54c36c79efa78f6b3ad19106a554d07a7b5d9f"

1539+"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120"

1540+"checksum content_inspector 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b7bda66e858c683005a53a9a60c69a4aca7eeaa45d124526e389f7aec8e62f38"

1541+"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"

1542+"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"

1543+"checksum deunicode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca8a0f5bbdedde60605d0719b998e282af68e2b1c50203110211fe4abe857560"

1544+"checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"

1545+"checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"

1546+"checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"

1547+"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"

1548+"checksum doc-comment 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "923dea538cea0aa3025e8685b20d6ee21ef99c4f77e954a30febbaac5ec73a97"

1549+"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"

1550+"checksum encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"

1551+"checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"

1552+"checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"

1553+"checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81"

1554+"checksum encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7"

1555+"checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"

1556+"checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"

1557+"checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"

1558+"checksum env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"

1559+"checksum error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ab49e9dcb602294bc42f9a7dfc9bc6e936fca4418ea300dbfb84fe16de0b7d9"

1560+"checksum escargot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ceb9adbf9874d5d028b5e4c5739d22b71988252b25c9c98fe7cf9738bee84597"

1561+"checksum escargot 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "74cf96bec282dcdb07099f7e31d9fed323bca9435a09aba7b6d99b7617bca96d"

1562+"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"

1563+"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"

1564+"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"

1565+"checksum flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "2adaffba6388640136149e18ed080b77a78611c1e1d6de75aedcdf78df5d4682"

1566+"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"

1567+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"

1568+"checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"

1569+"checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"

1570+"checksum getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571"

1571+"checksum git2 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c1af51ea8a906616af45a4ce78eacf25860f7a13ae7bf8a814693f0f4037a26"

1572+"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"

1573+"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114"

1574+"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"

1575+"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"

1576+"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358"

1577+"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"

1578+"checksum jobserver 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b1d42ef453b30b7387e113da1c83ab1605d90c5b4e0eb8e96d016ed3b8c160"

1579+"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"

1580+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

1581+"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"

1582+"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba"

1583+"checksum libgit2-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4870c781f6063efb83150cd22c1ddf6ecf58531419e7570cdcced46970f64a16"

1584+"checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"

1585+"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"

1586+"checksum line-wrap 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9"

1587+"checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"

1588+"checksum liquid 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c7cf7f28965f50ff06e2e9f26162f6d944b71f976506a7a01a6308ddebd36155"

1589+"checksum liquid-compiler 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7cd195c00674a2dc811b07969358c97c0639db4a73bc61514db48609d110356f"

1590+"checksum liquid-derive 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b0faadd0dd1a7cf38390316c36a9a741949462750f9833b794ac6d7de145218"

1591+"checksum liquid-error 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d5c0851812322e87dcf67c2d7e520c3efd8651bd44eb8d0c0246e6dfb94d481"

1592+"checksum liquid-interpreter 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "998e0411b8cb6210bb0729ccbb15abd2a1c8ef7e318c97511ae5a741c817c63e"

1593+"checksum liquid-value 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e7606ac3743bff9929daff0d0f51f9177ab3ec74520f7f832b8ec595dd96efee"

1594+"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"

1595+"checksum maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"

1596+"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"

1597+"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"

1598+"checksum miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9e3ae51cea1576ceba0dde3d484d30e6e5b86dee0b2d412fe3a16a15c98202"

1599+"checksum miniz_oxide 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7108aff85b876d06f22503dcce091e29f76733b2bfdd91eebce81f5e68203a10"

1600+"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"

1601+"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"

1602+"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09"

1603+"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32"

1604+"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273"

1605+"checksum onig 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e4e723fc996fff1aeab8f62205f3e8528bf498bdd5eadb2784d2d31f30077947"

1606+"checksum onig_sys 69.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0a8d4efbf5f59cece01f539305191485b651acb3785b9d5eef05749f0496514e"

1607+"checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"

1608+"checksum peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"

1609+"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"

1610+"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"

1611+"checksum pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e4fb201c5c22a55d8b24fef95f78be52738e5e1361129be1b5e862ecdb6894a"

1612+"checksum pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"

1613+"checksum pest_generator 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7b9fcf299b5712d06ee128a556c94709aaa04512c4dffb8ead07c5c998447fc0"

1614+"checksum pest_meta 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "df43fd99896fd72c485fe47542c7b500e4ac1e8700bf995544d1317a60ded547"

1615+"checksum pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c1d2cfa5a714db3b5f24f0915e74fcdf91d09d496ba61329705dda7774d2af"

1616+"checksum plist 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5f2a9f075f6394100e7c105ed1af73fb1859d6fd14e49d4290d578120beb167f"

1617+"checksum predicates 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "53e09015b0d3f5a0ec2d4428f7559bb7b3fff341b4e159fedd1d57fac8b939ff"

1618+"checksum predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178"

1619+"checksum predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124"

1620+"checksum proc-macro-hack 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e688f31d92ffd7c1ddc57a1b4e6d773c0f2a14ee437a4b0a4f5a69c80eb221c8"

1621+"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"

1622+"checksum proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "175a40b9cf564ce9bf050654633dbf339978706b8ead1a907bb970b63185dd95"

1623+"checksum proc-quote 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fa612543f23fda013e1e6ce30b5285a9d313c6e582e57b4ceca74eb5b85685b5"

1624+"checksum proc-quote-impl 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f785f0f8cd00b7945efc3f3bdf8205eb06af5aacec598d83e67f41dc8d101fda"

1625+"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"

1626+"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"

1627+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"

1628+"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"

1629+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"

1630+"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"

1631+"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"

1632+"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"

1633+"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"

1634+"checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d"

1635+"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd"

1636+"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"

1637+"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"

1638+"checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf"

1639+"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"

1640+"checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997"

1641+"checksum safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0"

1642+"checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"

1643+"checksum serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)" = "fec2851eb56d010dc9a21b89ca53ee75e6528bab60c11e89d38390904982da9f"

1644+"checksum serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)" = "cb4dc18c61206b08dc98216c98faa0232f4337e1e1b8574551d5bad29ea1b425"

1645+"checksum serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704"

1646+"checksum sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68"

1647+"checksum shell-words 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "39acde55a154c4cd3ae048ac78cc21c25f3a0145e44111b523279113dce0d94a"

1648+"checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"

1649+"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7"

1650+"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"

1651+"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"

1652+"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"

1653+"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f"

1654+"checksum syntect 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "955e9da2455eea5635f7032fc3a229908e6af18c39600313866095e07db0d8b8"

1655+"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"

1656+"checksum term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327"

1657+"checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e"

1658+"checksum termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72b620c5ea021d75a735c943269bb07d30c9b77d6ac6b236bc8b5c496ef05625"

1659+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"

1660+"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"

1661+"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"

1662+"checksum treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41"

1663+"checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9"

1664+"checksum ucd-trie 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8f00ed7be0c1ff1e24f46c3d2af4859f7e863672ba3a6e92e7cff702bf9f06c2"

1665+"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"

1666+"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426"

1667+"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9"

1668+"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20"

1669+"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"

1670+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"

1671+"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"

1672+"checksum url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61"

1673+"checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95"

1674+"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"

1675+"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"

1676+"checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e"

1677+"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"

1678+"checksum which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164"

1679+"checksum wild 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "97d34fecce28871e5c0e059deae21ef7f7d13b98a5964b24c58b3735c8052fc8"

1680+"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"

1681+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"

1682+"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"

1683+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"

1684+"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"

1685+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

1686+"checksum wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9"

1687+"checksum xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "541b12c998c5b56aa2b4e6f18f03664eef9a4fd0a246a55594efae6cc2d964b5"

1688+"checksum yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d"

Cargo.toml+30−72

@@ -1,100 +1,58 @@

1[package]

2authors = ["David Peter <mail@david-peter.de>"]

3categories = ["command-line-utilities"]

4−description = "A cat(1) clone with wings."

4+description="A cat(1) clone with wings."

5homepage = "https://github.com/sharkdp/bat"

6license = "MIT/Apache-2.0"

7name = "bat"

8+readme = "README.md"

8repository = "https://github.com/sharkdp/bat"

9repository = "https://github.com/sharkdp/bat"

9−version = "0.21.0"

10+version = "0.12.1"

11+exclude = [

10−exclude = ["assets/syntaxes/*", "assets/themes/*"]

12+ "assets/syntaxes/*",

13+ "assets/themes/*",

14+]

11build = "build.rs"

15build = "build.rs"

12edition = '2018'

16edition = '2018'

13

17

14−[features]

15−default = ["application"]

16−# Feature required for bat the application. Should be disabled when depending on

17−# bat as a library.

18−application = [

19− "bugreport",

20− "build-assets",

21− "git",

22− "minimal-application",

23−]

24−# Mainly for developers that want to iterate quickly

25−# Be aware that the included features might change in the future

26−minimal-application = [

27− "atty",

28− "clap",

29− "dirs-next",

30− "paging",

31− "regex-onig",

32− "wild",

33−]

34−git = ["git2"] # Support indicating git modifications

35−paging = ["shell-words", "grep-cli"] # Support applying a pager on the output

36−build-assets = ["syntect/yaml-load", "syntect/plist-load", "regex", "walkdir"]

37−

38−# You need to use one of these if you depend on bat as a library:

39−regex-onig = ["syntect/regex-onig"] # Use the "oniguruma" regex engine

40−regex-fancy = ["syntect/regex-fancy"] # Use the rust-only "fancy-regex" engine

41−

42[dependencies]

18[dependencies]

43−atty = { version = "0.2.14", optional = true }

19+atty = "0.2.13"

44ansi_term = "^0.12.1"

20ansi_term = "^0.12.1"

45−ansi_colours = "^1.1"

21+ansi_colours = "^1.0"

46−bincode = "1.0"

47−console = "0.15.0"

22+console = "0.9"

48−flate2 = "1.0"

23+dirs = "2.0"

49−once_cell = "1.10"

24+lazy_static = "1.4"

50−thiserror = "1.0"

25+wild = "2.0"

51−wild = { version = "2.0", optional = true }

52content_inspector = "0.2.4"

26content_inspector = "0.2.4"

53encoding = "0.2"

27encoding = "0.2"

54−shell-words = { version = "1.1.0", optional = true }

28+shell-words = "0.1.0"

55−unicode-width = "0.1.9"

56−globset = "0.4"

57−serde = { version = "1.0", features = ["derive"] }

58−serde_yaml = "0.8"

59−semver = "1.0"

60−path_abs = { version = "0.5", default-features = false }

61−clircle = "0.3"

62−bugreport = { version = "0.5.0", optional = true }

63−dirs-next = { version = "2.0.0", optional = true }

64−grep-cli = { version = "0.1.6", optional = true }

65−regex = { version = "1.5.5", optional = true }

66−walkdir = { version = "2.0", optional = true }

67−bytesize = { version = "1.1.0" }

68

29

69[dependencies.git2]

30[dependencies.git2]

70−version = "0.14"

31+version = "0.10"

71−optional = true

72default-features = false

32default-features = false

33+features = []

73

34

74[dependencies.syntect]

35[dependencies.syntect]

75−version = "5.0.0"

36+version = "3.3.0"

76default-features = false

37default-features = false

77−features = ["parsing"]

38+features = ["parsing", "yaml-load", "dump-load", "dump-create"]

78

39

79[dependencies.clap]

40[dependencies.clap]

80−version = "2.34"

41+version = "2.33"

81−optional = true

82default-features = false

42default-features = false

83features = ["suggestions", "color", "wrap_help"]

43features = ["suggestions", "color", "wrap_help"]

84

44

85−[dev-dependencies]

45+[dependencies.error-chain]

86−assert_cmd = "2.0.4"

46+version = "0.12"

87−serial_test = "0.6.0"

47+default-features = false

88−predicates = "2.1.1"

48+features = []

89−wait-timeout = "0.2.0"

90−tempfile = "3.3.0"

91

49

92−[target.'cfg(unix)'.dev-dependencies]

50+[dev-dependencies]

93−nix = { version = "0.24.1", default-features = false, features = ["term"] }

51+tempdir = "0.3"

52+assert_cmd = "0.11.1"

53+escargot = "0.5.0"

94

54

95[build-dependencies]

55[build-dependencies]

96−clap = { version = "2.34", optional = true }

56+clap = "2.33"

97−

57+liquid = "0.19"

98−[profile.release]

58+lazy_static = "1.4"

99−lto = true

100−codegen-units = 1

LICENSE-MIT+1−1

@@ -1,4 +1,4 @@

2

3Permission is hereby granted, free of charge, to any person obtaining a copy

4of this software and associated documentation files (the "Software"), to deal

NOTICEdeleted−6

@@ -1,6 +0,0 @@

2−

3−bat is made available under the terms of either the MIT License or the Apache

4−License 2.0, at your option.

5−

6−See the LICENSE-APACHE and LICENSE-MIT files for license details.

README.md+103−297

@@ -1,6 +1,7 @@

1

2 <img src="doc/logo-header.svg" alt="bat - a cat clone with wings">

3− <a href="https://github.com/sharkdp/bat/actions?query=workflow%3ACICD"><img src="https://github.com/sharkdp/bat/workflows/CICD/badge.svg" alt="Build Status"></a>

3+ <a href="https://travis-ci.org/sharkdp/bat"><img src="https://travis-ci.org/sharkdp/bat.svg?branch=master" alt="Build Status"></a>

4+ <a href="https://ci.appveyor.com/project/sharkdp/bat"><img src="https://ci.appveyor.com/api/projects/status/cptsmtbiwbnr2vhf?svg=true"></a>

4 <img src="https://img.shields.io/crates/l/bat.svg" alt="license">

5 <img src="https://img.shields.io/crates/l/bat.svg" alt="license">

5 <a href="https://crates.io/crates/bat"><img src="https://img.shields.io/crates/v/bat.svg?colorB=319e8c" alt="Version info"></a>

6 <a href="https://crates.io/crates/bat"><img src="https://img.shields.io/crates/v/bat.svg?colorB=319e8c" alt="Version info"></a>

6 A cat(1) clone with syntax highlighting and Git integration.

7 A cat(1) clone with syntax highlighting and Git integration.

@@ -11,27 +12,10 @@

11 <a href="#how-to-use">How To Use</a> •

12 <a href="#how-to-use">How To Use</a> •

12 <a href="#installation">Installation</a> •

13 <a href="#installation">Installation</a> •

13 <a href="#customization">Customization</a> •

14 <a href="#customization">Customization</a> •

14− <a href="#project-goals-and-alternatives">Project goals, alternatives</a>

15+ <a href="#project-goals-and-alternatives">Project goals, alternatives</a> •

15− [English]

16+ Translation [<a href="https://github.com/chinanf-boy/bat-zh">中文</a>][<a href="doc/README-ja.md">日本文</a>]

16− [<a href="doc/README-zh.md">中文</a>]

17− [<a href="doc/README-ja.md">日本語</a>]

18− [<a href="doc/README-ko.md">한국어</a>]

19− [<a href="doc/README-ru.md">Русский</a>]

20

17

21

18

22−### Sponsors

23−

24−A special *thank you* goes to our biggest <a href="doc/sponsors.md">sponsors</a>:

25−<a href="https://workos.com/?utm_campaign=github_repo&utm_medium=referral&utm_content=bat&utm_source=github">

26− <img src="doc/sponsors/workos-logo-white-bg.svg" width="200" alt="WorkOS">

27−

28− Your app, enterprise-ready.

29−

30− Start selling to enterprise customers with just a few lines of code.

31−

32− Add Single Sign-On (and more) in minutes instead of months.

33−</a>

34−

35### Syntax highlighting

19### Syntax highlighting

36

20

37`bat` supports syntax highlighting for a large number of programming and markup

21`bat` supports syntax highlighting for a large number of programming and markup

@@ -55,14 +39,14 @@ characters:

55

39

56### Automatic paging

40### Automatic paging

57

41

58−By default, `bat` pipes its own output to a pager (e.g. `less`) if the output is too large for one screen.

42+`bat` can pipe its own output to `less` if the output is too large for one screen.

59−If you would rather `bat` work like `cat` all the time (never page output), you can set `--paging=never` as an option, either on the command line or in your configuration file.

60−If you intend to alias `cat` to `bat` in your shell configuration, you can use `alias cat='bat --paging=never'` to preserve the default behavior.

61

43

62−#### File concatenation

44+### File concatenation

63

45

64−Even with a pager set, you can still use `bat` to concatenate files :wink:.

46+Oh.. you can also use it to concatenate files :wink:. Whenever

65−Whenever `bat` detects a non-interactive terminal (i.e. when you pipe into another process or into a file), `bat` will act as a drop-in replacement for `cat` and fall back to printing the plain file contents, regardless of the `--pager` option's value.

47+`bat` detects a non-interactive terminal (i.e. when you pipe into another process

48+or into a file), `bat` will act as a drop-in replacement for `cat` and

49+fall back to printing the plain file contents.

66

50

67## How to use

51## How to use

68

52

@@ -78,9 +62,7 @@ Display multiple files at once

78> bat src/*.rs

62> bat src/*.rs

79```

63```

80

64

81−Read from stdin, determine the syntax automatically (note, highlighting will

65+Read from stdin, determine the syntax automatically

82−only work if the syntax can be determined from the first line of the file,

83−usually through a shebang such as `#!/bin/sh`)

84

66

85```bash

67```bash

86> curl -s https://sh.rustup.rs | bat

68> curl -s https://sh.rustup.rs | bat

@@ -111,28 +93,14 @@ bat f - g # output 'f', then stdin, then 'g'.

111

93

112### Integration with other tools

94### Integration with other tools

113

95

114−#### `fzf`

115−

116−You can use `bat` as a previewer for [`fzf`](https://github.com/junegunn/fzf). To do this,

117−use `bat`s `--color=always` option to force colorized output. You can also use `--line-range`

118−option to restrict the load times for long files:

119−

120−```bash

121−fzf --preview 'bat --color=always --style=numbers --line-range=:500 {}'

122−```

123−

124−For more information, see [`fzf`'s `README`](https://github.com/junegunn/fzf#preview-window).

125−

126#### `find` or `fd`

96#### `find` or `fd`

127

97

128You can use the `-exec` option of `find` to preview all search results with `bat`:

98You can use the `-exec` option of `find` to preview all search results with `bat`:

129−

130```bash

99```bash

131find … -exec bat {} +

100find … -exec bat {} +

132```

101```

133

102

134If you happen to use [`fd`](https://github.com/sharkdp/fd), you can use the `-X`/`--exec-batch` option to do the same:

103If you happen to use [`fd`](https://github.com/sharkdp/fd), you can use the `-X`/`--exec-batch` option to do the same:

135−

136```bash

104```bash

137fd … -X bat

105fd … -X bat

138```

106```

@@ -148,11 +116,9 @@ batgrep needle src/

148#### `tail -f`

116#### `tail -f`

149

117

150`bat` can be combined with `tail -f` to continuously monitor a given file with syntax highlighting.

118`bat` can be combined with `tail -f` to continuously monitor a given file with syntax highlighting.

151−

152```bash

119```bash

153tail -f /var/log/pacman.log | bat --paging=never -l log

120tail -f /var/log/pacman.log | bat --paging=never -l log

154```

121```

155−

156Note that we have to switch off paging in order for this to work. We have also specified the syntax

122Note that we have to switch off paging in order for this to work. We have also specified the syntax

157explicitly (`-l log`), as it can not be auto-detected in this case.

123explicitly (`-l log`), as it can not be auto-detected in this case.

158

124

@@ -160,23 +126,11 @@ explicitly (`-l log`), as it can not be auto-detected in this case.

160

126

161You can combine `bat` with `git show` to view an older version of a given file with proper syntax

127You can combine `bat` with `git show` to view an older version of a given file with proper syntax

162highlighting:

128highlighting:

163−

164```bash

129```bash

165git show v0.6.0:src/main.rs | bat -l rs

130git show v0.6.0:src/main.rs | bat -l rs

166```

131```

167

132

168−#### `git diff`

169−

170−You can combine `bat` with `git diff` to view lines around code changes with proper syntax

171−highlighting:

172−```bash

173−batdiff() {

174− git diff --name-only --relative --diff-filter=d | xargs bat --diff

175−}

176−```

177−If you prefer to use this as a separate tool, check out `batdiff` in [`bat-extras`](https://github.com/eth-p/bat-extras).

178−

179−If you are looking for more support for git and diff operations, check out [`delta`](https://github.com/dandavison/delta).

133+Note that syntax highlighting within diffs is currently not supported. If you are looking for this, check out [`delta`](https://github.com/dandavison/delta).

180

134

181#### `xclip`

135#### `xclip`

182

136

@@ -197,71 +151,36 @@ bat main.cpp | xclip

197export MANPAGER="sh -c 'col -bx | bat -l man -p'"

151export MANPAGER="sh -c 'col -bx | bat -l man -p'"

198man 2 select

152man 2 select

199```

153```

200−(replace `bat` with `batcat` if you are on Debian or Ubuntu)

201

154

202It might also be necessary to set `MANROFFOPT="-c"` if you experience

155It might also be necessary to set `MANROFFOPT="-c"` if you experience

203formatting problems.

156formatting problems.

204

157

205If you prefer to have this bundled in a new command, you can also use [`batman`](https://github.com/eth-p/bat-extras/blob/master/doc/batman.md).

158If you prefer to have this bundled in a new command, you can also use [`batman`](https://github.com/eth-p/bat-extras/blob/master/doc/batman.md).

206

159

207−Note that the [Manpage syntax](assets/syntaxes/02_Extra/Manpage.sublime-syntax) is developed in this repository and still needs some work.

160+Note that the [Manpage syntax](assets/syntaxes/Manpage.sublime-syntax) is developed in this repository and still needs some work.

208−

209−Also, note that this will [not work](https://github.com/sharkdp/bat/issues/1145) with Mandocs `man` implementation.

210

161

211#### `prettier` / `shfmt` / `rustfmt`

162#### `prettier` / `shfmt` / `rustfmt`

212

163

213The [`prettybat`](https://github.com/eth-p/bat-extras/blob/master/doc/prettybat.md) script is a wrapper that will format code and print it with `bat`.

164The [`prettybat`](https://github.com/eth-p/bat-extras/blob/master/doc/prettybat.md) script is a wrapper that will format code and print it with `bat`.

214

165

215−#### Highlighting `--help` messages

216−

217−You can use `bat` to colorize help text: `$ cp --help | bat -plhelp`

218−

219−You can also use a wrapper around this:

220−

221−```bash

222−# in your .bashrc/.zshrc/*rc

223−alias bathelp='bat --plain --language=help'

224−help() {

225− "$@" --help 2>&1 | bathelp

226−}

227−```

228−

229−Then you can do `$ help cp` or `$ help git commit`.

230−

231−Please report any issues with the help syntax in [this repository](https://github.com/victor-gp/cmd-help-sublime-syntax).

232−

233

166

234## Installation

167## Installation

235

168

236−[![Packaging status](https://repology.org/badge/vertical-allrepos/bat-cat.svg)](https://repology.org/project/bat-cat/versions)

169+[![Packaging status](https://repology.org/badge/vertical-allrepos/bat.svg)](https://repology.org/project/bat/versions)

237

170

238−### On Ubuntu (using `apt`)

171+### On Ubuntu

239*... and other Debian-based Linux distributions.*

172*... and other Debian-based Linux distributions.*

240

173

241−`bat` is available on [Ubuntu since 20.04 ("Focal")](https://packages.ubuntu.com/search?keywords=bat&exact=1) and [Debian since August 2021 (Debian 11 - "Bullseye")](https://packages.debian.org/bullseye/bat).

174+You can install [the Ubuntu `bat` package](https://packages.ubuntu.com/eoan/bat) or [the Debian `bat` package](https://packages.debian.org/sid/bat) since Ubuntu Eoan 19.10 or Debian unstable sid.

242−

243−If your Ubuntu/Debian installation is new enough you can simply run:

244

175

245```bash

176```bash

246−sudo apt install bat

177+apt install bat

247```

178```

248

179

249−**Important**: If you install `bat` this way, please note that the executable may be installed as `batcat` instead of `bat` (due to [a name

250−clash with another package](https://github.com/sharkdp/bat/issues/982)). You can set up a `bat -> batcat` symlink or alias to prevent any issues that may come up because of this and to be consistent with other distributions:

251−``` bash

252−mkdir -p ~/.local/bin

253−ln -s /usr/bin/batcat ~/.local/bin/bat

254−```

255−

256−### On Ubuntu (using most recent `.deb` packages)

257−*... and other Debian-based Linux distributions.*

258−

259−If the package has not yet been promoted to your Ubuntu/Debian installation, or you want

260−the most recent release of `bat`, download the latest `.deb` package from the

180+If you want to run the latest release of bat or if you are on older versions of Ubuntu/Debian, download the latest `.deb` package from the [release page](https://github.com/sharkdp/bat/releases)

261−[release page](https://github.com/sharkdp/bat/releases) and install it via:

181+and install it via:

262−

263```bash

182```bash

264−sudo dpkg -i bat_0.18.3_amd64.deb # adapt version number and architecture

183+sudo dpkg -i bat_0.12.1_amd64.deb # adapt version number and architecture

265```

184```

266

185

267### On Alpine Linux

186### On Alpine Linux

@@ -290,14 +209,6 @@ You can install [the `bat` package](https://koji.fedoraproject.org/koji/packagei

290dnf install bat

209dnf install bat

291```

210```

292

211

293−### On Funtoo Linux

294−

295−You can install [the `bat` package](https://github.com/funtoo/dev-kit/tree/1.4-release/sys-apps/bat) from dev-kit.

296−

297−```bash

298−emerge sys-apps/bat

299−```

300−

301### On Gentoo Linux

212### On Gentoo Linux

302

213

303You can install [the `bat` package](https://packages.gentoo.org/packages/sys-apps/bat)

214You can install [the `bat` package](https://packages.gentoo.org/packages/sys-apps/bat)

@@ -314,13 +225,6 @@ You can install `bat` via xbps-install:

314xbps-install -S bat

225xbps-install -S bat

315```

226```

316

227

317−### On Termux

318−

319−You can install `bat` via pkg:

320−```bash

321−pkg install bat

322−```

323−

324### On FreeBSD

228### On FreeBSD

325

229

326You can install a precompiled [`bat` package](https://www.freshports.org/textproc/bat) with pkg:

230You can install a precompiled [`bat` package](https://www.freshports.org/textproc/bat) with pkg:

@@ -336,14 +240,6 @@ cd /usr/ports/textproc/bat

336make install

240make install

337```

241```

338

242

339−### On OpenBSD

340−

341−You can install `bat` package using [`pkg_add(1)`](https://man.openbsd.org/pkg_add.1):

342−

343−```bash

344−pkg_add bat

345−```

346−

347### Via nix

243### Via nix

348

244

349You can install `bat` using the [nix package manager](https://nixos.org/nix):

245You can install `bat` using the [nix package manager](https://nixos.org/nix):

@@ -360,21 +256,14 @@ You can install `bat` with zypper:

360zypper install bat

256zypper install bat

361```

257```

362

258

363−### Via snap package

259+### On macOS

364−

365−There is currently no recommended snap package available.

366−Existing packages may be available, but are not officially supported and may contain [issues](https://github.com/sharkdp/bat/issues/1519).

367

260

368−### On macOS (or Linux) via Homebrew

369−

370−You can install `bat` with [Homebrew on MacOS](https://formulae.brew.sh/formula/bat) or [Homebrew on Linux](https://formulae.brew.sh/formula-linux/bat):

261+You can install `bat` with [Homebrew](http://braumeister.org/formula/bat):

371

262

372```bash

263```bash

373brew install bat

264brew install bat

374```

265```

375

266

376−### On macOS via MacPorts

377−

378Or install `bat` with [MacPorts](https://ports.macports.org/port/bat/summary):

267Or install `bat` with [MacPorts](https://ports.macports.org/port/bat/summary):

379

268

380```bash

269```bash

@@ -383,32 +272,54 @@ port install bat

383

272

384### On Windows

273### On Windows

385

274

386−There are a few options to install `bat` on Windows. Once you have installed `bat`,

275+You can download prebuilt binaries from the [Release page](https://github.com/sharkdp/bat/releases),

387−take a look at the ["Using `bat` on Windows"](#using-bat-on-windows) section.

276+or install it with [scoop](https://scoop.sh/) or [Chocolatey](https://chocolatey.org):

277+

278+```bash

279+scoop install bat

280+```

388

281

389−#### Prerequisites

282+```bash

283+choco install bat

284+```

390

285

391−You will need to install the [Visual C++ Redistributable](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) package.

286+[See below](#using-bat-on-windows) for notes.

392

287

393−#### With Chocolatey

288+### Via Docker

394

289

395−You can install `bat` via [Chocolatey](https://chocolatey.org/packages/Bat):

290+There is a [Docker image](https://hub.docker.com/r/danlynn/bat/) that you can use to run `bat` in a container:

396```bash

291```bash

397−choco install bat

292+docker pull danlynn/bat

293+alias bat='docker run -it --rm -e BAT_THEME -e BAT_STYLE -e BAT_TABS -v "$(pwd):/myapp" danlynn/bat'

398```

294```

399

295

400−#### With Scoop

296+### Via Ansible

297+

298+You can install `bat` with [Ansible](https://www.ansible.com/):

401

299

402−You can install `bat` via [scoop](https://scoop.sh/):

403```bash

300```bash

404−scoop install bat

301+# Install role on local machine

302+ansible-galaxy install aeimer.install_bat

405```

303```

406

304

407−#### From prebuilt binaries:

305+```yaml

306+---

307+# Playbook to install bat

308+- host: all

309+ roles:

310+ - aeimer.install_bat

311+```

408

312

409−You can download prebuilt binaries from the [Release page](https://github.com/sharkdp/bat/releases),

313+- [Ansible Galaxy](https://galaxy.ansible.com/aeimer/install_bat)

314+- [GitHub](https://github.com/aeimer/ansible-install-bat)

410

315

411−You will need to install the [Visual C++ Redistributable](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) package.

316+This should work with the following distributions:

317+- Debian/Ubuntu

318+- ARM (eg. Raspberry PI)

319+- Arch Linux

320+- Void Linux

321+- FreeBSD

322+- MacOS

412

323

413### From binaries

324### From binaries

414

325

@@ -418,15 +329,14 @@ binaries are also available: look for archives with `musl` in the file name.

418

329

419### From source

330### From source

420

331

421−If you want to build `bat` from source, you need Rust 1.51 or

332+If you want to build `bat` from source, you need Rust 1.35 or

422higher. You can then use `cargo` to build everything:

333higher. You can then use `cargo` to build everything:

423

334

424```bash

335```bash

425−cargo install --locked bat

336+cargo install bat

426```

337```

427

338

428−Note that additional files like the man page or shell completion

339+On some platforms, you might need to install `llvm` and/or `libclang-dev`.

429−files can not be installed in this way. They will be generated by `cargo` and should be available in the cargo target folder (under `build`).

430

340

431## Customization

341## Customization

432

342

@@ -450,26 +360,6 @@ light background, some themes like `GitHub` or `OneHalfLight` will work better f

450You can also use a custom theme by following the

360You can also use a custom theme by following the

451['Adding new themes' section below](https://github.com/sharkdp/bat#adding-new-themes).

361['Adding new themes' section below](https://github.com/sharkdp/bat#adding-new-themes).

452

362

453−### 8-bit themes

454−

455−`bat` has three themes that always use [8-bit colors](https://en.wikipedia.org/wiki/ANSI_escape_code#Colors),

456−even when truecolor support is available:

457−

458−- `ansi` looks decent on any terminal. It uses 3-bit colors: black, red, green,

459− yellow, blue, magenta, cyan, and white.

460−- `base16` is designed for [base16](https://github.com/chriskempson/base16) terminal themes. It uses

461− 4-bit colors (3-bit colors plus bright variants) in accordance with the

462− [base16 styling guidelines](https://github.com/chriskempson/base16/blob/master/styling.md).

463−- `base16-256` is designed for [base16-shell](https://github.com/chriskempson/base16-shell).

464− It replaces certain bright colors with 8-bit colors from 16 to 21. **Do not** use this simply

465− because you have a 256-color terminal but are not using base16-shell.

466−

467−Although these themes are more restricted, they have three advantages over truecolor themes. They:

468−

469−- Enjoy maximum compatibility. Some terminal utilities do not support more than 3-bit colors.

470−- Adapt to terminal theme changes. Even for already printed output.

471−- Visually harmonize better with other terminal software.

472−

473### Output style

363### Output style

474

364

475You can use the `--style` option to control the appearance of `bat`s output.

365You can use the `--style` option to control the appearance of `bat`s output.

@@ -480,45 +370,35 @@ variable to make these changes permanent or use `bat`s

480

370

481### Adding new syntaxes / language definitions

371### Adding new syntaxes / language definitions

482

372

483−Should you find that a particular syntax is not available within `bat`, you can follow these

484−instructions to easily add new syntaxes to your current `bat` installation.

485−

486`bat` uses the excellent [`syntect`](https://github.com/trishume/syntect/)

373`bat` uses the excellent [`syntect`](https://github.com/trishume/syntect/)

487library for syntax highlighting. `syntect` can read any

374library for syntax highlighting. `syntect` can read any

488[Sublime Text `.sublime-syntax` file](https://www.sublimetext.com/docs/3/syntax.html)

375[Sublime Text `.sublime-syntax` file](https://www.sublimetext.com/docs/3/syntax.html)

489−and theme.

376+and theme. To add new syntax definitions, do the following.

490−

491−A good resource for finding Sublime Syntax packages is [Package Control](https://packagecontrol.io/). Once you found a

492−syntax:

493

377

494−1. Create a folder with syntax definition files:

378+Create a folder with syntax definition files:

495

379

496− ```bash

380+```bash

497− mkdir -p "$(bat --config-dir)/syntaxes"

381+mkdir -p "$(bat --config-dir)/syntaxes"

498− cd "$(bat --config-dir)/syntaxes"

382+cd "$(bat --config-dir)/syntaxes"

499−

500− # Put new '.sublime-syntax' language definition files

501− # in this folder (or its subdirectories), for example:

502− git clone https://github.com/tellnobody1/sublime-purescript-syntax

503− ```

504

383

505−2. Now use the following command to parse these files into a binary cache:

384+# Put new '.sublime-syntax' language definition files

385+# in this folder (or its subdirectories), for example:

386+git clone https://github.com/tellnobody1/sublime-purescript-syntax

387+```

506

388

507− ```bash

389+Now use the following command to parse these files into a binary cache:

508− bat cache --build

509− ```

510

390

511−3. Finally, use `bat --list-languages` to check if the new languages are available.

391+```bash

392+bat cache --build

393+```

512

394

513− If you ever want to go back to the default settings, call:

395+Finally, use `bat --list-languages` to check if the new languages are available.

514

396

515− ```bash

397+If you ever want to go back to the default settings, call:

516− bat cache --clear

517− ```

518

398

519−4. If you think that a specific syntax should be included in `bat` by default, please

399+```bash

520− consider opening a "syntax request" ticket after reading the policies and

400+bat cache --clear

521− instructions [here](doc/assets.md): [Open Syntax Request](https://github.com/sharkdp/bat/issues/new?labels=syntax-request&template=syntax_request.md).

401+```

522

402

523### Adding new themes

403### Adding new themes

524

404

@@ -538,34 +418,6 @@ bat cache --build

538

418

539Finally, use `bat --list-themes` to check if the new themes are available.

419Finally, use `bat --list-themes` to check if the new themes are available.

540

420

541−### Adding or changing file type associations

542−

543−You can add new (or change existing) file name patterns using the `--map-syntax`

544−command line option. The option takes an argument of the form `pattern:syntax` where

545−`pattern` is a glob pattern that is matched against the file name and

546−the absolute file path. The `syntax` part is the full name of a supported language

547−(use `bat --list-languages` for an overview).

548−

549−**Note:** You probably want to use this option as [an entry in `bat`'s configuration file](#configuration-file)

550−for persistence instead of passing it on the command line as a one-off. Generally

551−you'd just use `-l` if you want to manually specify a language for a file.

552−

553−Example: To use "INI" syntax highlighting for all files with a `.conf` file extension, use

554−```bash

555−--map-syntax='*.conf:INI'

556−```

557−

558−Example: To open all files called `.ignore` (exact match) with the "Git Ignore" syntax, use:

559−```bash

560−--map-syntax='.ignore:Git Ignore'

561−```

562−

563−Example: To open all `.conf` files in subfolders of `/etc/apache2` with the "Apache Conf"

564−syntax, use (this mapping is already built in):

565−```bash

566−--map-syntax='/etc/apache2/**/*.conf:Apache Conf'

567−```

568−

569### Using a different pager

421### Using a different pager

570

422

571`bat` uses the pager that is specified in the `PAGER` environment variable. If this variable is not

423`bat` uses the pager that is specified in the `PAGER` environment variable. If this variable is not

@@ -573,8 +425,6 @@ set, `less` is used by default. If you want to use a different pager, you can ei

573`PAGER` variable or set the `BAT_PAGER` environment variable to override what is specified in

425`PAGER` variable or set the `BAT_PAGER` environment variable to override what is specified in

574`PAGER`.

426`PAGER`.

575

427

576−**Note**: If `PAGER` is `more` or `most`, `bat` will silently use `less` instead to ensure support for colors.

577−

578If you want to pass command-line arguments to the pager, you can also set them via the

428If you want to pass command-line arguments to the pager, you can also set them via the

579`PAGER`/`BAT_PAGER` variables:

429`PAGER`/`BAT_PAGER` variables:

580

430

@@ -585,46 +435,34 @@ export BAT_PAGER="less -RF"

585Instead of using environment variables, you can also use `bat`s [configuration file](https://github.com/sharkdp/bat#configuration-file) to configure the pager (`--pager` option).

435Instead of using environment variables, you can also use `bat`s [configuration file](https://github.com/sharkdp/bat#configuration-file) to configure the pager (`--pager` option).

586

436

587**Note**: By default, if the pager is set to `less` (and no command-line options are specified),

437**Note**: By default, if the pager is set to `less` (and no command-line options are specified),

588−`bat` will pass the following command line options to the pager: `-R`/`--RAW-CONTROL-CHARS`,

438+`bat` will pass the following command line

589−`-F`/`--quit-if-one-screen` and `-X`/`--no-init`. The last option (`-X`) is only used for `less`

439+options to the pager: `-R`/`--RAW-CONTROL-CHARS`, `-F`/`--quit-if-one-screen` and `-X`/`--no-init`.

590−versions older than 530.

591−

592−The `-R` option is needed to interpret ANSI colors correctly. The second option (`-F`) instructs

440+The first (`-R`) is needed to interpret ANSI colors correctly. The second option (`-F`) instructs

593less to exit immediately if the output size is smaller than the vertical size of the terminal.

441less to exit immediately if the output size is smaller than the vertical size of the terminal.

594This is convenient for small files because you do not have to press `q` to quit the pager. The

442This is convenient for small files because you do not have to press `q` to quit the pager. The

595third option (`-X`) is needed to fix a bug with the `--quit-if-one-screen` feature in old versions

443third option (`-X`) is needed to fix a bug with the `--quit-if-one-screen` feature in old versions

596−of `less`. Unfortunately, it also breaks mouse-wheel support in `less`.

444+of `less`. Unfortunately, it also breaks mouse-wheel support in `less`. If you want to enable

597−

598−If you want to enable mouse-wheel scrolling on older versions of `less`, you can pass just `-R` (as

445+mouse-wheel scrolling, you can either pass just `-R` (as in the example above, this will disable

599−in the example above, this will disable the quit-if-one-screen feature). For less 530 or newer,

446+the quit-if-one-screen feature), or you can use a recent version of `less` and pass `-RF` which

600−it should work out of the box.

447+will hopefully enable both quit-if-one-screen and mouse-wheel scrolling.

601

448

602−### Indentation

449+If scrolling still doesn't work for you, you can try to pass the `-S` option in addition.

603−

604−`bat` expands tabs to 4 spaces by itself, not relying on the pager. To change this, simply add the

605−`--tabs` argument with the number of spaces you want to be displayed.

606−

607−**Note**: Defining tab stops for the pager (via the `--pager` argument by `bat`, or via the `LESS`

608−environment variable for `less`) won't be taken into account because the pager will already get

609−expanded spaces instead of tabs. This behaviour is added to avoid indentation issues caused by the

610−sidebar. Calling `bat` with `--tabs=0` will override it and let tabs be consumed by the pager.

611

450

612### Dark mode

451### Dark mode

613

452

614If you make use of the dark mode feature in macOS, you might want to configure `bat` to use a different

453If you make use of the dark mode feature in macOS, you might want to configure `bat` to use a different

615−theme based on the OS theme. The following snippet uses the `default` theme when in the _dark mode_

454+theme based on the OS theme. The following snippet uses the `default` theme when in the light mode

616−and the `GitHub` theme when in the _light mode_.

455+and the `GitHub` theme when in the dark mode.

617

456

618```bash

457```bash

619alias cat="bat --theme=\$(defaults read -globalDomain AppleInterfaceStyle &> /dev/null && echo default || echo GitHub)"

458alias cat="bat --theme=\$(defaults read -globalDomain AppleInterfaceStyle &> /dev/null && echo default || echo GitHub)"

620```

459```

621

460

622−

623## Configuration file

461## Configuration file

624

462

625`bat` can also be customized with a configuration file. The location of the file is dependent

463`bat` can also be customized with a configuration file. The location of the file is dependent

626on your operating system. To get the default path for your system, call

464on your operating system. To get the default path for your system, call

627−```bash

465+```

628bat --config-file

466bat --config-file

629```

467```

630

468

@@ -634,11 +472,6 @@ non-default location of the configuration file:

634export BAT_CONFIG_PATH="/path/to/bat.conf"

472export BAT_CONFIG_PATH="/path/to/bat.conf"

635```

473```

636

474

637−A default configuration file can be created with the `--generate-config-file` option.

638−```bash

639−bat --generate-config-file

640−```

641−

642### Format

475### Format

643

476

644The configuration file is a simple list of command line arguments. Use `bat --help` to see a full list of possible options and values. In addition, you can add comments by prepending a line with the `#` character.

477The configuration file is a simple list of command line arguments. Use `bat --help` to see a full list of possible options and values. In addition, you can add comments by prepending a line with the `#` character.

@@ -654,18 +487,21 @@ Example configuration file:

654# Use italic text on the terminal (not supported on all terminals)

487# Use italic text on the terminal (not supported on all terminals)

655--italic-text=always

488--italic-text=always

656

489

490+# Add mouse scrolling support in less (does not work with older

491+# versions of "less")

492+--pager="less -FR"

493+

657−# Use C++ syntax for Arduino .ino files

494+# Use C++ syntax (instead of C) for .h header files

658−--map-syntax "*.ino:C++"

495+--map-syntax h:cpp

496+

497+# Use "gitignore" highlighting for ".ignore" files

498+--map-syntax .ignore:.gitignore

659```

499```

660

500

661## Using `bat` on Windows

501## Using `bat` on Windows

662

502

663`bat` mostly works out-of-the-box on Windows, but a few features may need extra configuration.

503`bat` mostly works out-of-the-box on Windows, but a few features may need extra configuration.

664

504

665−### Prerequisites

666−

667−You will need to install the [Visual C++ Redistributable](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) package.

668−

669### Paging

505### Paging

670

506

671Windows only includes a very limited pager in the form of `more`. You can download a Windows binary

507Windows only includes a very limited pager in the form of `more`. You can download a Windows binary

@@ -706,19 +542,11 @@ bat() {

706

542

707## Troubleshooting

543## Troubleshooting

708

544

709−### Garbled output

710−

711−If an input file contains color codes or other ANSI escape sequences or control characters, `bat` will have problems

712−performing syntax highlighting and text wrapping, and thus the output can become garbled.

713−When displaying such files it is recommended to disable both syntax highlighting and wrapping by

714−passing the `--color=never --wrap=never` options to `bat`.

715−

716### Terminals & colors

545### Terminals & colors

717

546

718−`bat` handles terminals *with* and *without* truecolor support. However, the colors in most syntax

547+`bat` handles terminals *with* and *without* truecolor support. However, the colors in the syntax

719−highlighting themes are not optimized for 8-bit colors. It is therefore strongly recommended

548+highlighting themes are not optimized for 8-bit colors and it is therefore strongly recommended

720−that you use a terminal with 24-bit truecolor support (`terminator`, `konsole`, `iTerm2`, ...),

549+that you use a terminal with 24-bit truecolor support (`terminator`, `konsole`, `iTerm2`, ...).

721−or use one of the basic [8-bit themes](#8-bit-themes) designed for a restricted set of colors.

722See [this article](https://gist.github.com/XVilka/8346728) for more details and a full list of

550See [this article](https://gist.github.com/XVilka/8346728) for more details and a full list of

723terminals with truecolor support.

551terminals with truecolor support.

724

552

@@ -757,32 +585,17 @@ cargo build --bins

757cargo test

585cargo test

758

586

759# Install (release version)

587# Install (release version)

760−cargo install --path . --locked

588+cargo install

761

589

762# Build a bat binary with modified syntaxes and themes

590# Build a bat binary with modified syntaxes and themes

763bash assets/create.sh

591bash assets/create.sh

764−cargo install --path . --locked --force

592+cargo install -f

765```

593```

766

594

767−If you want to build an application that uses `bat`s pretty-printing

768−features as a library, check out the [the API documentation](https://docs.rs/bat/).

769−Note that you have to use either `regex-onig` or `regex-fancy` as a feature

770−when you depend on `bat` as a library.

771−

772−## Contributing

773−

774−Take a look at the [`CONTRIBUTING.md`](CONTRIBUTING.md) guide.

775−

776## Maintainers

595## Maintainers

777

596

778- [sharkdp](https://github.com/sharkdp)

597- [sharkdp](https://github.com/sharkdp)

779- [eth-p](https://github.com/eth-p)

598- [eth-p](https://github.com/eth-p)

780−- [keith-hall](https://github.com/keith-hall)

781−- [Enselic](https://github.com/Enselic)

782−

783−## Security vulnerabilities

784−

785−Please contact [David Peter](https://david-peter.de/) via email if you want to report a vulnerability in `bat`.

786

599

787## Project goals and alternatives

600## Project goals and alternatives

788

601

@@ -795,10 +608,3 @@ Please contact [David Peter](https://david-peter.de/) via email if you want to r

795

608

796There are a lot of alternatives, if you are looking for similar programs. See

609There are a lot of alternatives, if you are looking for similar programs. See

797[this document](doc/alternatives.md) for a comparison.

610[this document](doc/alternatives.md) for a comparison.

798−

799−## License

801−

802−`bat` is made available under the terms of either the MIT License or the Apache License 2.0, at your option.

803−

804−See the [LICENSE-APACHE](LICENSE-APACHE) and [LICENSE-MIT](LICENSE-MIT) files for license details.

appveyor.ymlnew file+49

@@ -0,0 +1,49 @@

1+environment:

2+ global:

3+ TARGET: x86_64-pc-windows-msvc

4+ RUST_VERSION: stable

5+ CRATE_NAME: bat

6+ CARGO_HOME: "c:\\cargo"

7+ RUSTUP_HOME: "c:\\rustup"

8+

9+install:

10+ - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe

11+ - rustup-init.exe -y --default-host %TARGET%

12+ - set PATH=%PATH%;C:\cargo\bin

13+ - rustc -Vv

14+ - cargo -V

15+

16+build: false

17+test_script:

18+ - cargo test --target %TARGET% --verbose

19+ - cargo run --target %TARGET% -- src/bin/bat/main.rs README.md --paging=never

20+

21+before_deploy:

22+ # Generate artifacts for release

23+ - cargo build --bins --release --verbose

24+ - ps: ci\before_deploy.ps1

25+

26+deploy:

27+ description: 'Automatically deployed release'

28+ artifact: /.*\.zip/

29+ # Here's how:

30+ # - Go to 'https://github.com/settings/tokens/new' and generate a Token with only the

31+ # `public_repo` scope enabled

32+ # - Then go to 'https://ci.appveyor.com/tools/encrypt' and enter the newly generated token.

33+ # - Enter the "encrypted value" below

34+ auth_token:

35+ secure: oO4/J+hcFXgXcEqEc8gzlQNqLG0IxU78s4EyH+uczGdsyWajb3yipxPR6nXUvmoj

36+ provider: GitHub

37+ on:

38+ RUST_VERSION: stable

39+ appveyor_repo_tag: true

40+

41+cache:

42+ - C:\Users\appveyor\.cargo\registry

43+ - target

44+

45+notifications:

46+ - provider: Email

47+ on_build_success: false

48+ on_build_failure: false

49+ on_build_status_changed: false

assets/patches/JavaDoc.sublime-syntax.patch → assets/JavaDoc.sublime-syntax.patchrenamed+3−3

@@ -1,7 +1,7 @@

1−diff --git syntaxes/01_Packages/Java/JavaDoc.sublime-syntax syntaxes/01_Packages/Java/JavaDoc.sublime-syntax

1+diff --git syntaxes/Packages/Java/JavaDoc.sublime-syntax syntaxes/Packages/Java/JavaDoc.sublime-syntax

2index 422a6a9..40a741e 100644

3−--- syntaxes/01_Packages/Java/JavaDoc.sublime-syntax

3+--- syntaxes/Packages/Java/JavaDoc.sublime-syntax

4−+++ syntaxes/01_Packages/Java/JavaDoc.sublime-syntax

4++++ syntaxes/Packages/Java/JavaDoc.sublime-syntax

5@@ -13,7 +13,7 @@ variables:

6 contexts:

7 prototype:

assets/README.mdnew file+41

@@ -0,0 +1,41 @@

1+## Syntax Highlighting in bat

2+

3+`bat` uses the [syntect](https://github.com/trishume/syntect) library to highlight source

4+code. As a basis, syntect uses [Sublime Text](https://www.sublimetext.com/) syntax definitions

5+in the `.sublime-syntax` format.

6+

7+In order to add new syntaxes to `bat`, follow these steps:

8+

9+1. Find a Sublime Text syntax for the given language, preferably in a separate Git repository

10+ which can be included as a submodule (under `assets/syntaxes`).

11+

12+2. If the Sublime Text syntax is only available as a `.tmLanguage` file, open the file in

13+ Sublime Text and convert it to a `.sublime-syntax` file via *Tools* -> *Developer* ->

14+ *New Syntax from XXX.tmLanguage...*. Save the new file in the `assets/syntaxes` folder.

15+

16+3. Run the `create.sh` script. It calls `bat cache --build` to parse all available

17+ `.sublime-syntax` files and serialize them to a `syntaxes.bin` file (in this folder).

18+

19+4. Re-compile `bat`. At compilation time, the `syntaxes.bin` file will be stored inside the

20+ `bat` binary.

21+

22+5. If you send a pull request with your changes, please do *not* include the changed `syntaxes.bin`

23+ file. A new binary cache file will be created once before every new release of `bat`.

24+

25+### Troubleshooting

26+

27+Make sure that the local cache does not interfere with the internally stored syntaxes and

28+themes (`bat cache --clear`).

29+

30+### Manual modifications

31+

32+The following files have been manually modified after converting from a `.tmLanguage` file:

33+

34+* `Dart.sublime-syntax` => removed `#regex.dart` include.

35+* `INI.sublime-syntax` => added `.hgrc`, `hgrc`, and `desktop` file types.

36+* `Org mode.sublime-syntax` => removed `task` file type.

37+

38+### Non-submodule additions

39+

40+* `Assembly (x86_64)` has been manually added from https://github.com/13xforever/x86-assembly-textmate-bundle due to `git clone` recursion problems

41+* `Nim.sublime-syntax` has been added manually from https://github.com/getzola/zola/blob/master/sublime_syntaxes/Nim.sublime-syntax as there was no suitable Git repository for it. The original syntax seems to originate from https://github.com/Varriount/NimLime

assets/acknowledgements.bindeleted

Binary file not shown.

assets/completions/_bat.ps1.indeleted−92

@@ -1,92 +0,0 @@

1−

2−using namespace System.Management.Automation

3−using namespace System.Management.Automation.Language

4−

5−Register-ArgumentCompleter -Native -CommandName '{{PROJECT_EXECUTABLE}}' -ScriptBlock {

6− param($wordToComplete, $commandAst, $cursorPosition)

7−

8− $commandElements = $commandAst.CommandElements

9− $command = @(

10− '{{PROJECT_EXECUTABLE}}'

11− for ($i = 1; $i -lt $commandElements.Count; $i++) {

12− $element = $commandElements[$i]

13− if ($element -isnot [StringConstantExpressionAst] -or

14− $element.StringConstantType -ne [StringConstantType]::BareWord -or

15− $element.Value.StartsWith('-')) {

16− break

17− }

18− $element.Value

19− }) -join ';'

20−

21− $completions = @(switch ($command) {

22− '{{PROJECT_EXECUTABLE}}' {

23− [CompletionResult]::new('-l', 'l', [CompletionResultType]::ParameterName, 'Set the language for syntax highlighting.')

24− [CompletionResult]::new('--language', 'language', [CompletionResultType]::ParameterName, 'Set the language for syntax highlighting.')

25− [CompletionResult]::new('-H', 'H', [CompletionResultType]::ParameterName, 'Highlight lines N through M.')

26− [CompletionResult]::new('--highlight-line', 'highlight-line', [CompletionResultType]::ParameterName, 'Highlight lines N through M.')

27− [CompletionResult]::new('--file-name', 'file-name', [CompletionResultType]::ParameterName, 'Specify the name to display for a file.')

28− [CompletionResult]::new('--diff-context', 'diff-context', [CompletionResultType]::ParameterName, 'diff-context')

29− [CompletionResult]::new('--tabs', 'tabs', [CompletionResultType]::ParameterName, 'Set the tab width to T spaces.')

30− [CompletionResult]::new('--wrap', 'wrap', [CompletionResultType]::ParameterName, 'Specify the text-wrapping mode (*auto*, never, character).')

31− [CompletionResult]::new('--terminal-width', 'terminal-width', [CompletionResultType]::ParameterName, 'Explicitly set the width of the terminal instead of determining it automatically. If prefixed with ''+'' or ''-'', the value will be treated as an offset to the actual terminal width. See also: ''--wrap''.')

32− [CompletionResult]::new('--color', 'color', [CompletionResultType]::ParameterName, 'When to use colors (*auto*, never, always).')

33− [CompletionResult]::new('--italic-text', 'italic-text', [CompletionResultType]::ParameterName, 'Use italics in output (always, *never*)')

34− [CompletionResult]::new('--decorations', 'decorations', [CompletionResultType]::ParameterName, 'When to show the decorations (*auto*, never, always).')

35− [CompletionResult]::new('--paging', 'paging', [CompletionResultType]::ParameterName, 'Specify when to use the pager, or use `-P` to disable (*auto*, never, always).')

36− [CompletionResult]::new('--pager', 'pager', [CompletionResultType]::ParameterName, 'Determine which pager to use.')

37− [CompletionResult]::new('-m', 'm', [CompletionResultType]::ParameterName, 'Use the specified syntax for files matching the glob pattern (''*.cpp:C++'').')

38− [CompletionResult]::new('--map-syntax', 'map-syntax', [CompletionResultType]::ParameterName, 'Use the specified syntax for files matching the glob pattern (''*.cpp:C++'').')

39− [CompletionResult]::new('--theme', 'theme', [CompletionResultType]::ParameterName, 'Set the color theme for syntax highlighting.')

40− [CompletionResult]::new('--style', 'style', [CompletionResultType]::ParameterName, 'Comma-separated list of style elements to display (*default*, auto, full, plain, changes, header, header-filename, header-filesize, grid, rule, numbers, snip).')

41− [CompletionResult]::new('-r', 'r', [CompletionResultType]::ParameterName, 'Only print the lines from N to M.')

42− [CompletionResult]::new('--line-range', 'line-range', [CompletionResultType]::ParameterName, 'Only print the lines from N to M.')

43− [CompletionResult]::new('-A', 'A', [CompletionResultType]::ParameterName, 'Show non-printable characters (space, tab, newline, ..).')

44− [CompletionResult]::new('--show-all', 'show-all', [CompletionResultType]::ParameterName, 'Show non-printable characters (space, tab, newline, ..).')

45− [CompletionResult]::new('-p', 'p', [CompletionResultType]::ParameterName, 'Show plain style (alias for ''--style=plain'').')

46− [CompletionResult]::new('--plain', 'plain', [CompletionResultType]::ParameterName, 'Show plain style (alias for ''--style=plain'').')

47− [CompletionResult]::new('-d', 'd', [CompletionResultType]::ParameterName, 'Only show lines that have been added/removed/modified.')

48− [CompletionResult]::new('--diff', 'diff', [CompletionResultType]::ParameterName, 'Only show lines that have been added/removed/modified.')

49− [CompletionResult]::new('-n', 'n', [CompletionResultType]::ParameterName, 'Show line numbers (alias for ''--style=numbers'').')

50− [CompletionResult]::new('--number', 'number', [CompletionResultType]::ParameterName, 'Show line numbers (alias for ''--style=numbers'').')

51− [CompletionResult]::new('-f', 'f', [CompletionResultType]::ParameterName, 'f')

52− [CompletionResult]::new('--force-colorization', 'force-colorization', [CompletionResultType]::ParameterName, 'force-colorization')

53− [CompletionResult]::new('-P', 'P', [CompletionResultType]::ParameterName, 'Alias for ''--paging=never''')

54− [CompletionResult]::new('--no-paging', 'no-paging', [CompletionResultType]::ParameterName, 'Alias for ''--paging=never''')

55− [CompletionResult]::new('--list-themes', 'list-themes', [CompletionResultType]::ParameterName, 'Display all supported highlighting themes.')

56− [CompletionResult]::new('-L', 'L', [CompletionResultType]::ParameterName, 'Display all supported languages.')

57− [CompletionResult]::new('--list-languages', 'list-languages', [CompletionResultType]::ParameterName, 'Display all supported languages.')

58− [CompletionResult]::new('-u', 'u', [CompletionResultType]::ParameterName, 'u')

59− [CompletionResult]::new('--unbuffered', 'unbuffered', [CompletionResultType]::ParameterName, 'unbuffered')

60− [CompletionResult]::new('--no-config', 'no-config', [CompletionResultType]::ParameterName, 'Do not use the configuration file')

61− [CompletionResult]::new('--no-custom-assets', 'no-custom-assets', [CompletionResultType]::ParameterName, 'Do not load custom assets')

62− [CompletionResult]::new('--config-file', 'config-file', [CompletionResultType]::ParameterName, 'Show path to the configuration file.')

63− [CompletionResult]::new('--generate-config-file', 'generate-config-file', [CompletionResultType]::ParameterName, 'Generates a default configuration file.')

64− [CompletionResult]::new('--config-dir', 'config-dir', [CompletionResultType]::ParameterName, 'Show bat''s configuration directory.')

65− [CompletionResult]::new('--cache-dir', 'cache-dir', [CompletionResultType]::ParameterName, 'Show bat''s cache directory.')

66− [CompletionResult]::new('--diagnostic', 'diagnostic', [CompletionResultType]::ParameterName, 'Show diagnostic information for bug reports.')

67− [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Print this help message.')

68− [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Print this help message.')

69− [CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Show version information.')

70− [CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Show version information.')

71− [CompletionResult]::new('cache', 'cache', [CompletionResultType]::ParameterValue, 'Modify the syntax-definition and theme cache')

72− break

73− }

74− '{{PROJECT_EXECUTABLE}};cache' {

75− [CompletionResult]::new('--source', 'source', [CompletionResultType]::ParameterName, 'Use a different directory to load syntaxes and themes from.')

76− [CompletionResult]::new('--target', 'target', [CompletionResultType]::ParameterName, 'Use a different directory to store the cached syntax and theme set.')

77− [CompletionResult]::new('-b', 'b', [CompletionResultType]::ParameterName, 'Initialize (or update) the syntax/theme cache.')

78− [CompletionResult]::new('--build', 'build', [CompletionResultType]::ParameterName, 'Initialize (or update) the syntax/theme cache.')

79− [CompletionResult]::new('-c', 'c', [CompletionResultType]::ParameterName, 'Remove the cached syntax definitions and themes.')

80− [CompletionResult]::new('--clear', 'clear', [CompletionResultType]::ParameterName, 'Remove the cached syntax definitions and themes.')

81− [CompletionResult]::new('--blank', 'blank', [CompletionResultType]::ParameterName, 'Create completely new syntax and theme sets (instead of appending to the default sets).')

82− [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')

83− [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')

84− [CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Prints version information')

85− [CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Prints version information')

86− break

87− }

88− })

89−

90− $completions.Where{ $_.CompletionText -like "$wordToComplete*" } |

91− Sort-Object -Property ListItemText

92−}

assets/completions/bat.bash.indeleted−101

@@ -1,101 +0,0 @@

1−# shellcheck disable=SC2207

2−

3−# Requires https://github.com/scop/bash-completion

4−

5−# Macs have bash3 for which the bash-completion package doesn't include

6−# _init_completion. This is a minimal version of that function.

7−__bat_init_completion()

8−{

9− COMPREPLY=()

10− _get_comp_words_by_ref "$@" cur prev words cword

11−}

12−

13−_bat() {

14− local cur prev words cword split=false

15− if declare -F _init_completion >/dev/null 2>&1; then

16− _init_completion -s || return 0

17− else

18− __bat_init_completion -n "=" || return 0

19− _split_longopt && split=true

20− fi

21−

22− if [[ ${words[1]-} == cache ]]; then

23− case $prev in

24− --source | --target)

25− _filedir -d

26− return 0

27− ;;

28− esac

29− COMPREPLY=($(compgen -W "

30− --build --clear --source --target --blank --help

31− " -- "$cur"))

32− return 0

33− fi

34−

35− case $prev in

36− -l | --language)

37− local IFS=$'\n'

38− COMPREPLY=($(compgen -W "$(

39− "$1" --list-languages | while IFS=: read -r lang _; do

40− printf "%s\n" "$lang"

41− done

42− )" -- "$cur"))

43− compopt -o filenames # for escaping

44− return 0

45− ;;

47− -m | --map-syntax | --style | --line-range | -h | --help | -V | \

48− --version | --diagnostic | --config-file | --config-dir | \

49− --cache-dir | --generate-config-file)

50− # argument required but no completion available, or option

51− # causes an exit

52− return 0

53− ;;

54− --file-name)

55− _filedir

56− return 0

57− ;;

58− --wrap)

59− COMPREPLY=($(compgen -W "auto never character" -- "$cur"))

60− return 0

61− ;;

62− --color | --decorations | --paging)

63− COMPREPLY=($(compgen -W "auto never always" -- "$cur"))

64− return 0

65− ;;

66− --italic-text)

67− COMPREPLY=($(compgen -W "always never" -- "$cur"))

68− return 0

69− ;;

70− --pager)

71− COMPREPLY=($(compgen -c -- "$cur"))

72− return 0

73− ;;

74− --theme)

75− local IFS=$'\n'

76− COMPREPLY=($(compgen -W "$("$1" --list-themes)" -- "$cur"))

77− compopt -o filenames # for escaping

78− return 0

79− ;;

80− esac

81−

82− $split && return 0

83−

84− if [[ $cur == -* ]]; then

85− COMPREPLY=($(compgen -W "

86− --show-all --plain --language --highlight-line

87− --file-name --diff --diff-context --tabs --wrap

88− --terminal-width --number --color --italic-text

89− --decorations --paging --pager --map-syntax --theme

90− --list-themes --style --line-range --list-languages

91− --help --version --force-colorization --unbuffered

92− --diagnostic --config-file --config-dir --cache-dir

93− --generate-config-file

94− " -- "$cur"))

95− return 0

96− fi

97−

98− _filedir

99− ((cword == 1)) && COMPREPLY+=($(compgen -W cache -- "$cur"))

100−

101−} && complete -F _bat {{PROJECT_EXECUTABLE}}

assets/completions/bat.fish.in+2−4

@@ -34,7 +34,7 @@ complete -c {{PROJECT_EXECUTABLE}} -s H -l highlight-line -x -d "<N> Highlight t

34

35complete -c {{PROJECT_EXECUTABLE}} -l italic-text -xka "always never" -d "Specify when to use ANSI sequences for italic text (default: never)" -n "not __fish_seen_subcommand_from cache"

36

37−complete -c {{PROJECT_EXECUTABLE}} -s l -l language -d "Set the language for syntax highlighting" -n "not __fish_seen_subcommand_from cache" -xa "(__{{PROJECT_EXECUTABLE}}_autocomplete_languages)"

37+complete -c {{PROJECT_EXECUTABLE}} -s l -l language -d "Set the language for syntax highlighting" -n "not __fish_seen_subcommand_from cache" -xa "(__{{PROJECT_EXECUTABLE}}_autocomplete_languages)"

38

39complete -c {{PROJECT_EXECUTABLE}} -s r -l line-range -x -d "<N:M> Only print the specified range of lines for each file" -n "not __fish_seen_subcommand_from cache"

40

@@ -52,11 +52,9 @@ complete -c {{PROJECT_EXECUTABLE}} -l paging -xka "auto never always" -d "Specif

52

53complete -c {{PROJECT_EXECUTABLE}} -s p -l plain -d "Only show plain style, no decorations. Alias for '--style=plain'" -n "not __fish_seen_subcommand_from cache"

54

55−complete -c {{PROJECT_EXECUTABLE}} -s P -d "Disable paging. Alias for '--paging=never'" -n "not __fish_seen_subcommand_from cache"

56−

57complete -c {{PROJECT_EXECUTABLE}} -s A -l show-all -d "Show non-printable characters like space/tab/newline" -n "not __fish_seen_subcommand_from cache"

55complete -c {{PROJECT_EXECUTABLE}} -s A -l show-all -d "Show non-printable characters like space/tab/newline" -n "not __fish_seen_subcommand_from cache"

58

56

59−complete -c {{PROJECT_EXECUTABLE}} -l style -xka "default auto full plain changes header header-filename header-filesize grid rule numbers snip" -d "Comma-separated list of style elements or presets to display with file contents" -n "not __fish_seen_subcommand_from cache"

57+complete -c {{PROJECT_EXECUTABLE}} -l style -xka "auto full plain changes header grid numbers" -d "Comma-separated list of style elements or presets to display with file contents" -n "not __fish_seen_subcommand_from cache"

60

58

61complete -c {{PROJECT_EXECUTABLE}} -l tabs -x -d "<T> Set the tab width to T spaces (width of 0 passes tabs through directly)" -n "not __fish_seen_subcommand_from cache"

59complete -c {{PROJECT_EXECUTABLE}} -l tabs -x -d "<T> Set the tab width to T spaces (width of 0 passes tabs through directly)" -n "not __fish_seen_subcommand_from cache"

62

60

assets/completions/bat.zsh.indeleted−99

@@ -1,99 +0,0 @@

1−#compdef {{PROJECT_EXECUTABLE}}

2−

3−local context state state_descr line

4−typeset -A opt_args

5−

6−(( $+functions[_{{PROJECT_EXECUTABLE}}_cache_subcommand] )) ||

7−_{{PROJECT_EXECUTABLE}}_cache_subcommand() {

8− local -a args

9− args=(

10− '(-b --build -c --clear)'{-b,--build}'[Initialize or update the syntax/theme cache]'

11− '(-b --build -c --clear)'{-c,--clear}'[Remove the cached syntax definitions and themes]'

12− '(--source)'--source='[Use a different directory to load syntaxes and themes from]:directory:_files -/'

13− '(--target)'--target='[Use a different directory to store the cached syntax and theme set]:directory:_files -/'

14− '(--blank)'--blank'[Create completely new syntax and theme sets]'

15− '(: -)'{-h,--help}'[Prints help information]'

16− '*: :'

17− )

18−

19− _arguments -S -s $args

20−}

21−

22−(( $+functions[_{{PROJECT_EXECUTABLE}}_main] )) ||

23−_{{PROJECT_EXECUTABLE}}_main() {

24− local -a args

25− args=(

26− '(-A --show-all)'{-A,--show-all}'[Show non-printable characters (space, tab, newline, ..)]'

27− '*'{-p,--plain}'[Show plain style (alias for `--style=plain`), repeat twice to disable disable automatic paging (alias for `--paging=never`)]'

28− '(-l --language)'{-l+,--language=}'[Set the language for syntax highlighting]:<language>:->language'

29− '(-H --highlight-line)'{-H,--highlight-line}'[Highlight lines N through M]:<N\:M>...'

30− '(--file-name)'--file-name'[Specify the name to display for a file]:<name>...:_files'

31− '(-d --diff)'--diff'[Only show lines that have been added/removed/modified]'

32− '(--diff-context)'--diff-context'[Include N lines of context around added/removed/modified lines when using `--diff`]:<N> (lines):()'

33− '(--tabs)'--tabs'[Set the tab width to T spaces]:<T> (tab width):()'

34− '(--wrap)'--wrap='[Specify the text-wrapping mode]:<when>:(auto never character)'

35− '(--terminal-width)'--terminal-width'[Explicitly set the width of the terminal instead of determining it automatically]:<width>'

36− '(-n --number)'{-n,--number}'[Show line numbers]'

37− '(--color)'--color='[When to use colors]:<when>:(auto never always)'

38− '(--italic-text)'--italic-text='[Use italics in output]:<when>:(always never)'

39− '(--decorations)'--decorations='[When to show the decorations]:<when>:(auto never always)'

40− '(--paging)'--paging='[Specify when to use the pager]:<when>:(auto never always)'

41− '(-m --map-syntax)'{-m+,--map-syntax=}'[Use the specified syntax for files matching the glob pattern]:<glob\:syntax>...'

42− '(--theme)'--theme='[Set the color theme for syntax highlighting]:<theme>:->theme'

43− '(: --list-themes --list-languages -L)'--list-themes'[Display all supported highlighting themes]'

44− '(--style)'--style='[Comma-separated list of style elements to display]:<components>:->style'

45− '(-r --line-range)'{-r+,--line-range=}'[Only print the lines from N to M]:<N\:M>...'

46− '(: --list-themes --list-languages -L)'{-L,--list-languages}'[Display all supported languages]'

47− '(: --no-config)'--no-config'[Do not use the configuration file]'

48− '(: --no-custom-assets)'--no-custom-assets'[Do not load custom assets]'

49− '(: --config-dir)'--config-dir'[Show bat'"'"'s configuration directory]'

50− '(: --config-file)'--config-file'[Show path to the configuration file]'

51− '(: --generate-config-file)'--generate-config-file'[Generates a default configuration file]'

52− '(: --cache-dir)'--cache-dir'[Show bat'"'"'s cache directory]'

53− '(: -)'{-h,--help}'[Print this help message]'

54− '(: -)'{-V,--version}'[Show version information]'

55− '*: :_files'

56− )

57−

58− _arguments -S -s $args

59−

60− case "$state" in

61− language)

62− local IFS=$'\n'

63− local -a languages

64− languages=( $({{PROJECT_EXECUTABLE}} --list-languages | awk -F':|,' '{ for (i = 1; i <= NF; ++i) printf("%s:%s\n", $i, $1) }') )

65−

66− _describe 'language' languages

67− ;;

68−

69− theme)

70− local IFS=$'\n'

71− local -a themes

72− themes=( $({{PROJECT_EXECUTABLE}} --list-themes | sort) )

73−

74− _values 'theme' $themes

75− ;;

76−

77− style)

78− _values -s , 'style' default auto full plain changes header header-filename header-filesize grid rule numbers snip

79− ;;

80− esac

81−}

82−

83−# first positional argument

84−if (( ${#words} == 2 )); then

85− local -a subcommands

86− subcommands=('cache:Modify the syntax-definition and theme cache')

87− _describe subcommand subcommands

88− _{{PROJECT_EXECUTABLE}}_main

89−else

90− case $words[2] in

91− cache)

92− _{{PROJECT_EXECUTABLE}}_cache_subcommand

93− ;;

94−

95− *)

96− _{{PROJECT_EXECUTABLE}}_main

97− ;;

98− esac

99−fi

assets/create.sh+9−25

@@ -1,11 +1,11 @@

1−#!/usr/bin/env bash

1+#!/bin/bash

2set -euo pipefail

3

4ASSET_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

5REPO_DIR="$ASSET_DIR/.."

6

7# Ensure submodules are initialized.

8−update_submodules() {

8+function update_submodules() {

9 local submodule

10 local submodule_prompt=unspecified

11 local submodule_path

@@ -42,28 +42,12 @@ fi

42# Always remove the local cache to avoid any confusion

43bat cache --clear

44

45−# TODO:

45+# TODO: Remove this (and the reverse part below) when

46−# - Remove the JavaDoc patch once https://github.com/trishume/syntect/issues/222 has been fixed

46+# https://github.com/trishume/syntect/issues/222 has been fixed

47−# - Remove the C# patch once https://github.com/sublimehq/Packages/pull/2331 has been merged

47+JAVADOC_FILE="${ASSET_DIR}/syntaxes/Packages/Java/JavaDoc.sublime-syntax"

48+JAVADOC_PATCH="${ASSET_DIR}/JavaDoc.sublime-syntax.patch"

49+patch "$JAVADOC_FILE" "$JAVADOC_PATCH"

48

50

49−# Apply patches

51+bat cache --build --blank --source="$ASSET_DIR" --target="$ASSET_DIR"

50−(

51− cd "$ASSET_DIR"

52− for patch in patches/*.patch; do

53− patch --strip=0 < "$patch"

54− done

55−)

56

52

57−reverse_patches() {

53+patch -R "$JAVADOC_FILE" "$JAVADOC_PATCH"

58− (

59− cd "$ASSET_DIR"

60− for patch in patches/*.patch; do

61− patch --strip=0 --reverse <"$patch"

62− done

63− )

64−}

65−

66−# Make sure to always reverse patches, even if the `bat cache` command fails or aborts

67−trap reverse_patches EXIT

68−

69−bat cache --build --blank --acknowledgements --source="$ASSET_DIR" --target="$ASSET_DIR"

assets/manual/bat.1.in+67−146

@@ -1,23 +1,18 @@

1−.TH {{PROJECT_EXECUTABLE_UPPERCASE}} "1"

1+.TH {{PROJECT_EXECUTABLE | upcase}} "1"

2.SH NAME

3−{{PROJECT_EXECUTABLE}} \- a cat(1) clone with syntax highlighting and Git integration.

3+{{PROJECT_EXECUTABLE}} \- manual page for {{PROJECT_NAME}}

4−.SH "USAGE"

5−.IP "{{PROJECT_EXECUTABLE}} [OPTIONS] [FILE]..."

6−.IP "{{PROJECT_EXECUTABLE}} cache [CACHE-OPTIONS] [--build|--clear]

7.SH DESCRIPTION

4.SH DESCRIPTION

8−{{PROJECT_EXECUTABLE}} prints the syntax-highlighted content of a collection of FILEs to the

5+{{PROJECT_EXECUTABLE}} - a cat(1) clone with syntax highlighting and Git integration.

9−terminal. If no FILE is specified, or when FILE is '-', it reads from standard input.

6+.SH "USAGE"

10−

7+.IP

11−{{PROJECT_EXECUTABLE}} supports a large number of programming and markup languages.

8+{{PROJECT_EXECUTABLE}} [OPTIONS] [FILE]...

12−It also communicates with git(1) to show modifications with respect to the git index.

9+.IP

13−{{PROJECT_EXECUTABLE}} automatically pipes its output through a pager (by default: less).

10+{{PROJECT_EXECUTABLE}} <SUBCOMMAND>

14−

15−Whenever the output of {{PROJECT_EXECUTABLE}} goes to a non-interactive terminal, i.e. when the

16−output is piped into another process or into a file, {{PROJECT_EXECUTABLE}} will act as a drop-in

17−replacement for cat(1) and fall back to printing the plain file contents.

18−

19.SH "OPTIONS"

11.SH "OPTIONS"

12+.HP

13+General remarks

14+.IP

20−General remarks: Command-line options like '-l'/'--language' that take values can be specified as

15+Command-line options like '-l'/'--language' that take values can be specified as

21either '--language value', '--language=value', '-l value' or '-lvalue'.

16either '--language value', '--language=value', '-l value' or '-lvalue'.

22.HP

17.HP

23\fB\-A\fR, \fB\-\-show\-all\fR

18\fB\-A\fR, \fB\-\-show\-all\fR

@@ -38,102 +33,77 @@ specified as a name (like 'C++' or 'LaTeX') or possible file extension

38(like 'cpp', 'hpp' or 'md'). Use '\-\-list\-languages' to show all supported

33(like 'cpp', 'hpp' or 'md'). Use '\-\-list\-languages' to show all supported

39language names and file extensions.

34language names and file extensions.

40.HP

35.HP

41−\fB\-H\fR, \fB\-\-highlight\-line\fR <N:M>...

36+\fB\-H\fR, \fB\-\-highlight\-line\fR <N>...

42−.IP

43−Highlight the specified line ranges with a different background color. For example:

44−.RS

45−.IP "\-\-highlight\-line 40"

46−highlights line 40

47−.IP "\-\-highlight\-line 30:40"

48−highlights lines 30 to 40

49−.IP "\-\-highlight\-line :40"

50−highlights lines 1 to 40

51−.IP "\-\-highlight\-line 40:"

52−highlights lines 40 to the end of the file

53−.IP "\-\-highlight\-line 30:+10"

54−highlights lines 30 to 40

55−.RE

56−.HP

57−\fB\-\-file\-name\fR <name>...

58−.IP

59−Specify the name to display for a file. Useful when piping data to {{PROJECT_EXECUTABLE}} from STDIN when {{PROJECT_EXECUTABLE}} does not otherwise know the filename. Note that the provided file name is also used for syntax detection.

60−.HP

61−\fB\-d\fR, \fB\-\-diff\fR

62−.IP

63−Only show lines that have been added/removed/modified with respect to the Git index. Use '\-\-diff\-context=N' to control how much context you want to see.

64−.HP

65−\fB\-\-diff\-context\fR <N>...

66.IP

37.IP

67−Include N lines of context around added/removed/modified lines when using '\-\-diff'.

38+Highlight the N\-th line with a different background color

68.HP

39.HP

69\fB\-\-tabs\fR <T>

40\fB\-\-tabs\fR <T>

70.IP

41.IP

71−Set the tab width to T spaces. Use a width of 0 to pass tabs through directly

42+Set the tab width to T spaces. Use a width of 0 to pass tabs through

43+directly

72.HP

44.HP

73\fB\-\-wrap\fR <mode>

45\fB\-\-wrap\fR <mode>

74.IP

46.IP

75−Specify the text\-wrapping mode (*auto*, never, character). The '\-\-terminal\-width' option

47+Specify the text\-wrapping mode (*auto*, never, character). The

76−can be used in addition to control the output width.

48+\&'\-\-terminal\-width' option can be used in addition to control the output

49+width.

77.HP

50.HP

78\fB\-\-terminal\-width\fR <width>

51\fB\-\-terminal\-width\fR <width>

79.IP

52.IP

80−Explicitly set the width of the terminal instead of determining it automatically. If

53+Explicitly set the width of the terminal instead of determining it

81−prefixed with '+' or '\-', the value will be treated as an offset to the actual terminal

54+automatically. If prefixed with '+' or '\-', the value will be treated as

82−width. See also: '\-\-wrap'.

55+an offset to the actual terminal width. See also: '\-\-wrap'.

83.HP

56.HP

84\fB\-n\fR, \fB\-\-number\fR

57\fB\-n\fR, \fB\-\-number\fR

85.IP

58.IP

86−Only show line numbers, no other decorations. This is an alias for '\-\-style=numbers'

59+Only show line numbers, no other decorations. This is an alias for

60+\&'\-\-style=numbers'

87.HP

61.HP

88\fB\-\-color\fR <when>

62\fB\-\-color\fR <when>

89.IP

63.IP

90−Specify when to use colored output. The automatic mode only enables colors if an

64+Specify when to use colored output. The automatic mode only enables colors

91−interactive terminal is detected. Possible values: *auto*, never, always.

65+if an interactive terminal is detected. Possible values: *auto*, never,

66+always.

92.HP

67.HP

93\fB\-\-italic\-text\fR <when>

68\fB\-\-italic\-text\fR <when>

94.IP

69.IP

95−Specify when to use ANSI sequences for italic text in the output. Possible values:

70+Specify when to use ANSI sequences for italic text in the output. Possible

96−always, *never*.

71+values: always, *never*.

97.HP

72.HP

98\fB\-\-decorations\fR <when>

73\fB\-\-decorations\fR <when>

99.IP

74.IP

100−Specify when to use the decorations that have been specified via '\-\-style'. The

75+Specify when to use the decorations that have been specified via

101−automatic mode only enables decorations if an interactive terminal is detected. Possible

76+\&'\-\-style'. The automatic mode only enables decorations if an interactive

102−values: *auto*, never, always.

77+terminal is detected. Possible values: *auto*, never, always.

103−.HP

104−\fB\-f\fR, \fB\-\-force\-colorization\fR

105−.IP

106−Alias for '--decorations=always --color=always'. This is useful \

107−if the output of {{PROJECT_EXECUTABLE}} is piped to another program, but you want \

108−to keep the colorization/decorations.

109.HP

78.HP

110\fB\-\-paging\fR <when>

79\fB\-\-paging\fR <when>

111.IP

80.IP

112−Specify when to use the pager. To disable the pager, use \&'\-\-paging=never' or its alias,

81+Specify when to use the pager. To control which pager is used, set the

113−\fB-P\fR. To disable the pager permanently, set BAT_PAGER to an empty string. To control

82+PAGER or BAT_PAGER environment variables (the latter takes precedence) or

83+use the '\-\-pager' option. To disable the pager permanently, set BAT_PAGER

84+to an empty string or set '\-\-paging=never' in the configuration file.

114−which pager is used, see the '\-\-pager' option. Possible values: *auto*, never, always.

85+Possible values: *auto*, never, always.

115.HP

86.HP

116\fB\-\-pager\fR <command>

87\fB\-\-pager\fR <command>

117.IP

88.IP

118−Determine which pager is used. This option will override the PAGER and BAT_PAGER

89+Determine which pager is used. This option will overwrite the PAGER and

119−environment variables. The default pager is 'less'. To control when the pager is used, see

90+BAT_PAGER environment variables. The default pager is 'less'. To disable

120−the '\-\-paging' option. Example: '\-\-pager "less \fB\-RF\fR"'.

91+the pager completely, use the '\-\-paging' option. Example: '\-\-pager "less

121−

92+\fB\-RF\fR"'.

122−Note: By default, if the pager is set to 'less' (and no command-line options are specified), 'bat' will pass the following command line options to the pager: '-R'/'--RAW-CONTROL-CHARS', '-F'/'--quit-if-one-screen' and '-X'/'--no-init'. The last option ('-X') is only used for 'less' versions older than 530. The '-R' option is needed to interpret ANSI colors correctly. The second option ('-F') instructs less to exit immediately if the output size is smaller than the vertical size of the terminal. This is convenient for small files because you do not have to press 'q' to quit the pager. The third option ('-X') is needed to fix a bug with the '--quit-if-one-screen' feature in old versions of 'less'. Unfortunately, it also breaks mouse-wheel support in 'less'. If you want to enable mouse-wheel scrolling on older versions of 'less', you can pass just '-R' (as in the example above, this will disable the quit-if-one-screen feature). For less 530 or newer, it should work out of the box.

123.HP

93.HP

124−\fB\-m\fR, \fB\-\-map\-syntax\fR <glob-pattern:syntax-name>...

94+\fB\-m\fR, \fB\-\-map\-syntax\fR <from:to>...

125.IP

95.IP

126−Map a glob pattern to an existing syntax name. The glob pattern is matched on the full

96+Map a file extension or file name to an existing syntax. For example, to

127−path and the filename. For example, to highlight *.build files with the Python syntax,

97+highlight *.conf files with the INI syntax, use '\-m conf:ini'. To

128−use -m '*.build:Python'. To highlight files named '.myignore' with the Git Ignore

98+highlight files named '.myignore' with the Git Ignore syntax, use '\-m

129−syntax, use -m '.myignore:Git Ignore'.

99+\&.myignore:gitignore'.

130−Note that the right-hand side is the *name* of the syntax, not a file extension.

131.HP

100.HP

132\fB\-\-theme\fR <theme>

101\fB\-\-theme\fR <theme>

133.IP

102.IP

134−Set the theme for syntax highlighting. Use '\-\-list\-themes' to see all available themes.

103+Set the theme for syntax highlighting. Use '\-\-list\-themes' to see all

135−To set a default theme, add the '\-\-theme="..."' option to the configuration file or

104+available themes. To set a default theme, add the '\-\-theme="..."' option

136−export the BAT_THEME environment variable (e.g.: export BAT_THEME="...").

105+to the configuration file or export the BAT_THEME environment variable

106+(e.g.: export BAT_THEME="...").

137.HP

107.HP

138\fB\-\-list\-themes\fR

108\fB\-\-list\-themes\fR

139.IP

109.IP

@@ -141,13 +111,13 @@ Display a list of supported themes for syntax highlighting.

141.HP

111.HP

142\fB\-\-style\fR <style\-components>

112\fB\-\-style\fR <style\-components>

143.IP

113.IP

144−Configure which elements (line numbers, file headers, grid borders, Git modifications,

114+Configure which elements (line numbers, file headers, grid borders, Git

145−\&..) to display in addition to the file contents. The argument is a comma\-separated list

115+modifications, ..) to display in addition to the file contents. The

116+argument is a comma\-separated list of components to display (e.g.

146−of components to display (e.g. 'numbers,changes,grid') or a pre\-defined style ('full').

117+\&'numbers,changes,grid') or a pre\-defined style ('full'). To set a default

147−To set a default style, add the '\-\-style=".."' option to the configuration file or

118+style, add the '\-\-style=".."' option to the configuration file or export

148−export the BAT_STYLE environment variable (e.g.: export BAT_STYLE=".."). Possible

119+the BAT_STYLE environment variable (e.g.: export BAT_STYLE=".."). Possible

149−values: *default*, full, auto, plain, changes, header, header-filename, header-filesize, grid,

120+values: *auto*, full, plain, changes, header, grid, numbers, snip.

150−rule, numbers, snip.

151.HP

121.HP

152\fB\-r\fR, \fB\-\-line\-range\fR <N:M>...

122\fB\-r\fR, \fB\-\-line\-range\fR <N:M>...

153.IP

123.IP

@@ -159,8 +129,6 @@ prints lines 30 to 40

159prints lines 1 to 40

129prints lines 1 to 40

160.IP "\-\-line\-range 40:"

130.IP "\-\-line\-range 40:"

161prints lines 40 to the end of the file

131prints lines 40 to the end of the file

162−.IP "\-\-line\-range 30:+10"

163−prints lines 30 to 40

164.RE

132.RE

165.HP

133.HP

166\fB\-L\fR, \fB\-\-list\-languages\fR

134\fB\-L\fR, \fB\-\-list\-languages\fR

@@ -169,8 +137,8 @@ Display a list of supported languages for syntax highlighting.

169.HP

137.HP

170\fB\-u\fR, \fB\-\-unbuffered\fR

138\fB\-u\fR, \fB\-\-unbuffered\fR

171.IP

139.IP

172−This option exists for POSIX\-compliance reasons ('u' is for 'unbuffered'). The output is

140+This option exists for POSIX\-compliance reasons ('u' is for 'unbuffered').

173−always unbuffered \- this option is simply ignored.

141+The output is always unbuffered \- this option is simply ignored.

174.HP

142.HP

175\fB\-h\fR, \fB\-\-help\fR

143\fB\-h\fR, \fB\-\-help\fR

176.IP

144.IP

@@ -179,60 +147,13 @@ Print this help message.

179\fB\-V\fR, \fB\-\-version\fR

147\fB\-V\fR, \fB\-\-version\fR

180.IP

148.IP

181Show version information.

149Show version information.

182−.SH "POSITIONAL ARGUMENTS"

150+.SH "ARGS"

183−.HP

151+.IP

184−\fB<FILE>...\fR

152+<FILE>...

185.IP

153.IP

186−Files to print and concatenate. Use a dash ('\-') or no argument at all to read from

154+File(s) to print / concatenate. Use a dash ('\-') or no argument at all to read

187−standard input.

155+from standard input.

188.SH "SUBCOMMANDS"

156.SH "SUBCOMMANDS"

189−.HP

157+.IP

158+cache

190−\fBcache\fR - Modify the syntax\-definition and theme cache.

159+Modify the syntax\-definition and theme cache

191−.SH "FILES"

192−{{PROJECT_EXECUTABLE}} can also be customized with a configuration file. The location of the file

193−is dependent on your operating system. To get the default path for your system, call:

194−

195−\fB{{PROJECT_EXECUTABLE}} --config-file\fR

196−

197−Alternatively, you can use the BAT_CONFIG_PATH environment variable to point {{PROJECT_EXECUTABLE}} to a non-default

198−location of the configuration file.

199−

200−To generate a default configuration file, call:

201−

202−\fB{{PROJECT_EXECUTABLE}} --generate-config-file\fR

203−.SH "ADDING CUSTOM LANGUAGES"

204−{{PROJECT_EXECUTABLE}} supports Sublime Text \fB.sublime-syntax\fR language files, and can be

205−customized to add additional languages to your local installation. To do this, add the \fB.sublime-syntax\fR language

206−files to `\fB$({{PROJECT_EXECUTABLE}} --config-dir)/syntaxes\fR` and run `\fB{{PROJECT_EXECUTABLE}} cache --build\fR`.

207−

208−\fBExample:\fR

209−

210−.RS 0.5i

211−mkdir -p "$({{PROJECT_EXECUTABLE}} --config-dir)/syntaxes"

212−.br

213−cd "$({{PROJECT_EXECUTABLE}} --config-dir)/syntaxes"

214−

215−# Put new '.sublime-syntax' language definition files

216−.br

217−# in this folder (or its subdirectories), for example:

218−.br

219−git clone https://github.com/tellnobody1/sublime-purescript-syntax

220−

221−# And then build the cache.

222−.br

223−{{PROJECT_EXECUTABLE}} cache --build

224−.RE

225−

226−Once the cache is built, the new language will be visible in `\fB{{PROJECT_EXECUTABLE}} --list-languages\fR`.

227−.br

228−If you ever want to remove the custom languages, you can clear the cache with `\fB{{PROJECT_EXECUTABLE}} cache --clear\fR`.

229−

230−.SH "ADDING CUSTOM THEMES"

231−Similarly to custom languages, {{PROJECT_EXECUTABLE}} supports Sublime Text \fB.tmTheme\fR themes.

232−These can be installed to `\fB$({{PROJECT_EXECUTABLE}} --config-dir)/themes\fR`, and are added to the cache with

233−`\fB{{PROJECT_EXECUTABLE}} cache --build`.

234−.SH "MORE INFORMATION"

235−

236−For more information and up-to-date documentation, visit the {{PROJECT_EXECUTABLE}} repo:

237−.br

238−\fBhttps://github.com/sharkdp/bat\fR

assets/patches/C#.sublime-syntax.patchdeleted−13

@@ -1,13 +0,0 @@

1−diff --git syntaxes/01_Packages/C#/C#.sublime-syntax syntaxes/01_Packages/C#/C#.sublime-syntax

2−index ed494f8b..01b710e8 100644

3−--- syntaxes/01_Packages/C#/C#.sublime-syntax

4−+++ syntaxes/01_Packages/C#/C#.sublime-syntax

5−@@ -1312,7 +1312,7 @@ contexts:

6− 2: punctuation.separator.cs

7− 3: punctuation.section.brackets.end.cs

8− 4: keyword.operator.pointer.cs

9−- - match: $(?=(?:[^,)(]*|\([^$]*\))*,)

10−+ - match: $(?=(?:[^,)(]|\([^$]*\))*,)

11− scope: punctuation.section.group.begin.cs

12− push:

13− - meta_scope: meta.group.tuple.cs

assets/patches/Groff.sublime-syntax.patchdeleted−16

@@ -1,16 +0,0 @@

1−diff --git syntaxes/02_Extra/Groff/Man Page/Man Page.sublime-syntax syntaxes/02_Extra/Groff/Man Page/Man Page.sublime-syntax

2−index 57834af..6648664 100644

3−--- syntaxes/02_Extra/Groff/Man Page/Man Page.sublime-syntax

4−+++ syntaxes/02_Extra/Groff/Man Page/Man Page.sublime-syntax

5−@@ -4,9 +4,9 @@

6− # - man-pages(7)

7− # - groff(7)

8− ---

9−-name: Man Page (groff/troff)

10−+name: Groff/troff

11− scope: text.groff

12−-file_extensions: [man, groff, troff, '1', '2', '3', '4', '5', '6', '7']

13−+file_extensions: [groff, troff, '1', '2', '3', '4', '5', '6', '7', '8', '9']

14−

15− contexts:

16− main:

assets/patches/Makefile.sublime-syntax.patchdeleted−81

@@ -1,81 +0,0 @@

1−diff --git syntaxes/01_Packages/Makefile/Makefile.sublime-syntax syntaxes/01_Packages/Makefile/Makefile.sublime-syntax

2−index 3cc3a97e..0c7a3f24 100644

3−--- syntaxes/01_Packages/Makefile/Makefile.sublime-syntax

4−+++ syntaxes/01_Packages/Makefile/Makefile.sublime-syntax

5−@@ -44,64 +44,50 @@ variables:

6− # variable substitutions anywhere. We try to remedy this by hacking in a

7− # regex that matches up to four levels of nested parentheses, and ignores

8− # whatever's inside the parentheses.

9−- nps: '[^()]*'

10−- open: '(?:\('

11−- close: '\))?' # ignore this invalid.illegal

12−+ nps_unnested: '[^()]*'

13−+ nps: '[^()]*(?=[()])'

14−+ open: '(?:{{nps}}\('

15−+ close: '\){{nps_unnested}})?' # ignore this invalid.illegal

16− just_eat: | # WARNING: INSANITY FOLLOWS!

17−- (?x) # ignore whitespace in this regex

18−- {{nps}} # level 0

19−+ (?x)(?: # ignore whitespace in this regex

20− {{open}} # start level 1 __

21−- {{nps}} # level 1 _______ /*_>-<

22− {{open}} # start level 2 ___/ _____ \__/ /

23−- {{nps}} # level 2 <____/ \____/

24− {{open}} # start level 3 is like snek... (by Valerie Haecky)

25−- {{nps}} # level 3

26− {{open}} # start level 4

27− {{nps}} # level 4

28− {{close}} # end level 4

29−- {{nps}} # level 3

30− {{close}} # end level 3

31−- {{nps}} # level 2

32− {{open}} # start level 3

33−- {{nps}} # level 3

34− {{open}} # start level 4

35− {{nps}} # level 4

36− {{close}} # end level 4

37−- {{nps}} # level 3

38− {{close}} # end level 3

39−- {{nps}} # level 2

40−+ {{nps}}

41− {{close}} # end level 2

42−- {{nps}} # level 1

43− {{open}} # start level 2

44−- {{nps}} # level 2

45− {{open}} # start level 3

46−- {{nps}} # level 3

47− {{open}} # start level 4

48− {{nps}} # level 4

49− {{close}} # end level 4

50−- {{nps}} # level 3

51−+ {{nps}}

52− {{close}} # end level 3

53−- {{nps}} # level 2

54− {{open}} # start level 3

55−- {{nps}} # level 3

56− {{open}} # start level 4

57− {{nps}} # level 4

58− {{close}} # end level 4

59−- {{nps}} # level 3

60−+ {{nps}}

61− {{close}} # end level 3

62−- {{nps}} # level 2

63− {{open}} # start level 3

64−- {{nps}} # level 3

65− {{open}} # start level 4

66− {{nps}} # level 4

67− {{close}} # end level 4

68−- {{nps}} # level 3

69−+ {{nps}}

70− {{close}} # end level 3

71−- {{nps}} # level 2

72−+ {{nps}}

73− {{close}} # end level 2

74−- {{nps}} # level 1

75−+ {{nps}}

76− {{close}} # end level 1

77−- {{nps}} # level 0

78−+ |{{nps_unnested}})

79− rule_lookahead: '{{just_eat}}{{ruleassign}}{{just_eat}}'

80−

81− var_lookahead_base: '{{just_eat}}({{varassign}}|{{shellassign}}){{just_eat}}'

assets/patches/Markdown.sublime-syntax.patchdeleted−177

@@ -1,177 +0,0 @@

1−diff --git syntaxes/01_Packages/Markdown/Markdown.sublime-syntax syntaxes/01_Packages/Markdown/Markdown.sublime-syntax

2−index 19dc685d..44440c7f 100644

3−--- syntaxes/01_Packages/Markdown/Markdown.sublime-syntax

4−+++ syntaxes/01_Packages/Markdown/Markdown.sublime-syntax

5−@@ -24,7 +24,6 @@ variables:

6− )

7− [ \t]*$ # followed by any number of tabs or spaces, followed by the end of the line

8− )

9−- setext_escape: ^(?=\s{0,3}(?:---+|===+)\s*$)

10− block_quote: (?:[ ]{,3}>(?:.|$)) # between 0 and 3 spaces, followed by a greater than sign, followed by any character or the end of the line

11− atx_heading: (?:[#]{1,6}\s*) # between 1 and 6 hashes, followed by any amount of whitespace

12− indented_code_block: (?:[ ]{4}|\t) # 4 spaces or a tab

13−@@ -277,69 +276,40 @@ contexts:

14− 8: markup.underline.link.markdown

15− push: [link-ref-def, after-link-title, link-title]

16− - match: '^(?=\S)(?![=-]{3,}\s*$)'

17−- branch_point: heading2-branch

18−- branch:

19−- - not-heading2

20−- - heading2

21−-

22−- not-paragraph:

23−- - match: |-

24−- (?x) # pop out of this context when one of the following conditions are met:

25−- ^(?:

26−- \s*$ # the line is blank (or only contains whitespace)

27−- | (?=

28−- {{block_quote}} # a block quote begins the line

29−- | [ ]{,3}[*+-][ ] # an unordered list item begins the line

30−- | [ ]{,3}1[.][ ] # an ordered list item with number "1" begins the line

31−- | \# # an ATX heading begins the line

32−- | [ ]{,3}<( # all types of HTML blocks except type 7 may interrupt a paragraph

33−- {{html_tag_block_end_at_close_tag}} # 1

34−- | !-- # 2

35−- | \? # 3

36−- | ![A-Z] # 4

37−- | !\[CDATA\[ # 5

38−- | {{html_tag_block_end_at_blank_line}} # 6

39−+ push:

40−+ - meta_scope: meta.paragraph.markdown

41−+ - match: |-

42−+ (?x) # pop out of this context when one of the following conditions are met:

43−+ ^(?:

44−+ \s*$ # the line is blank (or only contains whitespace)

45−+ | (?=

46−+ {{block_quote}} # a block quote begins the line

47−+ | [ ]{,3}[*+-][ ] # an unordered list item begins the line

48−+ | [ ]{,3}1[.][ ] # an ordered list item with number "1" begins the line

49−+ | \# # an ATX heading begins the line

50−+ | [ ]{,3}<( # all types of HTML blocks except type 7 may interrupt a paragraph

51−+ {{html_tag_block_end_at_close_tag}} # 1

52−+ | !-- # 2

53−+ | \? # 3

54−+ | ![A-Z] # 4

55−+ | !\[CDATA\[ # 5

56−+ | {{html_tag_block_end_at_blank_line}} # 6

57−+ )

58− )

59− )

60−- )

61−- pop: true

62−-

63−- not-heading2:

64−- - include: not-paragraph

65−- - match: (?=\S)

66−- branch_point: heading1-branch

67−- branch:

68−- - paragraph

69−- - heading1

70−- - match: ''

71−- pop: true

72−-

73−- paragraph:

74−- - meta_scope: meta.paragraph.markdown

75−- - match: ^\s{0,3}===+\s*$

76−- fail: heading1-branch

77−- - match: ^\s{0,3}---+\s*$

78−- fail: heading2-branch

79−- - include: not-paragraph

80−- - include: inline-bold-italic-linebreak

81−- - include: scope:text.html.basic

82−-

83−- heading1:

84−- - meta_scope: markup.heading.1.markdown

85−- - include: inline-bold-italic-linebreak

86−- - match: '^[ \t]{0,3}(={3,})(?=[ \t]*$)'

87−- captures:

88−- 1: markup.heading.1.setext.markdown punctuation.definition.heading.setext.markdown

89−- pop: true

90−-

91−- heading2:

92−- - meta_scope: markup.heading.2.markdown

93−- - include: inline-bold-italic-linebreak

94−- - match: '^[ \t]{0,3}(-{3,})(?=[ \t]*$)'

95−- captures:

96−- 1: markup.heading.2.setext.markdown punctuation.definition.heading.setext.markdown

97−- pop: true

98−-

99−+ pop: true

100−+ - include: inline-bold-italic-linebreak

101−+ - include: scope:text.html.basic

102−+ - match: '^(={3,})(?=[ \t]*$)'

103−+ scope: markup.heading.1.setext.markdown

104−+ captures:

105−+ 1: punctuation.definition.heading.setext.markdown

106−+ pop: true

107−+ - match: '^(-{3,})(?=[ \t]*$)'

108−+ scope: markup.heading.2.setext.markdown

109−+ captures:

110−+ 1: punctuation.definition.heading.setext.markdown

111−+ pop: true

112− link-ref-def:

113− - meta_scope: meta.link.reference.def.markdown

114− - match: ''

115−@@ -430,8 +400,6 @@ contexts:

116− push:

117− - meta_scope: markup.bold.markdown

118− - meta_content_scope: markup.italic.markdown

119−- - match: '{{setext_escape}}'

120−- pop: true

121− - match: |-

122− (?x)

123− [ \t]*\*{4,} # if there are more than 3 its not applicable to be bold or italic

124−@@ -446,8 +414,6 @@ contexts:

125− scope: punctuation.definition.bold.end.markdown

126− set:

127− - meta_content_scope: markup.italic.markdown

128−- - match: '{{setext_escape}}'

129−- pop: true

130− - match: |-

131− (?x)

132− [ \t]*\*{3,} # if there are more than 3 its not applicable to be bold or italic

133−@@ -463,8 +429,6 @@ contexts:

134− scope: punctuation.definition.italic.end.markdown

135− set:

136− - meta_content_scope: markup.bold.markdown

137−- - match: '{{setext_escape}}'

138−- pop: true

139− - match: |-

140− (?x)

141− [ \t]*\*{3,} # if there are more than 3 its not applicable to be bold or italic

142−@@ -727,8 +691,6 @@ contexts:

143− scope: punctuation.definition.italic.begin.markdown

144− push:

145− - meta_scope: markup.italic.markdown

146−- - match: '{{setext_escape}}'

147−- pop: true

148− - match: |-

149− (?x)

150− [ \t]*\*{4,} # if there are more than 3 its not applicable to be bold or italic

151−@@ -745,8 +707,6 @@ contexts:

152− scope: punctuation.definition.italic.begin.markdown

153− push:

154− - meta_scope: markup.italic.markdown

155−- - match: '{{setext_escape}}'

156−- pop: true

157− - match: |-

158− (?x)

159− [ \t]*_{4,} # if there are more than 3 its not applicable to be bold or italic

160−@@ -773,8 +733,6 @@ contexts:

161− - include: bold-italic-trailing

162− bold-italic-trailing:

163− - include: scope:text.html.basic

164−- - match: '{{setext_escape}}'

165−- pop: true

166− - match: ^\s*$\n?

167− scope: invalid.illegal.non-terminated.bold-italic.markdown

168− pop: true

169−@@ -1152,7 +1110,7 @@ contexts:

170− - match: |-

171− (?x)

172− {{fenced_code_block_start}}

173−- ((?i:rust))

174−+ ((?i:rust|rs))

175− {{fenced_code_block_trailing_infostring_characters}}

176− captures:

177− 0: meta.code-fence.definition.begin.rust.markdown-gfm

assets/patches/MediaWiki.sublime-syntax.patchdeleted−13

@@ -1,13 +0,0 @@

1−diff --git syntaxes/02_Extra/MediaWiki/MediawikiNG.sublime-syntax syntaxes/02_Extra/MediaWiki/MediawikiNG.sublime-syntax

2−index f542c9e..8eaf020 100644

3−--- syntaxes/02_Extra/MediaWiki/MediawikiNG.sublime-syntax

4−+++ syntaxes/02_Extra/MediaWiki/MediawikiNG.sublime-syntax

5−@@ -1,7 +1,7 @@

6− %YAML 1.2

7− ---

8− # http://www.sublimetext.com/docs/3/syntax.html

9−-name: Mediawiki NG

10−+name: MediaWiki

11− file_extensions: [mediawiki, wikipedia, wiki]

12− scope: text.html.mediawiki

13−

assets/patches/Monokai-Extended.tmTheme.patchdeleted−36

@@ -1,36 +0,0 @@

1−diff --git themes/sublime-monokai-extended/Monokai\ Extended.tmTheme themes/sublime-monokai-extended/Monokai\ Extended.tmTheme

2−index 9c2aa3e..180cbbf 100644

3−--- themes/sublime-monokai-extended/Monokai Extended.tmTheme

4−+++ themes/sublime-monokai-extended/Monokai Extended.tmTheme

5−@@ -810,11 +810,11 @@

6− <key>name</key>

7− <string>JSON String</string>

8− <key>scope</key>

9−- <string>meta.structure.dictionary.json string.quoted.double.json</string>

10−+ <string>meta.mapping.key.json string.quoted.double.json, punctuation.separator.sequence.csv</string>

11− <key>settings</key>

12− <dict>

13− <key>foreground</key>

14−- <string>#cfcfc2</string>

15−+ <string>#fd971f</string>

16− </dict>

17− </dict>

18− <dict>

19−@@ -1027,7 +1027,7 @@

20− <key>name</key>

21− <string>Invalid</string>

22− <key>scope</key>

23−- <string>invalid</string>

24−+ <string>invalid, markup.error</string>

25− <key>settings</key>

26− <dict>

27− <key>background</key>

28−@@ -1042,7 +1042,7 @@

29− <key>name</key>

30− <string>Invalid deprecated</string>

31− <key>scope</key>

32−- <string>invalid.deprecated</string>

33−+ <string>invalid.deprecated, markup.warning</string>

34− <key>settings</key>

35− <dict>

36− <key>background</key>

assets/patches/Python.sublime-syntax.patchdeleted−15

@@ -1,15 +0,0 @@

1−diff --git syntaxes/01_Packages/Python/Python.sublime-syntax syntaxes/01_Packages/Python/Python.sublime-syntax

2−index 2acd86d8..86257f7b 100644

3−--- syntaxes/01_Packages/Python/Python.sublime-syntax

4−+++ syntaxes/01_Packages/Python/Python.sublime-syntax

5−@@ -988,10 +988,6 @@ contexts:

6− - match: \}

7− scope: punctuation.section.mapping-or-set.end.python

8− set: after-expression

9−- - match: (?={{simple_expression}}:|\s*\*\*)

10−- set: inside-dictionary

11−- - match: (?={{simple_expression}}[,}]|\s*\*)

12−- set: inside-set

13− - match: ','

14− scope: punctuation.separator.set.python

15− set: inside-set

assets/patches/Rust.sublime-syntax.patchdeleted−13

@@ -1,13 +0,0 @@

1−diff --git syntaxes/01_Packages/Rust/Rust.sublime-syntax syntaxes/01_Packages/Rust/Rust.sublime-syntax

2−index 3c354486..24727a4e 100644

3−--- syntaxes/01_Packages/Rust/Rust.sublime-syntax

4−+++ syntaxes/01_Packages/Rust/Rust.sublime-syntax

5−@@ -907,6 +907,8 @@ contexts:

6− - include: type-any-identifier

7− - match: ':'

8− scope: punctuation.separator.rust

9−+ - match: (?=;)

10−+ pop: true

11−

12− fn-body:

13− - meta_scope: meta.function.rust

assets/patches/ShellScript.sublime-syntax.patchdeleted−20

@@ -1,20 +0,0 @@

1−diff --git syntaxes/01_Packages/ShellScript/Bash.sublime-syntax syntaxes/01_Packages/ShellScript/Bash.sublime-syntax

2−index e973e319..07c170a7 100644

3−--- syntaxes/01_Packages/ShellScript/Bash.sublime-syntax

4−+++ syntaxes/01_Packages/ShellScript/Bash.sublime-syntax

5−@@ -30,12 +30,12 @@ file_extensions:

6− - .zshenv

7− - .zshrc

8− - PKGBUILD # https://jlk.fjfi.cvut.cz/arch/manpages/man/PKGBUILD.5

9−- - .ebuild

10−- - .eclass

11−+ - ebuild

12−+ - eclass

13−

14− first_line_match: |

15− (?x)

16−- ^\#! .* \b(bash|zsh|sh|tcsh|ash)\b

17−+ ^\#! .* \b(bash|zsh|sh|tcsh|ash|dash)\b

18− | ^\# \s* -\*- [^*]* mode: \s* shell-script [^*]* -\*-

19−

20− #-------------------------------------------------------------------------------

assets/patches/XML.sublime-syntax.patchdeleted−12

@@ -1,12 +0,0 @@

1−diff --git syntaxes/01_Packages/XML/XML.sublime-syntax syntaxes/01_Packages/XML/XML.sublime-syntax

2−index ad7d9c87..af4a00f0 100644

3−--- syntaxes/01_Packages/XML/XML.sublime-syntax

4−+++ syntaxes/01_Packages/XML/XML.sublime-syntax

5−@@ -12,6 +12,7 @@ file_extensions:

6− - rss

7− - opml

8− - svg

9−+ - xaml

10− first_line_match: |-

11− (?x:

12− ^(?:

assets/syntaxes.bin

Binary file not shown.

assets/syntaxes/01_Packagesdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/AWKdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/Apachedeleted−1

Submodule changed.

assets/syntaxes/02_Extra/Apache.sublime-syntaxdeleted−221

@@ -1,221 +0,0 @@

1−%YAML 1.2

2−---

3−# http://www.sublimetext.com/docs/3/syntax.html

4−name: Apache Conf

5−file_extensions:

6− - envvars

7− - htaccess

8− - HTACCESS

9− - htgroups

10− - HTGROUPS

11− - htpasswd

12− - HTPASSWD

13− - .htaccess

14− - .HTACCESS

15− - .htgroups

16− - .HTGROUPS

17− - .htpasswd

18− - .HTPASSWD

19−scope: source.apacheconf

20−contexts:

21− main:

22− - match: ^(\s)*(#).*$\n?

23− scope: comment.line.hash.ini

24− captures:

25− 1: punctuation.definition.comment.apacheconf

27− captures:

28− 1: punctuation.definition.tag.apacheconf

29− 2: entity.tag.apacheconf

30− 4: string.value.apacheconf

31− 5: punctuation.definition.tag.apacheconf

33− captures:

34− 1: punctuation.definition.tag.apacheconf

35− 2: entity.tag.apacheconf

36− 3: punctuation.definition.tag.apacheconf

37− - match: (?<=(Rewrite(Rule|Cond)))\s+(.+?)\s+(.+?)($|\s)

38− captures:

39− 3: string.regexp.apacheconf

40− 4: string.replacement.apacheconf

42− captures:

43− 2: entity.status.apacheconf

44− 3: string.regexp.apacheconf

45− 5: string.path.apacheconf

47− captures:

48− 2: entity.status.apacheconf

49− 3: string.path.apacheconf

50− 5: string.path.apacheconf

51− - match: (?<=ScriptAliasMatch|AliasMatch)\s+(.+?)\s+((.+?)\s)?

52− captures:

53− 1: string.regexp.apacheconf

54− 3: string.path.apacheconf

55− - match: (?<=RedirectPermanent|RedirectTemp|ScriptAlias|Alias)\s+(.+?)\s+((.+?)($|\s))?

56− captures:

57− 1: string.path.apacheconf

58− 3: string.path.apacheconf

60− captures:

61− 1: keyword.core.apacheconf

63− captures:

64− 1: keyword.mpm.apacheconf

65− - match: \b(Allow|Deny|Order)\b

66− captures:

67− 1: keyword.access.apacheconf

68− - match: \b(Action|Script)\b

69− captures:

70− 1: keyword.actions.apacheconf

72− captures:

73− 1: keyword.alias.apacheconf

75− captures:

76− 1: keyword.auth.apacheconf

78− captures:

79− 1: keyword.auth_anon.apacheconf

80− - match: \b(AuthDBMAuthoritative|AuthDBMGroupFile|AuthDBMType|AuthDBMUserFile)\b

81− captures:

82− 1: keyword.auth_dbm.apacheconf

84− captures:

85− 1: keyword.auth_digest.apacheconf

87− captures:

88− 1: keyword.auth_ldap.apacheconf

90− captures:

91− 1: keyword.autoindex.apacheconf

92− - match: \b(BalancerMember|BalancerGrowth|BalancerPersist|BalancerInherit)\b

93− captures:

94− 1: keyword.filter.apacheconf

96− captures:

97− 1: keyword.cache.apacheconf

98− - match: \b(MetaDir|MetaFiles|MetaSuffix)\b

99− captures:

100− 1: keyword.cern_meta.apacheconf

101− - match: \b(ScriptLog|ScriptLogBuffer|ScriptLogLength)\b

102− captures:

103− 1: keyword.cgi.apacheconf

104− - match: \b(ScriptLog|ScriptLogBuffer|ScriptLogLength|ScriptSock)\b

105− captures:

106− 1: keyword.cgid.apacheconf

107− - match: \b(CharsetDefault|CharsetOptions|CharsetSourceEnc)\b

108− captures:

109− 1: keyword.charset_lite.apacheconf

110− - match: \b(Dav|DavDepthInfinity|DavMinTimeout|DavLockDB)\b

111− captures:

112− 1: keyword.dav.apacheconf

113− - match: \b(DeflateBufferSize|DeflateCompressionLevel|DeflateFilterNote|DeflateMemLevel|DeflateWindowSize)\b

114− captures:

115− 1: keyword.deflate.apacheconf

116− - match: \b(DirectoryIndex|DirectorySlash|FallbackResource)\b

117− captures:

118− 1: keyword.dir.apacheconf

120− captures:

121− 1: keyword.disk_cache.apacheconf

122− - match: \b(DumpIOInput|DumpIOOutput)\b

123− captures:

124− 1: keyword.dumpio.apacheconf

125− - match: \b(PassEnv|SetEnv|UnsetEnv)\b

126− captures:

127− 1: keyword.env.apacheconf

128− - match: \b(ExpiresActive|ExpiresByType|ExpiresDefault)\b

129− captures:

130− 1: keyword.expires.apacheconf

131− - match: \b(ExtFilterDefine|ExtFilterOptions)\b

132− captures:

133− 1: keyword.ext_filter.apacheconf

134− - match: \b(CacheFile|MMapFile)\b

135− captures:

136− 1: keyword.file_cache.apacheconf

138− captures:

139− 1: keyword.filter.apacheconf

140− - match: \b(Header|RequestHeader)\b

141− captures:

142− 1: keyword.headers.apacheconf

143− - match: \b(ImapBase|ImapDefault|ImapMenu)\b

144− captures:

145− 1: keyword.imap.apacheconf

147− captures:

148− 1: keyword.include.apacheconf

150− captures:

151− 1: keyword.isapi.apacheconf

153− captures:

154− 1: keyword.ldap.apacheconf

156− captures:

157− 1: keyword.log.apacheconf

159− captures:

160− 1: keyword.mem_cache.apacheconf

162− captures:

163− 1: keyword.mime.apacheconf

165− captures:

166− 1: keyword.misc.apacheconf

167− - match: \b(CacheNegotiatedDocs|ForceLanguagePriority|LanguagePriority)\b

168− captures:

169− 1: keyword.negotiation.apacheconf

170− - match: \b(NWSSLTrustedCerts|NWSSLUpgradeable|SecureListen)\b

171− captures:

172− 1: keyword.nw_ssl.apacheconf

174− captures:

175− 1: keyword.proxy.apacheconf

177− captures:

178− 1: keyword.rewrite.apacheconf

179− - match: \b(BrowserMatch|BrowserMatchNoCase|SetEnvIf|SetEnvIfNoCase)\b

180− captures:

181− 1: keyword.setenvif.apacheconf

182− - match: \b(LoadFile|LoadModule)\b

183− captures:

184− 1: keyword.so.apacheconf

186− captures:

187− 1: keyword.ssl.apacheconf

188− - match: \b(Substitute|SubstituteInheritBefore|SubstituteMaxLineLength)\b

189− captures:

190− 1: keyword.substitute.apacheconf

191− - match: \b(CookieDomain|CookieExpires|CookieName|CookieStyle|CookieTracking)\b

192− captures:

193− 1: keyword.usertrack.apacheconf

194− - match: \b(VirtualDocumentRoot|VirtualDocumentRootIP|VirtualScriptAlias|VirtualScriptAliasIP)\b

195− captures:

196− 1: keyword.vhost_alias.apacheconf

197− - match: \b(php_value|php_flag|php_admin_value|php_admin_flag)\b(\s+(.+?)(\s+(".+?"|.+?))?)?\s

198− captures:

199− 1: keyword.php.apacheconf

200− 3: entity.property.apacheconf

201− 5: string.value.apacheconf

202− - match: '(%\{)((HTTP_USER_AGENT|HTTP_REFERER|HTTP_COOKIE|HTTP_FORWARDED|HTTP_HOST|HTTP_PROXY_CONNECTION|HTTP_ACCEPT|REMOTE_ADDR|REMOTE_HOST|REMOTE_PORT|REMOTE_USER|REMOTE_IDENT|REQUEST_METHOD|SCRIPT_FILENAME|PATH_INFO|QUERY_STRING|AUTH_TYPE|DOCUMENT_ROOT|SERVER_ADMIN|SERVER_NAME|SERVER_ADDR|SERVER_PORT|SERVER_PROTOCOL|SERVER_SOFTWARE|TIME_YEAR|TIME_MON|TIME_DAY|TIME_HOUR|TIME_MIN|TIME_SEC|TIME_WDAY|TIME|API_VERSION|THE_REQUEST|REQUEST_URI|REQUEST_FILENAME|IS_SUBREQ|HTTPS)|(.*?))(\})'

203− captures:

204− 1: punctuation.variable.apacheconf

205− 3: variable.env.apacheconf

206− 4: variable.misc.apacheconf

207− 5: punctuation.variable.apacheconf

208− - match: \b((text|image|application|video|audio)/.+?)\s

209− captures:

210− 1: entity.mime-type.apacheconf

212− captures:

213− 1: entity.helper.apacheconf

214− - match: \b(\d+)\b

215− captures:

216− 1: constant.numeric.integer.decimal.apacheconf

217− - match: '\s(\[)(.*?)(\])\s'

218− captures:

219− 1: punctuation.definition.flag.apacheconf

220− 2: string.flag.apacheconf

221− 3: punctuation.definition.flag.apacheconf

assets/syntaxes/02_Extra/AsciiDocdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/AsciiDoc.sublime-syntaxdeleted−997

@@ -1,997 +0,0 @@

1−%YAML 1.2

2−---

3−# http://www.sublimetext.com/docs/3/syntax.html

4−name: AsciiDoc (Asciidoctor)

5−file_extensions:

6− - adoc

7− - ad

8− - asciidoc

9−scope: text.asciidoc

10−contexts:

11− main:

12− - include: lists

13− - include: blocks

14− - include: section_titles

15− - include: lines

16− - include: inline

17− - include: characters

18− attribute_entry:

19− - match: |-

20− (?x)

21− ^(:) # opening delimiter

22− (!)? # bang symbol (unset attribute)

23− ([A-Za-z0-9_][A-Za-z0-9_-]*) # attribute name

24− (!)? # bang symbol (unset attribute)

25− (:) # closing delimiter

26− (?:\s+|(?=$))

27− comment: |

28− An attribute entry.

29−

30− Examples:

31− :my-attribute: value

32− :sectnums!:

33− :!sectnums:

34− captures:

35− 1: punctuation.definition.attributeentry.attrname.begin.asciidoc

36− 2: punctuation.definition.attributeentry.unset.asciidoc

37− 3: support.variable.attribute.asciidoc

38− 4: punctuation.definition.attributeentry.unset.asciidoc

39− 5: punctuation.definition.attributeentry.attrname.end.asciidoc

40− push:

41− - meta_scope: meta.attributeentry.asciidoc

42− - meta_content_scope: meta.attributeentry.value.asciidoc

43− - match: $\n?

44− pop: true

45− - include: characters

46− attribute_list_line:

47− - match: '^(\[)[^\[\]]*(\])\s*$\n?'

48− comment: "Attribute list as paragraph: single brackets. No need for special treatment of escape; follows literal block, section template as being a more general regex."

49− scope: support.variable.attributelist.asciidoc

50− captures:

51− 1: punctuation.definition.attributelistline.begin.asciidoc

52− 2: punctuation.definition.attributelistline.end.asciidoc

53− attribute_reference:

54− - match: "({)([A-Za-z0-9_][A-Za-z0-9_-]*)(})"

55− comment: |

56− Examples:

57− {my-attribute}

58− scope: variable.other

59− captures:

60− 1: constant.character.attributes.reference.begin.asciidoc

61− 2: support.variable.attribute.asciidoc

62− 3: constant.character.attributes.reference.end.asciidoc

63− biblio_anchor:

64− - match: '(?<!\[)(\[\[\[).*?(\]\]\])(?!\])'

65− comment: |

66− Bibliography anchor

67−

68− Examples:

69− [[[Lorem ipsum]]]

70− scope: storage.type.reference.biblioanchor.asciidoc

71− captures:

72− 1: punctuation.definition.biblioanchor.begin.asciidoc

73− 2: punctuation.definition.biblioanchor.end.asciidoc

74− block_admonition_label:

75− - match: ^(NOTE|TIP|IMPORTANT|WARNING|CAUTION):(?=\s+)

76− comment: |

77− Label of an admonition block.

78−

79− Examples:

80− NOTE: This is a admonition block.

81− WARNING: Be aware of them!

82− scope: support.constant.admonitionword.asciidoc

83− block_comment:

84− - match: '^(/{4,})\s*$\n?'

85− comment: |

86− Examples:

87− ////

88− A multi-line comment.

89− Notice it's a delimited block.

90− ////

91− captures:

92− 0: punctuation.definition.comment.begin.asciidoc

93− push:

94− - meta_scope: comment.block.asciidoc

95− - meta_content_scope: meta.block.comment.content.asciidoc

96− - match: ^\1\s*$\n?

97− captures:

98− 0: punctuation.definition.comment.end.asciidoc

99− pop: true

100− - include: macro

101− block_example:

102− - match: '^(={4,})\s*$\n?'

103− comment: |

104− Examples:

105− ====

106− Lorem ipsum.

107− ====

108−

109− Note: Might need to add more includes, but these are the ones that arise in

110− practice for me.

111− captures:

112− 0: constant.delimiter.example.begin.asciidoc

113− push:

114− - meta_scope: string.unquoted.block.example.asciidoc

115− - meta_content_scope: meta.block.example.content.asciidoc

116− - match: ^\1\s*$\n?

117− captures:

118− 0: constant.delimiter.example.end.asciidoc

119− pop: true

120− - include: lists

121− - include: block_listing

122− - include: lines

123− - include: inline

124− - include: characters

125− block_id:

126− - match: '^(\[\[)([^\[].*)(\]\])\s*$\n?'

127− comment: |

128− A block id (i.e. anchor).

129−

130− Examples:

131− [[myid]]

132− Lorem ipsum dolor.

133− scope: meta.tag.blockid.asciidoc

134− captures:

135− 1: punctuation.definition.blockid.begin.asciidoc

136− 2: markup.underline.blockid.id.asciidoc

137− 3: punctuation.definition.blockid.end.asciidoc

138− block_listing:

139− - match: '^(\-{4,})\s*$\n?'

140− comment: |

141− Examples:

142− ----

143− Lorem ipsum.

144− ----

145− captures:

146− 0: constant.delimiter.listing.begin.asciidoc

147− push:

148− - meta_scope: meta.embedded.block.listing.asciidoc

149− - meta_content_scope: source.block.listing.content.asciidoc

150− - match: ^\1\s*$\n?

151− captures:

152− 0: constant.delimiter.listing.end.asciidoc

153− pop: true

154− - include: inline_callout

155− block_literal:

156− - match: '^(\.{4,})\s*$\n?'

157− comment: |

158− Examples:

159− ....

160− Lorem ipsum.

161− ....

162− captures:

163− 0: constant.delimiter.block.literal.begin.asciidoc

164− push:

165− - meta_scope: string.literal.block.delimited.asciidoc

166− - meta_content_scope: meta.block.literal.content.asciidoc

167− - match: ^\1\s*$\n?

168− captures:

169− 0: constant.delimiter.block.literal.end.asciidoc

170− pop: true

171− - include: inline_callout

172− block_open:

173− - match: ^\-\-\s*$\n?

174− comment: |

175− Examples:

176− --

177− Lorem ipsum

178− --

179− Note: Might need to check on these includes.

180− captures:

181− 0: constant.delimiter.block.open.begin.asciidoc

182− push:

183− - meta_scope: meta.block.open.asciidoc

184− - meta_content_scope: meta.block.open.content.asciidoc

185− - match: ^\-\-\s*$\n?

186− captures:

187− 0: constant.delimiter.block.open.end.asciidoc

188− pop: true

189− - include: lists

190− - include: block_comment

191− - include: block_listing

192− - include: block_pass

193− - include: lines

194− - include: inline

195− - include: characters

196− block_page_break:

197− - match: '^<{3,}$\n?'

198− comment: |

199− A page break.

200−

201− Examples:

202− <<<

203− <<<<<

204− scope: meta.separator.pagebreak.asciidoc

205− block_pass:

206− - match: '^(\+{4,})\s*$\n?'

207− captures:

208− 0: constant.delimiter.block.passthrough.begin.asciidoc

209− push:

210− - meta_scope: meta.embedded.block.passthrough.asciidoc

211− - meta_content_scope: text.xml.block.passthrough.content.asciidoc

212− - match: ^\1\s*$\n?

213− captures:

214− 0: constant.delimiter.block.passthrough.end.asciidoc

215− pop: true

216− - include: scope:text.xml

217− block_quote:

218− - match: '^(_{4,})\s*$\n?'

219− comment: |

220− Examples:

221− ____

222− Lorem ipsum

223− ____

224−

225− Note: Might need to add more includes, but these are the ones that arise for me in practice.

226− captures:

227− 0: constant.delimiter.block.quote.begin.asciidoc

228− push:

229− - meta_scope: markup.quote.block.asciidoc

230− - meta_content_scope: meta.block.quote.content.asciidoc

231− - match: ^\1\s*$\n?

232− captures:

233− 0: constant.delimiter.block.quote.end.asciidoc

234− pop: true

235− - include: lines

236− - include: inline

237− - include: characters

238− block_sidebar:

239− - match: '^(\*{4,})\s*$\n?'

240− comment: |

241− Examples:

242− ****

243− Lorem ipsum

244− ****

245−

246− Note: Might need to add more includes, but these are the ones that arise

247− for me in practice.

248− captures:

249− 0: constant.delimiter.block.sidebar.begin.asciidoc

250− push:

251− - meta_scope: string.quoted.block.sidebar.asciidoc

252− - meta_content_scope: meta.block.sidebar.content.asciidoc

253− - match: ^\1\s*$\n?

254− captures:

255− 0: constant.delimiter.block.sidebar.end.asciidoc

256− pop: true

257− - include: lists

258− - include: block_comment

259− - include: block_listing

260− - include: lines

261− - include: inline

262− - include: characters

263− block_source_fenced:

264− - match: ^(```)(\w+)?\s*$\n?

265− comment: |

266− Fenced code block (ala Markdown)

267−

268− Examples:

269− ```rb

270− puts 'Hello world!'

271− ```

272− captures:

273− 0: constant.delimiter.listing.begin.asciidoc

274− push:

275− - meta_scope: meta.embedded.block.listing.asciidoc

276− - meta_content_scope: source.block.listing.content.asciidoc

277− - match: ^\1\s*$\n?

278− captures:

279− 0: constant.delimiter.listing.end.asciidoc

280− pop: true

281− - include: inline_callout

282− block_thematic_break:

283− - match: '^''{3,}$\n?'

284− comment: |

285− A thematic break (aka horizontal rule).

286−

287− Examples:

288− '''

289− ''''''

290− scope: meta.separator.ruler.asciidoc

291− block_title:

292− - match: ^(\.)\w.*$\n?

293− comment: |

294− Title of a block.

295−

296− Examples:

297− .My title

298− Lorem ipsum dolor.

299− scope: markup.heading.block.asciidoc

300− captures:

301− 1: punctuation.definition.blockheading.asciidoc

302− blocks:

303− - include: block_literal

304− - include: block_comment

305− - include: block_listing

306− - include: block_source_fenced

307− - include: block_sidebar

308− - include: block_pass

309− - include: block_quote

310− - include: block_example

311− - include: block_open

312− characters:

313− - include: attribute_reference

314− - include: entity_number

315− - include: entity_name

316− - include: escape

317− - include: replacement

318− - include: macro_pass

319− - include: macro

320− - include: xref

321− - include: biblio_anchor

322− - include: indexterm_triple

323− - include: indexterm_double

324− colist_item_marker:

325− - match: ^(\s*((<)\d+?(>)))\s+(?=\S)

326− comment: |

327− Marker of a callout list item.

328−

329− Examples:

330− <1> a callout

331− <42> another callout

332− scope: markup.list.numbered.callout.asciidoc

333− captures:

334− 1: string.unquoted.list.callout.asciidoc

335− 2: constant.numeric.callout.asciidoc

336− 3: punctuation.definition.calloutlistnumber.begin.asciidoc

337− 4: punctuation.definition.calloutlistnumber.end.asciidoc

338− dlist_item_label:

339− - match: '^\s*(?=.*:{2,4}(?:\s|$))'

340− comment: |

341− Label of a definition (labeled) list item.

342−

343− Examples:

344− Label level 1:: lorem ipsum

345− Label level 2::: dolor sit amet

346− Label level 3:::: consectetur

347− Label level 1::

348− lorem ipsum

349− Another label :: lorem ipsum

350− Last::label:: dolor sit amet

351−

352− Note: This rule is not strictly correct, because Asciidoctor allows

353− double colon followed by a space inside a label, i.e. it matches the

354− *last* double colon, not the first. I don't know how to do that

355− *effectively.

356− push:

357− - meta_scope: markup.list.labeled.asciidoc

358− - meta_content_scope: meta.list.label.asciidoc

359− - match: '(:{2,4})(?:\s|$\n?)'

360− captures:

361− 1: constant.labeledlist.separator.asciidoc

362− pop: true

363− - include: inline

364− - include: characters

365− emphasis:

366− - match: |-

367− (?x)

368− (\[[^\]]*?\])? # might be preceded by an attributes list

369− (?<=^|\W)(?<!\\|}) # must be preceded by nonword character, and not by escape or } (attribute)

370− (_)(?=\S) # delimiter underscore that must be followed by a nonspace character

371− comment: |

372− Emphasized (italic) text (constrained variant).

373−

374− Examples:

375− _Lorem ipsum_ dolor

376− [red]_Lorem ipsum_ dolor

377− captures:

378− 1: support.variable.attributelist.asciidoc

379− 2: punctuation.definition.italic.single.begin.asciidoc

380− push:

381− - meta_scope: markup.italic.single.asciidoc

382− - meta_content_scope: meta.italicinner.single.asciidoc

383− - match: |-

384− (?x)

385− (?<=\S)(_) # delimiter underscore that must be preceded by a nonspace character

386− (?!\w) # ...and followed by a nonword character

387− captures:

388− 1: punctuation.definition.italic.single.end.asciidoc

389− pop: true

390− - include: strong_double

391− - include: monospaced_double

392− - include: mark_double

393− - include: strong

394− - include: monospaced

395− - include: mark

396− - include: superscript

397− - include: subscript

398− - include: characters

399− emphasis_double:

400− - match: |-

401− (?x)

402− (\[[^\]]*?\])? # might start with attribute list

403− (?<!\\) # must not be preceded by escape

404− (__)

405− comment: |

406− Emphasized (italic) text (unconstrained variant).

407−

408− Examples:

409− Lo__re__m __ipsum dolor__.

410− Lo[red]__re__m

411− captures:

412− 1: support.variable.attributelist.asciidoc

413− 2: punctuation.definition.italic.double.begin.asciidoc

414− push:

415− - meta_scope: markup.italic.double.asciidoc

416− - meta_content_scope: meta.italicinner.double.asciidoc

417− - match: __

418− captures:

419− 0: punctuation.definition.italic.double.end.asciidoc

420− pop: true

421− - include: strong_double

422− - include: monospaced_double

423− - include: mark_double

424− - include: strong

425− - include: monospaced

426− - include: mark

427− - include: superscript

428− - include: subscript

429− - include: characters

430− entity_name:

431− - match: '(?<!\\)&([a-zA-Z][a-zA-Z0-9]*);'

432− comment: |

433− Character entity reference

434−

435− Examples:

436−  

437− ²

438− scope: constant.character.entity.xml.asciidoc

439− entity_number:

440− - match: '(?<!\\)&#(x?[0-9a-fA-f]{2,4});'

441− comment: |

442− Numeric character reference

443−

444− Examples:

445− ➊

446− ¶

447− scope: constant.character.entity.asciidoc

448− escape:

449− - match: '\\(?=[-`*_#+.!(){}\[\]\\>:])'

450− comment: |

451− List of special characters that may be escaped.

452−

453− Note: I do not really know if this is a good list, adopted wholesale from

454− original bundle.

455− scope: constant.character.escape.asciidoc

456− indexterm_double:

457− - match: '(?<!$)(\({2})([^\(\s].*?)(${2})(?!\))'

458− comment: |

459− Double parenthesis indexterm.

460−

461− Examples:

462− ((Arthur))

463− scope: variable.other.indexterm.double.asciidoc

464− captures:

465− 1: constant.character.indexterm.double.begin.asciidoc

466− 3: constant.character.indexterm.double.end.asciidoc

467− indexterm_triple:

468− - match: '(?<!$)(\({3})([^\(].*?)(${3})(?!\))'

469− comment: |

470− Triple parenthesis indexterm.

471−

472− Examples:

473− (((Sword, Broadsword, Excalibur)))

474− scope: variable.other.indexterm.triple.asciidoc

475− captures:

476− 1: constant.character.indexterm.triple.begin.asciidoc

477− 3: constant.character.indexterm.triple.end.asciidoc

478− inline:

479− - include: passthrough

480− - include: strong_double

481− - include: emphasis_double

482− - include: monospaced_double

483− - include: mark_double

484− - include: strong

485− - include: emphasis

486− - include: monospaced

487− - include: mark

488− - include: superscript

489− - include: subscript

490− inline_break:

491− - match: (?<=\s)\+$\n?

492− comment: |

493− Line hard break with a plus sign (+).

494−

495− Examples:

496− Rubies are red, +

497− Topazes are blue.

498− scope: constant.linebreak.asciidoc

499− inline_callout:

500− - match: (?<!\\)(<)\d+(>)

501− comment: |

502− Callout label

503−

504− Examples:

505− <1>

506− <42>

507− scope: constant.other.callout.asciidoc

508− captures:

509− 1: punctuation.definition.callout.begin.asciidoc

510− 2: punctuation.definition.callout.end.asciidoc

511− inline_comment:

512− - match: '^(//)([^/\n].*|)$\n?'

513− comment: |

514− Inline comment.

515−

516− Examples:

517− // This is just a comment!

518− scope: comment.line.double-slash.asciidoc

519− captures:

520− 1: punctuation.definition.comment.line.asciidoc

521− 2: meta.line.comment.content.asciidoc

522− lines:

523− - include: inline_comment

524− - include: list_continuation

525− - include: inline_break

526− - include: block_page_break

527− - include: block_thematic_break

528− - include: block_title

529− - include: block_id

530− - include: section_template

531− - include: attribute_list_line

532− - include: attribute_entry

533− list_continuation:

534− - match: ^\+\s*$\n?

535− scope: constant.listcontinuation.asciidoc

536− lists:

537− - include: block_admonition_label

538− - include: ulist_item_marker

539− - include: olist_item_marker

540− - include: dlist_item_label

541− - include: colist_item_marker

542− macro:

543− - match: |-

544− (?x)

545− (?:

546− ((?:https?|mailto|ftp|file) # specify separately so we can mark them as links that TextMate opens

547− ?:{1} # inline only

548− \S*) # (others such as image are partial URLs and/or TextMate cannot handle them)

549− |

550− (([a-zA-Z0-9][a-zA-Z0-9_]*)

551− (:{1,2})

552− (\S*))

553− )

554− (?:(\[)([^\]]*)(\]))

555− comment: |

556− Note: There are other macro notations, but I match only those that end in

557− square brackets.

558− scope: meta.macro.asciidoc

559− captures:

560− 1: markup.underline.link.macro.asciidoc

561− 3: keyword.control.name.macro.asciidoc

562− 4: constant.character.separator.macro.asciidoc

563− 5: markup.underline.target.macro.asciidoc

564− 6: constant.character.attributes.macro.begin.asciidoc

565− 7: variable.parameter.attributes.macro.asciidoc

566− 8: constant.character.attributes.macro.end.asciidoc

567− macro_pass:

568− - match: |-

569− (?x)

570− (pass)

571− (:{1,2})

572− (\S*)

573− (\[)(?=[^\]]*\])

574− comment: |

575− Passthrough macro

576−

577− Examples:

578− pass:[Lorem ipsum]

579− pass::[Lorem ipsum]

580− captures:

581− 1: keyword.control.name.macro.pass.asciidoc

582− 2: constant.character.separator.macro.asciidoc

583− 3: markup.underline.target.macro.asciidoc

584− 4: constant.character.attributes.macro.begin.asciidoc

585− push:

586− - meta_scope: meta.macro.pass.asciidoc

587− - meta_content_scope: variable.parameter.attributes.macro.pass.asciidoc

588− - match: '\]'

589− captures:

590− 0: constant.character.attributes.macro.end.asciidoc

591− pop: true

592− - include: scope:text.xml

593− mark:

594− - match: |-

595− (?x)

596− (\[[^\]]*?\])? # might start with attribute list (darned well better or why are we here)

597− (?<=^|\W)(?<!\\|}) # must be preceded by nonword character, and not by escape or } (attribute)

598− (\#)(?=\S) # delimiter hash that must be followed by a nonspace character

599− comment: |

600− Marked text (constrained variant).

601−

602− Examples:

603− #Lorem ipsum# dolor

604− [red]#Lorem ipsum# dolor

605− captures:

606− 1: support.variable.attributelist.asciidoc

607− 2: punctuation.definition.string.unquoted.single.begin.asciidoc

608− push:

609− - meta_scope: string.other.unquoted.single.asciidoc

610− - meta_content_scope: string.unquoted.unquotedinner.single.asciidoc

611− - match: |-

612− (?x)

613− (?<=\S)(\#) # delimiter hash that must be preceded by a nonspace character

614− (?!\w) # ...and followed by a nonword character

615− captures:

616− 1: punctuation.definition.string.unquoted.single.end.asciidoc

617− pop: true

618− - include: strong_double

619− - include: emphasis_double

620− - include: monospaced_double

621− - include: strong

622− - include: emphasis

623− - include: monospaced

624− - include: superscript

625− - include: subscript

626− - include: characters

627− mark_double:

628− - match: |-

629− (?x)

630− (\[[^\]]*?\])? # might start with an attribute list (indeed, that is its purpose)

631− (?<!\\) # must not be preceded by escape

632− (\#\#)

633− comment: |

634− Marked text (unconstrained variant).

635−

636− Examples:

637− Lo##re##m ##ipsum dolor##.

638− Lo[red]##re##m

639− captures:

640− 1: support.variable.attributelist.asciidoc

641− 2: punctuation.definition.string.unquoted.double.begin.asciidoc

642− push:

643− - meta_scope: string.other.unquoted.double.asciidoc

644− - meta_content_scope: string.unquoted.unquotedinner.double.asciidoc

645− - match: '\#\#'

646− captures:

647− 0: punctuation.definition.string.unquoted.double.end.asciidoc

648− pop: true

649− - include: strong_double

650− - include: emphasis_double

651− - include: monospaced_double

652− - include: strong

653− - include: emphasis

654− - include: monospaced

655− - include: superscript

656− - include: subscript

657− - include: characters

658− monospaced:

659− - match: |-

660− (?x)

661− (\[[^\]]*?\])? # might start with attributes list

662− (?<=^|\W)(?<!\\|}) # must be preceded by nonword character, and not by escape or } (attribute)

663− (`)(?=\S) # delimiter backtick that must be followed by a nonspace character

664− comment: |

665− Monospaced text (constrained variant).

666−

667− Examples:

668− `Lorem ipsum` dolor

669− [red]`Lorem ipsum` dolor

670− captures:

671− 1: support.variable.attributelist.asciidoc

672− 2: punctuation.definition.literal.single.begin.asciidoc

673− push:

674− - meta_scope: string.other.literal.single.asciidoc

675− - meta_content_scope: meta.literalinner.single.asciidoc

676− - match: |-

677− (?x)

678− (?<=\S)(`) # delimiter backtick that must be preceded by a nonspace character

679− (?!\w) # ...and followed by a nonword character

680− captures:

681− 1: punctuation.definition.literal.single.end.asciidoc

682− pop: true

683− - include: strong_double

684− - include: emphasis_double

685− - include: mark_double

686− - include: strong

687− - include: emphasis

688− - include: mark

689− - include: superscript

690− - include: subscript

691− - include: characters

692− monospaced_double:

693− - match: |-

694− (?x)

695− (\[[^\]]*?\])? # might start with attribute list

696− (?<!\\) # must not be preceded by escape

697− (``)

698− comment: |

699− Monospaced text (unconstrained variant).

700−

701− Examples:

702− Lo``re``m ``ipsum dolor``.

703− Lo[red]``re``m

704− captures:

705− 1: support.variable.attributelist.asciidoc

706− 2: punctuation.definition.literal.double.begin.asciidoc

707− push:

708− - meta_scope: string.other.literal.double.asciidoc

709− - meta_content_scope: meta.literalinner.double.asciidoc

710− - match: "``"

711− captures:

712− 0: punctuation.definition.literal.double.end.asciidoc

713− pop: true

714− - include: strong_double

715− - include: emphasis_double

716− - include: mark_double

717− - include: strong

718− - include: emphasis

719− - include: mark

720− - include: superscript

721− - include: subscript

722− - include: characters

723− olist_item_marker:

724− - match: '^(\s*(\.{1,5}))\s+(?=\S)'

725− comment: |

726− Marker of an ordered (numbered) list item.

727−

728− Examples:

729− . level 1

730− .. level 2

731− ... level 3

732− .... level 4

733− ..... level 5

734−

735− Note: The space distinguishes it from a block title.

736− scope: markup.list.numbered.dotted.asciidoc

737− captures:

738− 1: string.unquoted.list.dotted.asciidoc

739− 2: constant.numeric.list.dot.asciidoc

740− passthrough:

741− - match: (\+\+\+|\$\$)

742− comment: |

743− Inline triple-plus and double dolar passthrough.

744−

745− Examples:

746− Lo+++re++++m +++ipsum dolor+++.

747− Lo$$re$$m $$ipsum dolor$$.

748−

749− Note: Must be dead first among the inlines, so as to take priority.

750− captures:

751− 1: constant.character.passthru.begin.asciidoc

752− push:

753− - meta_scope: meta.passthru.inline.asciidoc

754− - meta_content_scope: variable.parameter.passthruinner.asciidoc

755− - match: \1

756− captures:

757− 0: constant.character.passthru.end.asciidoc

758− pop: true

759− replacement:

760− - match: |-

761− (?x)

762− (?<!\\) # must not be escaped

763− (

764− $C$

765− | $TM$

766− | $R$

767− | ((?<!\-)\-\-(?!\-)) # exactly two, and even this may not rule out all that I want to

768− | ((?<!\.)\.\.\.(?!\.)) # exactly three

769− | \->

770− | <\-

771− | =>

772− | <=

773− )

774− scope: constant.character.replacement.asciidoc

775− section_template:

776− - match: |-

777− (?x)^

778− (\[) # in square brackets

779− (template\s*=\s*)?(")? # might start with template-equals and might have template name in quotes

780− (

782− )

783− (".*(\])|(\])) # either close the quote (and perhaps go on) and close the bracket, or close the bracket immediately

784− \s*$\n?

785− comment: fixed list of known template names

786− scope: variable.parameter.sectiontemplate.asciidoc

787− captures:

788− 1: punctuation.definition.sectiontemplate.begin.asciidoc

789− 4: meta.tag.sectiontemplate.asciidoc

790− 6: punctuation.definition.sectiontemplate.end.asciidoc

791− 7: punctuation.definition.sectiontemplate.end.asciidoc

792− section_titles:

793− - include: title_level_5

794− - include: title_level_4

795− - include: title_level_3

796− - include: title_level_2

797− - include: title_level_1

798− - include: title_level_0

799− strong:

800− - match: |-

801− (?x)

802− (\[[^\]]*?\])? # might start with an attributes list

803− (?<=^|\W)(?<!\\|}) # must be preceded by nonword character, and not by escape or } (attribute)

804− (\*)(?=\S) # delimiter star that must be followed by a nonspace character

805− comment: |

806− Strong (bold) text (constrained variant).

807−

808− Examples:

809− *Lorem ipsum* dolor

810− [red]*Lorem ipsum* dolor

811− captures:

812− 1: support.variable.attributelist.asciidoc

813− 2: punctuation.definition.bold.single.begin.asciidoc

814− push:

815− - meta_scope: markup.bold.single.asciidoc

816− - meta_content_scope: meta.boldinner.single.asciidoc

817− - match: |-

818− (?x)

819− (?<=\S)(\*) # delimiter star that must be preceded by a nonspace character

820− (?!\w) # ...and followed by a nonword character

821− captures:

822− 1: punctuation.definition.bold.single.end.asciidoc

823− pop: true

824− - include: emphasis_double

825− - include: monospaced_double

826− - include: mark_double

827− - include: emphasis

828− - include: monospaced

829− - include: mark

830− - include: superscript

831− - include: subscript

832− - include: characters

833− strong_double:

834− - match: |-

835− (?x)

836− (\[[^\]]*?\])? # might start with an attribute list

837− (?<!\\) # must not be preceded by escape

838− (\*\*)

839− comment: |

840− Strong (bold) text (unconstrained variant).

841−

842− Examples:

843− Lo**re**m **ipsum dolor**.

844− Lo[red]**re**m

845− captures:

846− 1: support.variable.attributelist.asciidoc

847− 2: punctuation.definition.bold.double.begin.asciidoc

848− push:

849− - meta_scope: markup.bold.double.asciidoc

850− - meta_content_scope: meta.boldinner.double.asciidoc

851− - match: \*\*

852− captures:

853− 0: punctuation.definition.bold.double.end.asciidoc

854− pop: true

855− - include: emphasis_double

856− - include: monospaced_double

857− - include: mark_double

858− - include: emphasis

859− - include: monospaced

860− - include: mark

861− - include: superscript

862− - include: subscript

863− - include: characters

864− subscript:

865− - match: |-

866− (?x)

867− (\[[^\]]*?\])? # might start with attribute list

868− (?<!\\) # must not be preceded by escape

869− (~)

870− comment: |

871− Subscript text.

872−

873− Examples:

874− E=mc^2^

875− E=mc[red]^2^

876− captures:

877− 1: support.variable.attributelist.asciidoc

878− 2: punctuation.definition.string.subscript.begin.asciidoc

879− push:

880− - meta_scope: string.other.subscript.asciidoc

881− - meta_content_scope: meta.subscriptinner.asciidoc

882− - match: '~' # this tilda a problem if unquoted

883− captures:

884− 0: punctuation.definition.string.subscript.end.asciidoc

885− pop: true

886− - include: strong_double

887− - include: emphasis_double

888− - include: monospaced_double

889− - include: mark_double

890− - include: strong

891− - include: emphasis

892− - include: monospaced

893− - include: mark

894− - include: superscript

895− - include: characters

896− superscript:

897− - match: |-

898− (?x)

899− (\[[^\]]*?\])? # might start with attribute list

900− (?<!\\) # no preceding escape

901− (\^)

902− comment: |

903− Superscript text.

904−

905− Examples:

906− H~2~O

907− H[red]~2~O

908− captures:

909− 1: support.variable.attributelist.asciidoc

910− 2: punctuation.definition.string.superscript.begin.asciidoc

911− push:

912− - meta_scope: string.other.superscript.asciidoc

913− - meta_content_scope: meta.superscriptinner.asciidoc

914− - match: ^

915− captures:

916− 0: punctuation.definition.string.superscript.end.asciidoc

917− pop: true

918− - include: strong_double

919− - include: emphasis_double

920− - include: monospaced_double

921− - include: mark_double

922− - include: strong

923− - include: emphasis

924− - include: monospaced

925− - include: mark

926− - include: subscript

927− - include: characters

928− title_level_0:

929− - match: ^(=) (\w.*)$\n?

930− scope: markup.heading.level.0.asciidoc

931− captures:

932− 1: punctuation.definition.heading.asciidoc

933− 2: entity.name.section.asciidoc

934− title_level_1:

935− - match: ^(==) (\w.*)$\n?

936− scope: markup.heading.level.1.asciidoc

937− captures:

938− 1: punctuation.definition.heading.asciidoc

939− 2: entity.name.section.asciidoc

940− title_level_2:

941− - match: ^(===) (\w.*)$\n?

942− scope: markup.heading.level.2.asciidoc

943− captures:

944− 1: punctuation.definition.heading.asciidoc

945− 2: entity.name.section.asciidoc

946− title_level_3:

947− - match: ^(====) (\w.*)$\n?

948− scope: markup.heading.level.3.asciidoc

949− captures:

950− 1: punctuation.definition.heading.asciidoc

951− 2: entity.name.section.asciidoc

952− title_level_4:

953− - match: ^(=====) (\w.*)$\n?

954− scope: markup.heading.level.4.asciidoc

955− captures:

956− 1: punctuation.definition.heading.asciidoc

957− 2: entity.name.section.asciidoc

958− title_level_5:

959− - match: ^(======) (\w.*)$\n?

960− scope: markup.heading.level.5.asciidoc

961− captures:

962− 1: punctuation.definition.heading.asciidoc

963− 2: entity.name.section.asciidoc

964− ulist_item_marker:

965− - match: '^(\s*(\-|\*{1,5}))\s+(?=\S)'

966− comment: |

967− Marker of an unordered (bullet) list item.

968−

969− Examples:

970− * level 1

971− ** level 2

972− *** level 3

973− **** level 4

974− ***** level 5

975− - level 1

976− -- level 2

977− --- level 3

978− ---- level 4

979− ----- level 5

980− scope: markup.list.bulleted.asciidoc

981− captures:

982− 1: string.unquoted.list.bullet.asciidoc

983− 2: constant.numeric.list.bullet.asciidoc

984− xref:

985− - match: '(?<!<)(<<)([^,]*?)((,\s*)(.*?))?(>>)(?!<)'

986− comment: |

987− Internal cross-reference

988−

989− Examples:

990− <<lorem>>

991− <<lorem, see here>>

992− scope: meta.xref.asciidoc

993− captures:

994− 1: constant.character.xref.begin.asciidoc

995− 2: markup.underline.term.xref.asciidoc

996− 5: variable.parameter.xref.asciidoc

997− 6: constant.character.xref.end.asciidoc

assets/syntaxes/02_Extra/CMakedeleted−1

Submodule changed.

assets/syntaxes/02_Extra/CSV.sublime-syntaxdeleted−78

@@ -1,78 +0,0 @@

1−%YAML 1.2

2−---

3−# See http://www.sublimetext.com/docs/3/syntax.html

4−name: Comma Separated Values

5−file_extensions:

6− - csv

7− - tsv

8−scope: text.csv

9−variables:

10− field_separator: (?:[,;\t])

11− record_separator: (?:$\n?)

12−contexts:

13− prototype:

14− - match: (?={{record_separator}})

15− pop: true

16− fields:

17− - match: ''

18− push:

19− - field_or_record_separator

20− - field4

21− - field_or_record_separator

22− - field3

23− - field_or_record_separator

24− - field2

25− - field_or_record_separator

26− - field1

27− main:

28− - meta_include_prototype: false

29− - match: '^'

30− set: fields

31−

32− field_or_record_separator:

33− - meta_include_prototype: false

34− - match: '{{record_separator}}'

35− scope: punctuation.terminator.record.csv

36− pop: true

37− - match: '{{field_separator}}'

38− scope: punctuation.separator.sequence.csv

39− pop: true

40−

41− field_contents:

42− - match: '"'

43− scope: punctuation.definition.string.begin.csv

44− push: double_quoted_string

45−

46− - match: (?={{field_separator}}|{{record_separator}})

47− pop: true

48−

49− double_quoted_string:

50− - meta_include_prototype: false

51− - meta_scope: string.quoted.double.csv

52− - match: '""'

53− scope: constant.character.escape.csv

54− - match: '"'

55− scope: punctuation.definition.string.end.csv

56− pop: true

57−

58− field1:

59− - match: ''

60− set:

61− - meta_content_scope: meta.field-1.csv support.type

62− - include: field_contents

63− field2:

64− - match: ''

65− set:

66− - meta_content_scope: meta.field-2.csv support.function

67− - include: field_contents

68− field3:

69− - match: ''

70− set:

71− - meta_content_scope: meta.field-3.csv constant.numeric

72− - include: field_contents

73− field4:

74− - match: ''

75− set:

76− - meta_content_scope: meta.field-4.csv keyword.operator

77− - include: field_contents

78−

assets/syntaxes/02_Extra/CoffeeScriptdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/CoffeeScript.sublime-syntaxdeleted−271

@@ -1,271 +0,0 @@

1−%YAML 1.2

2−---

3−# http://www.sublimetext.com/docs/3/syntax.html

4−name: CoffeeScript

5−comment: "CoffeeScript Syntax: version 1"

6−file_extensions:

7− - coffee

8− - Cakefile

9− - coffee.erb

10− - cson

11−first_line_match: ^#!.*\bcoffee

12−scope: source.coffee

13−contexts:

14− main:

15− - match: '($[^()]*?$)\s*([=-]>)'

16− comment: "match stuff like: a -> …"

17− scope: meta.inline.function.coffee

18− captures:

19− 1: variable.parameter.function.coffee

20− 2: storage.type.function.coffee

21− - match: (new)\s+(\w+(?:\.\w*)*)

22− scope: meta.class.instance.constructor

23− captures:

24− 1: keyword.operator.new.coffee

25− 2: support.class.coffee

26− - match: "'''"

27− captures:

28− 0: punctuation.definition.string.begin.coffee

29− push:

30− - meta_scope: string.quoted.heredoc.coffee

31− - match: "'''"

32− captures:

33− 0: punctuation.definition.string.end.coffee

34− pop: true

35− - match: '"""'

36− captures:

37− 0: punctuation.definition.string.begin.coffee

38− push:

39− - meta_scope: string.quoted.double.heredoc.coffee

40− - match: '"""'

41− captures:

42− 0: punctuation.definition.string.end.coffee

43− pop: true

44− - match: \\.

45− scope: constant.character.escape.coffee

46− - include: interpolated_coffee

47− - match: "`"

48− captures:

49− 0: punctuation.definition.string.begin.coffee

50− push:

51− - meta_scope: string.quoted.script.coffee

52− - match: "`"

53− captures:

54− 0: punctuation.definition.string.end.coffee

55− pop: true

56− - match: '\\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)'

57− scope: constant.character.escape.coffee

58− - match: (?<!#)###(?!#)

59− captures:

60− 0: punctuation.definition.comment.coffee

61− push:

62− - meta_scope: comment.block.coffee

63− - match: '###(?:[ \t]*\n)'

64− captures:

65− 0: punctuation.definition.comment.coffee

66− pop: true

67− - match: '@\w*'

68− scope: storage.type.annotation.coffeescript

69− - match: '(#)(?!\{).*$\n?'

70− scope: comment.line.number-sign.coffee

71− captures:

72− 1: punctuation.definition.comment.coffee

73− - match: "/{3}"

74− push:

75− - meta_scope: string.regexp.coffee

76− - match: "/{3}[imgy]{0,4}"

77− pop: true

78− - include: interpolated_coffee

79− - include: embedded_comment

80− - match: '/(?![\s=/*+{}?]).*?[^\\]/[igmy]{0,4}(?![a-zA-Z0-9])'

81− scope: string.regexp.coffee

82− - match: |-

83− (?x)

84− \b(?<![\.\$])(

85− break|by|catch|continue|else|finally|for|in|of|if|return|switch|

87− )(?!\s*:)\b

88− scope: keyword.control.coffee

89− - match: |-

90− (?x)

91− and=|or=|!|%|&|\^|\*|\/|(\-)?\-(?!>)|\+\+|\+|~|==|=(?!>)|!=|<=|>=|<<=|>>=|

92− >>>=|<>|<|>|!|&&|\.\.(\.)?|\?|\||\|\||\:|\*=|(?<!\()/=|%=|\+=|\-=|&=|

93− \^=|\b(?<![\.\$])(instanceof|new|delete|typeof|and|or|is|isnt|not|super)\b

94− scope: keyword.operator.coffee

95− - match: '([a-zA-Z\$_](\w|\$|\.)*\s*(?!\::)((:)|(=[^=]))(?!(\s*$.*$)?\s*((=|-)>)))'

96− scope: variable.assignment.coffee

97− captures:

98− 1: variable.assignment.coffee

99− 4: punctuation.separator.key-value

100− 5: keyword.operator.coffee

101− - match: '(?<=\s|^)([\[\{])(?=.*?[\]\}]\s+[:=])'

102− captures:

103− 0: keyword.operator.coffee

104− push:

105− - meta_scope: meta.variable.assignment.destructured.coffee

106− - match: '([\]\}]\s*[:=])'

107− captures:

108− 0: keyword.operator.coffee

109− pop: true

110− - include: variable_name

111− - include: instance_variable

112− - include: single_quoted_string

113− - include: double_quoted_string

114− - include: numeric

115− - match: |-

116− (?x)

117− (\s*)

118− (?=[a-zA-Z\$_])

119− (

120− [a-zA-Z\$_](\w|\$|:|\.)*\s*

121− (?=[:=](\s*$.*$)?\s*([=-]>))

122− )

123− scope: meta.function.coffee

124− captures:

125− 2: entity.name.function.coffee

126− 3: entity.name.function.coffee

127− 4: variable.parameter.function.coffee

128− 5: storage.type.function.coffee

129− - match: ^\s*(describe|it|app\.(get|post|put|all|del|delete))

130− comment: Show well-known functions from Express and Mocha in Go To Symbol view

131− push:

132− - meta_scope: meta.function.symbols.coffee

133− - match: $

134− pop: true

135− - include: main

136− - match: "[=-]>"

137− scope: storage.type.function.coffee

138− - match: '\b(?<!\.)(true|on|yes)(?!\s*[:=])\b'

139− scope: constant.language.boolean.true.coffee

140− - match: '\b(?<!\.)(false|off|no)(?!\s*[:=])\b'

141− scope: constant.language.boolean.false.coffee

142− - match: '\b(?<!\.)null(?!\s*[:=])\b'

143− scope: constant.language.null.coffee

144− - match: '\b(?<!\.)(this|extends)(?!\s*[:=])\b'

145− scope: variable.language.coffee

146− - match: '(class\b)\s+(@?[a-zA-Z\$_][\w\.]*)?(?:\s+(extends)\s+(@?[a-zA-Z\$\._][\w\.]*))?'

147− scope: meta.class.coffee

148− captures:

149− 1: storage.type.class.coffee

150− 2: entity.name.type.class.coffee

151− 3: keyword.control.inheritance.coffee

152− 4: entity.other.inherited-class.coffee

153− - match: \b(debugger|\\)\b

154− scope: keyword.other.coffee

155− - match: |-

156− (?x)\b(

158− Int(8|16|32|64)Array|Math|Map|Number|

161− )\b

162− scope: support.class.coffee

164− scope: support.function.console.coffee

165− - match: |-

166− (?x)\b(

168− )\b

169− scope: support.function.coffee

170− - match: |-

171− (?x)((?<=\.)(

175− unshift|valueOf

176− ))\b

177− scope: support.function.method.array.coffee

178− - match: |-

179− (?x)((?<=Array\.)(

180− isArray

181− ))\b

182− scope: support.function.static.array.coffee

183− - match: |-

184− (?x)((?<=Object\.)(

187− isnt|keys|preventExtensions|seal

188− ))\b

189− scope: support.function.static.object.coffee

190− - match: |-

191− (?x)((?<=Math\.)(

193− hypot|log|log10|log1p|log2|max|min|pow|random|round|sign|sin|sinh|sqrt|

194− tan|tanh|trunc

195− ))\b

196− scope: support.function.static.math.coffee

197− - match: |-

198− (?x)((?<=Number\.)(

199− is(Finite|Integer|NaN)|toInteger

200− ))\b

201− scope: support.function.static.number.coffee

202− - match: \b(Infinity|NaN|undefined)\b

203− scope: constant.language.coffee

204− - match: \;

205− scope: punctuation.terminator.statement.coffee

206− - match: ',[ |\t]*'

207− scope: meta.delimiter.object.comma.coffee

208− - match: \.

209− scope: meta.delimiter.method.period.coffee

210− - match: '\{|\}'

211− scope: meta.brace.curly.coffee

212− - match: $|$

213− scope: meta.brace.round.coffee

214− - match: '\[|\]\s*'

215− scope: meta.brace.square.coffee

216− - include: instance_variable

217− - include: single_quoted_string

218− - include: double_quoted_string

219− - include: numeric

220− double_quoted_string:

221− - match: '"'

222− captures:

223− 0: punctuation.definition.string.begin.coffee

224− push:

225− - meta_scope: string.quoted.double.coffee

226− - match: '"'

227− captures:

228− 0: punctuation.definition.string.end.coffee

229− pop: true

230− - match: '\\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)'

231− scope: constant.character.escape.coffee

232− - include: interpolated_coffee

233− embedded_comment:

234− - match: (?<!\\)(#).*$\n?

235− scope: comment.line.number-sign.coffee

236− captures:

237− 1: punctuation.definition.comment.coffee

238− instance_variable:

239− - match: '(@)([a-zA-Z_\$]\w*)?'

240− scope: variable.other.readwrite.instance.coffee

241− interpolated_coffee:

242− - match: '\#\{'

243− captures:

244− 0: punctuation.section.embedded.coffee

245− push:

246− - meta_scope: source.coffee.embedded.source

247− - match: '\}'

248− captures:

249− 0: punctuation.section.embedded.coffee

250− pop: true

251− - include: main

252− numeric:

253− - match: '(?<!\$)\b((0([box])[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?(e[+\-]?[0-9]+)?))\b'

254− scope: constant.numeric.coffee

255− single_quoted_string:

256− - match: "'"

257− captures:

258− 0: punctuation.definition.string.begin.coffee

259− push:

260− - meta_scope: string.quoted.single.coffee

261− - match: "'"

262− captures:

263− 0: punctuation.definition.string.end.coffee

264− pop: true

265− - match: '\\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)'

266− scope: constant.character.escape.coffee

267− variable_name:

268− - match: '([a-zA-Z\$_]\w*(\.\w+)*)'

269− scope: variable.assignment.coffee

270− captures:

271− 1: variable.assignment.coffee

assets/syntaxes/02_Extra/CpuInfo.sublime-syntaxdeleted−14

@@ -1,14 +0,0 @@

1−%YAML 1.2

2−---

3−# http://www.sublimetext.com/docs/3/syntax.html

4−name: CpuInfo

5−file_extensions:

6− - cpuinfo

7−scope: source.cpuinfo

8−

9−contexts:

10− main:

11− - match: '^([^:]+)\w*:\w*(.*)$'

12− captures:

13− 1: keyword.other.cpuinfo-key

14− 2: string.other.cpuinfo-value

assets/syntaxes/02_Extra/Crystaldeleted−1

Submodule changed.

assets/syntaxes/02_Extra/Dartdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/Dart.sublime-syntaxdeleted−211

@@ -1,211 +0,0 @@

1−%YAML 1.2

2−---

3−# http://www.sublimetext.com/docs/syntax.html

4−name: Dart

5−file_extensions:

6− - dart

7−scope: source.dart

8−contexts:

9− main:

10− - match: ^(#!.*)$

11− scope: meta.preprocessor.script.dart

12− - match: ^\w*\b(library|import|part of|part|export)\b

13− captures:

14− 0: keyword.other.import.dart

15− push:

16− - meta_scope: meta.declaration.dart

17− - match: ;

18− captures:

19− 0: punctuation.terminator.dart

20− pop: true

21− - include: strings

22− - include: comments

23− - match: \b(as|show|hide)\b

24− scope: keyword.other.import.dart

25− - include: comments

26− - include: punctuation

27− - include: annotations

28− - include: keywords

29− - include: constants-and-special-vars

30− - include: strings

31− annotations:

32− - match: '@[a-zA-Z]+'

33− scope: storage.type.annotation.dart

34− comments:

35− - match: /\*\*/

36− scope: comment.block.empty.dart

37− captures:

38− 0: punctuation.definition.comment.dart

39− - include: comments-doc-oldschool

40− - include: comments-doc

41− - include: comments-inline

42− comments-block:

43− - match: /\*

44− push:

45− - meta_scope: comment.block.dart

46− - match: \*/

47− pop: true

48− - include: comments-block

49− comments-doc:

50− - match: ///

51− push:

52− - meta_scope: comment.block.documentation.dart

53− - match: .*

54− pop: true

55− - include: dartdoc

56− comments-doc-oldschool:

57− - match: /\*\*

58− push:

59− - meta_scope: comment.block.documentation.dart

60− - match: \*/

61− pop: true

62− - include: comments-doc-oldschool

63− - include: comments-block

64− - include: dartdoc

65− comments-inline:

66− - include: comments-block

67− - match: ((//).*)$

68− captures:

69− 1: comment.line.double-slash.dart

70− constants-and-special-vars:

71− - match: (?<!\$)\b(true|false|null)\b(?!\$)

72− scope: constant.language.dart

73− - match: (?<!\$)\b(this|super)\b(?!\$)

74− scope: variable.language.dart

75− - match: '(?<!\$)\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)\b(?!\$)'

76− scope: constant.numeric.dart

78− scope: support.class.dart

79− - match: '([_$]*[a-z][a-zA-Z0-9_$]*)(<|\(|\s+=>)'

80− captures:

81− 1: entity.name.function.dart

82− dartdoc:

83− - match: '(\[.*?\])'

84− captures:

85− 0: variable.name.source.dart

86− - match: '^ {4,}(?![ \*]).*'

87− captures:

88− 0: variable.name.source.dart

89− - match: '```.*?$'

90− push:

91− - meta_content_scope: variable.other.source.dart

92− - match: '```'

93− pop: true

94− - match: (`.*?`)

95− captures:

96− 0: variable.other.source.dart

97− - match: (`.*?`)

98− captures:

99− 0: variable.other.source.dart

100− - match: (\* (( ).*))$

101− captures:

102− 2: variable.other.source.dart

103− - match: (\* .*)$

104− keywords:

105− - match: (?<!\$)\bas\b(?!\$)

106− scope: keyword.cast.dart

108− scope: keyword.control.catch-exception.dart

110− scope: keyword.control.dart

111− - match: (?<!\$)\b(sync(\*)?|async(\*)?|await|yield(\*)?)\b(?!\$)

112− scope: keyword.control.dart

113− - match: (?<!\$)\bassert\b(?!\$)

114− scope: keyword.control.dart

115− - match: (?<!\$)\b(new)\b(?!\$)

116− scope: keyword.control.new.dart

118− scope: keyword.declaration.dart

119− - match: (?<!\$)\b(is\!?)\b(?!\$)

120− scope: keyword.operator.dart

121− - match: '\?|:'

122− scope: keyword.operator.ternary.dart

123− - match: (<<|>>>?|~|\^|\||&)

124− scope: keyword.operator.bitwise.dart

125− - match: ((&|\^|\||<<|>>>?)=)

126− scope: keyword.operator.assignment.bitwise.dart

127− - match: (=>)

128− scope: keyword.operator.closure.dart

129− - match: (==|!=|<=?|>=?)

130− scope: keyword.operator.comparison.dart

131− - match: '(([+*/%-]|\~)=)'

132− scope: keyword.operator.assignment.arithmetic.dart

133− - match: (=)

134− scope: keyword.operator.assignment.dart

135− - match: (\-\-|\+\+)

136− scope: keyword.operator.increment-decrement.dart

137− - match: (\-|\+|\*|\/|\~\/|%)

138− scope: keyword.operator.arithmetic.dart

139− - match: (!|&&|\|\|)

140− scope: keyword.operator.logical.dart

141− - match: (?<!\$)\b(static|final|const)\b(?!\$)

142− scope: storage.modifier.dart

143− - match: (?<!\$)\b(?:void|var)\b(?!\$)

144− scope: storage.type.primitive.dart

145− punctuation:

146− - match: ','

147− scope: punctuation.comma.dart

148− - match: ;

149− scope: punctuation.terminator.dart

150− - match: \.

151− scope: punctuation.dot.dart

152− string-interp:

153− - match: '\$((\w+)|\{([^{}]+)\})'

154− captures:

155− 2: variable.parameter.dart

156− 3: variable.parameter.dart

157− - match: \\.

158− scope: constant.character.escape.dart

159− strings:

160− - match: (?<!r)"""

161− push:

162− - meta_scope: string.interpolated.triple.double.dart

163− - match: '"""(?!")'

164− pop: true

165− - include: string-interp

166− - match: (?<!r)'''

167− push:

168− - meta_scope: string.interpolated.triple.single.dart

169− - match: '''''''(?!'')'

170− pop: true

171− - include: string-interp

172− - match: r"""

173− push:

174− - meta_scope: string.quoted.triple.double.dart

175− - match: '"""(?!")'

176− pop: true

177− - match: r'''

178− push:

179− - meta_scope: string.quoted.triple.single.dart

180− - match: '''''''(?!'')'

181− pop: true

182− - match: (?<!\|r)"

183− push:

184− - meta_scope: string.interpolated.double.dart

185− - match: '"'

186− pop: true

187− - match: \n

188− scope: invalid.string.newline

189− - include: string-interp

190− - match: r"

191− push:

192− - meta_scope: string.quoted.double.dart

193− - match: '"'

194− pop: true

195− - match: \n

196− scope: invalid.string.newline

197− - match: (?<!\|r)'

198− push:

199− - meta_scope: string.interpolated.single.dart

200− - match: "'"

201− pop: true

202− - match: \n

203− scope: invalid.string.newline

204− - include: string-interp

205− - match: r'

206− push:

207− - meta_scope: string.quoted.single.dart

208− - match: "'"

209− pop: true

210− - match: \n

211− scope: invalid.string.newline

assets/syntaxes/02_Extra/DotENVdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/Elixirdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/Elmdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/Emaildeleted−1

Submodule changed.

assets/syntaxes/02_Extra/FSharpdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/Fishdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/Fortrandeleted−1

Submodule changed.

assets/syntaxes/02_Extra/GLSLdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/GraphQLdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/Groffdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/JavaScript (Babel)deleted−1

Submodule changed.

assets/syntaxes/02_Extra/Juliadeleted−1

Submodule changed.

assets/syntaxes/02_Extra/LESSdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/LLVMdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/Leandeleted−1

Submodule changed.

assets/syntaxes/02_Extra/Lean.sublime-syntaxdeleted−125

@@ -1,125 +0,0 @@

1−%YAML 1.2

2−---

3−# http://www.sublimetext.com/docs/3/syntax.html

4−name: Lean

5−file_extensions:

6− - lean

7−scope: source.lean

8−contexts:

9− main:

10− - include: comments

11− - match: '\b(?<!\.)(inductive|coinductive|structure|theorem|axiom|axioms|abbreviation|lemma|definition|def|instance|class|constant)\b\s+(\{[^}]*\})?'

12− captures:

13− 1: keyword.other.definitioncommand.lean

14− push:

15− - meta_scope: meta.definitioncommand.lean

16− - match: '(?=\bwith\b|\bextends\b|[:\|\(\[\{⦃<>])'

17− pop: true

18− - include: comments

19− - include: definitionName

20− - match: ","

21− - match: \b(Prop|Type|Sort)\b

22− scope: storage.type.lean

23− - match: '\battribute\b\s*\[[^\]]*\]'

24− scope: storage.modifier.lean

25− - match: '@\[[^\]]*\]'

26− scope: storage.modifier.lean

27− - match: \b(?<!\.)(private|meta|mutual|protected|noncomputable)\b

28− scope: keyword.control.definition.modifier.lean

29− - match: \b(sorry)\b

30− scope: invalid.illegal.lean

32− scope: keyword.other.command.lean

34− scope: keyword.other.command.lean

36− scope: keyword.other.lean

38− scope: keyword.other.lean

39− - match: «

40− push:

41− - meta_content_scope: entity.name.lean

42− - match: »

43− pop: true

44− - match: \b(?<!\.)(if|then|else)\b

45− scope: keyword.control.lean

46− - match: '"'

47− captures:

48− 0: punctuation.definition.string.begin.lean

49− push:

50− - meta_scope: string.quoted.double.lean

51− - match: '"'

52− captures:

53− 0: punctuation.definition.string.end.lean

54− pop: true

55− - match: '\\[\\"nt'']'

56− scope: constant.character.escape.lean

57− - match: '\\x[0-9A-Fa-f][0-9A-Fa-f]'

58− scope: constant.character.escape.lean

59− - match: '\\u[0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f]'

60− scope: constant.character.escape.lean

61− - match: '''[^\\'']'''

62− scope: string.quoted.single.lean

63− - match: '''(\\(x..|u....|.))'''

64− scope: string.quoted.single.lean

65− captures:

66− 1: constant.character.escape.lean

67− - match: '`+[^\[(]\S+'

68− scope: entity.name.lean

69− - match: '\b([0-9]+|0([xX][0-9a-fA-F]+))\b'

70− scope: constant.numeric.lean

71− blockComment:

72− - match: /-

73− push:

74− - meta_scope: comment.block.lean

75− - match: "-/"

76− pop: true

77− - include: scope:source.lean.markdown

78− - include: blockComment

79− comments:

80− - include: dashComment

81− - include: docComment

82− - include: stringBlock

83− - include: modDocComment

84− - include: blockComment

85− dashComment:

86− - match: (--)

87− captures:

88− 0: punctuation.definition.comment.lean

89− push:

90− - meta_scope: comment.line.double-dash.lean

91− - match: $

92− pop: true

93− - include: scope:source.lean.markdown

94− definitionName:

95− - match: '\b[^:«»\{\}[:space:]=→λ∀?][^:«»\{\}[:space:]]*'

96− scope: entity.name.function.lean

97− - match: «

98− push:

99− - meta_content_scope: entity.name.function.lean

100− - match: »

101− pop: true

102− docComment:

103− - match: /--

104− push:

105− - meta_scope: comment.block.documentation.lean

106− - match: "-/"

107− pop: true

108− - include: scope:source.lean.markdown

109− - include: blockComment

110− modDocComment:

111− - match: /-!

112− push:

113− - meta_scope: comment.block.documentation.lean

114− - match: "-/"

115− pop: true

116− - include: scope:source.lean.markdown

117− - include: blockComment

118− stringBlock:

119− - match: /-"

120− push:

121− - meta_scope: comment.block.string.lean

122− - match: '"-/'

123− pop: true

124− - include: scope:source.lean.markdown

125− - include: blockComment

assets/syntaxes/02_Extra/LiveScriptdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/LiveScript.sublime-syntaxdeleted−400

@@ -1,400 +0,0 @@

1−%YAML 1.2

2−---

3−# http://www.sublimetext.com/docs/3/syntax.html

4−name: LiveScript

5−comment: "LiveScript Syntax: version 1"

6−file_extensions:

7− - ls

8− - Slakefile

9− - ls.erb

10−first_line_match: ^#!.*\bls

11−scope: source.livescript

12−contexts:

13− main:

14− - match: |-

15− (?x)

16− !?[~-]{1,2}>\*?

17− |<[~-]{1,2}!?

18− |\(\s* (?= instanceof[\s)]|and[\s)]|or[\s)]|is[\s)]|isnt[\s)]|in[\s)]|import[\s)]|import\ all[\s)] |\.|[-+/*%^&<>=|][\b\s)\w$]|\*\*|\%\%)

19− | (?<=[\s(]instanceof|[\s(]and|[\s(]or|[\s(]is|[\s(]isnt|[\s(]in|[\s(]import|[\s(]import\ all|[\s(]do|\.|\*\*|\%\%|[\b\s(\w$][-+/*%^&<>=|]) \s*\)

20− scope: storage.type.function.livescript

21− - match: \/\*

22− captures:

23− 0: punctuation.definition.comment.livescript

24− push:

25− - meta_scope: comment.block.livescript

26− - match: \*\/

27− captures:

28− 0: punctuation.definition.comment.livescript

29− pop: true

30− - match: '@\w*'

31− scope: storage.type.annotation.livescriptscript

32− - match: '(#)(?!\{).*$\n?'

33− scope: comment.line.number-sign.livescript

34− captures:

35− 1: punctuation.definition.comment.livescript

36− - match: '((?:!|~|!~|~!)?function\*?)\s+([$\w\-]*[$\w]+)'

37− captures:

38− 1: storage.type.function.livescript

39− 2: entity.name.function.livescript

40− - match: (new)\s+(\w+(?:\.\w*)*)

41− captures:

42− 1: keyword.operator.new.livescript

43− 2: entity.name.type.instance.livescript

45− scope: keyword.illegal.livescript

46− - match: "'''"

47− captures:

48− 0: punctuation.definition.string.begin.livescript

49− push:

50− - meta_scope: string.quoted.heredoc.livescript

51− - match: "'''"

52− captures:

53− 0: punctuation.definition.string.end.livescript

54− pop: true

55− - match: '"""'

56− captures:

57− 0: punctuation.definition.string.begin.livescript

58− push:

59− - meta_scope: string.quoted.double.heredoc.livescript

60− - match: '"""'

61− captures:

62− 0: punctuation.definition.string.end.livescript

63− pop: true

64− - match: \\.

65− scope: constant.character.escape.livescript

66− - include: interpolated_livescript

67− - match: "``"

68− captures:

69− 0: punctuation.definition.string.begin.livescript

70− push:

71− - meta_scope: string.quoted.script.livescript

72− - match: "``"

73− captures:

74− 0: punctuation.definition.string.end.livescript

75− pop: true

76− - match: '\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)'

77− scope: constant.character.escape.livescript

78− - match: '<\['

79− push:

80− - meta_scope: string.array-literal.livescript

81− - match: '\]>'

82− pop: true

83− - match: '/{2}(?![\s=/*+{}?]).*?[^\\]/[igmy]{0,4}(?![a-zA-Z0-9])/{2}'

84− scope: string.regexp.livescript

85− - match: '/{2}\n'

86− push:

87− - meta_scope: string.regexp.livescript

88− - match: "/{2}[imgy]{0,4}"

89− pop: true

90− - include: embedded_spaced_comment

91− - include: interpolated_livescript

92− - match: "/{2}"

93− push:

94− - meta_scope: string.regexp.livescript

95− - match: "/{2}[imgy]{0,4}"

96− pop: true

97− - match: '\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)'

98− scope: constant.character.escape.livescript

99− - include: interpolated_livescript

100− - match: '/(?![\s=/*+{}?]).*?[^\\]/[igmy]{0,4}(?![a-zA-Z0-9])'

101− scope: string.regexp.livescript

102− - match: |-

103− (?x)

104− \b(?<![\.\$\-@])(

105− instanceof|new|delete|typeof|and|or|is|isnt|not

106− )(?!\-|\s*:)\b

107− scope: keyword.operator.livescript

108− - match: <\||\|>

109− scope: keyword.operator.livescript

110− - match: "=>"

111− scope: keyword.control.livescript

112− - match: |-

113− (?x)

114− \b(?<![\.\$\-@])(?:

115− return|break|continue|throw

116− |try|if|while|for|for\s+own|switch|unless|until

118− |yield

119− )(?!\-|\s*:)\b

120− scope: keyword.control.livescript

121− - match: |-

122− (?x)

123− and=|or=|%|&|\^|\*|\/|(?<![a-zA-Z$_])(\-)?\-(?!\-?>)|\+\+|\+|

124− ~(?!~?>)|==|=|!=|<=|>=|<<=|>>=|

125− >>>=|<>|<(?!\[)|(?<!\])>|(?<!\w)!(?!([~\-]+)?>)|&&|\.\.(\.)?|\s\.\s|\?|\|\||\:|\*=|(?<!\()/=|%=|\+=|\-=|\.=|&=

126− |\^=

127− scope: keyword.operator.livescript

128− - match: |-

129− (?x)

130− \b(?<![\.\$\-@])(?:

131− function

132− )(?!\-|\s*:)\b

133− scope: storage.type.function.livescript

134− - match: |-

135− (?x)

136− \b(?<![\.\$\-@])(?:

137− this|throw|then|try|typeof!?|til|to

139− |in|instanceof|import|import\s+all|implements|if|is

140− |default|delete|debugger|do

142− |super|switch

144− |and|arguments

145− |new|not

146− |unless|until

147− |while|with|when

148− |of|or|otherwise

149− |let|var|loop

150− |match

151− |by|yield

152− )(?!\-|\s*:)\b

153− scope: keyword.other.livescript

154− - match: '([a-zA-Z\$_](?:[\w$.-])*)\s*(?!\::)((:)|(=(?!>)))\s*(?!(\s*!?\s*$.*$)?\s*(!?[~-]{1,2}>\*?))'

155− captures:

156− 1: variable.assignment.livescript

157− 3: punctuation.separator.key-value, keyword.operator.livescript

158− 4: keyword.operator.livescript

159− - match: '(?<=\s|^)([\[\{])(?=.*?[\]\}]\s+[:=])'

160− captures:

161− 0: keyword.operator.livescript

162− push:

163− - meta_scope: meta.variable.assignment.destructured.livescript

164− - match: '([\]\}]\s*[:=])'

165− captures:

166− 0: keyword.operator.livescript

167− pop: true

168− - include: variable_name

169− - include: instance_variable

170− - include: single_quoted_string

171− - include: double_quoted_string

172− - include: numeric

173− - match: |-

174− (?x)

175− (\s*)

176− (?=[a-zA-Z\$_])

177− ([a-zA-Z\$_]([\w$.:-])*)\s*

178− (?=[:=](\s*!?\s*$.*$)?\s*(!?[~-]{1,2}>\*?))

179− scope: meta.function.livescript

180− captures:

181− 2: entity.name.function.livescript

182− 3: entity.name.function.livescript

183− 4: variable.parameter.function.livescript

184− 5: storage.type.function.livescript

185− - match: \b(?<!\.)(true|on|yes)(?!\s*:)\b

186− scope: constant.language.boolean.true.livescript

187− - match: \b(?<!\.)(false|off|no)(?!\s*:)\b

188− scope: constant.language.boolean.false.livescript

189− - match: \b(?<!\.)(null|void)(?!\s*:)\b

190− scope: constant.language.null.livescript

191− - match: \b(?<!\.)(super|this|extends)(?!\s*:)\b

192− scope: variable.language.livescript

193− - match: '(class\b)\s+(@?[a-zA-Z$_][\w$.-]*)?(?:\s+(extends)\s+(@?[a-zA-Z$_][\w$.-]*))?'

194− scope: meta.class.livescript

195− captures:

196− 1: storage.type.class.livescript

197− 2: entity.name.type.class.livescript

198− 3: keyword.control.inheritance.livescript

199− 4: entity.other.inherited-class.livescript

200− - match: \b(debugger|\\)\b

201− scope: keyword.other.livescript

202− - match: |-

203− (?x)\b(

205− Int(8|16|32|64)Array|Math|Map|Number|

208− )\b

209− scope: support.class.livescript

210− - match: \b(console)\b

211− scope: entity.name.type.object.livescript

212− - match: \b(Infinity|NaN|undefined)\b

213− scope: constant.language.livescript

214− - match: \;

215− scope: punctuation.terminator.statement.livescript

216− - match: ',[ |\t]*'

217− scope: meta.delimiter.object.comma.livescript

218− - match: \.

219− scope: meta.delimiter.method.period.livescript

220− - match: '\{|\}'

221− scope: meta.brace.curly.livescript

222− - match: $|$

223− scope: meta.brace.round.livescript

224− - match: '\[|\]\s*'

225− scope: meta.brace.square.livescript

226− - include: instance_variable

227− - include: backslash_string

228− - include: single_quoted_string

229− - include: double_quoted_string

230− - include: numeric

231− - match: '()(@|@@|[$\w\-]*[$\w]+)\s*(`)'

232− captures:

233− 1: keyword.operator.livescript

234− 2: meta.function-call.livescript

235− 3: keyword.operator.livescript

236− - match: "`"

237− scope: keyword.operator.livescript

238− - match: '()(@|@@|[$\w\-]*[$\w]+)(?:(\??\!)|[(])'

239− captures:

240− 1: keyword.operator.livescript

241− 2: meta.function-call.livescript

242− 3: keyword.operator.livescript

243− - match: '(@|@@|[$\w\-]*[$\w]+)(\?)? (?!\s*(((by|of|and|or|with|when|unless|if|is|isnt|else|nobreak|for|from|not in|in|catch|til|to|then|import|extends|implements|instanceof)\b)|[=:.*\/+\-%\^<>][ =)]|[`}%*)]|/(?!.*?/)|&&|[.][^.]|=>|\/ +|\||\|\||\-\-|\+\+|\|>|<|\||$|\n|\#|/\*))'

244− captures:

245− 1: meta.function-call.livescript

246− 2: keyword.operator.livescript

247− - match: \| _

248− scope: keyword.control.livescript

249− - match: '\|(?![.])'

250− scope: keyword.control.livescript

251− - match: \|

252− scope: keyword.operator.livescript

254− scope: support.function.console.livescript

255− - match: |-

256− (?x)\b(

258− )\b

259− scope: support.function.livescript

260− - match: |-

261− (?x)(?<![.-])\b(

270− sort(With|-with|By|-by)?|group(By|-by)|break(List|-list|Str|-str)|

272− lines|unlines|words|unwords|max|min|negate|abs|signum|quot|rem|div|mod|

273− recip|pi|tau|exp|sqrt|ln|pow|sin|cos|tan|asin|acos|atan|atan2|truncate|

275− )\b(?![.-])

276− comment: |

277− Generated by DOM query from http://gkz.github.com/prelude-ls/:

278− [].slice

279− .call(document.querySelectorAll(".nav-pills li a"))

280− .map(function(_) {return _.innerText})

281− .filter(function(_) {return _.trim() !== '})

282− .slice(2)

283− .join("|")

284− scope: support.function.prelude.livescript

285− - match: '(?x)(?<![.-])\b(that|it|e|_)\b'

286− scope: support.function.semireserved.livescript

287− - match: |-

288− (?x)((?<=(\.|\]|\)))(

292− map|of|pop|property(Is|-is)(Enumerable|-enumerable)|push|

295− ))\b(?!-)

296− scope: support.function.method.array.livescript

297− - match: |-

298− (?x)((?<=Array\.)(

299− isArray

300− ))\b

301− scope: support.function.static.array.livescript

302− - match: |-

303− (?x)((?<=Object\.)(

305− get(Own|-own)(Property|-property)(Descriptors?|Names)|

306− get(Property|-property)(Descriptor|Names)|getPrototypeOf|

308− keys|prevent(Extensions|-extensions)|seal

309− ))\b

310− scope: support.function.static.object.livescript

311− - match: |-

312− (?x)((?<=Math\.)(

314− hypot|log|log10|log1p|log2|max|min|pow|random|round|sign|sin|sinh|sqrt|

315− tan|tanh|trunc

316− ))\b

317− scope: support.function.static.math.livescript

318− - match: |-

319− (?x)((?<=Number\.)(

320− is(Finite|Integer|NaN)|to(Integer|-integer)

321− ))\b

322− scope: support.function.static.number.livescript

323− - match: '[\$\w][\w-]*'

324− scope: variable.other.livescript

325− backslash_string:

326− - match: '\$[\$\s,\};\]])?'

327− captures:

328− 0: string.quoted.single.livescript

329− push:

330− - meta_content_scope: string.quoted.single.livescript

331− - match: '([\\)\s,\};\]])'

332− captures:

333− 0: punctuation.definition.string.end.livescript

334− pop: true

335− constructor_variable:

336− - match: '([a-zA-Z$_][\w$-]*)(@{2})([a-zA-Z$_][\w$-]*)?'

337− scope: variable.other.readwrite.constructor.livescript

338− double_quoted_string:

339− - match: '"'

340− captures:

341− 0: punctuation.definition.string.begin.livescript

342− push:

343− - meta_scope: string.quoted.double.livescript

344− - match: '"'

345− captures:

346− 0: punctuation.definition.string.end.livescript

347− pop: true

348− - match: '\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)'

349− scope: constant.character.escape.livescript

350− - include: interpolated_livescript

351− embedded_comment:

352− - match: (?<!\\)(#).*$\n

353− scope: comment.line.number-sign.livescript

354− captures:

355− 1: punctuation.definition.comment.livescript

356− embedded_spaced_comment:

357− - match: (?<!\\)(#\s).*$\n

358− scope: comment.line.number-sign.livescript

359− captures:

360− 1: punctuation.definition.comment.livescript

361− instance_variable:

362− - match: '(?<![$\w\-])(@)'

363− scope: variable.other.readwrite.instance.livescript

364− interpolated_livescript:

365− - match: '\#\{'

366− captures:

367− 0: punctuation.section.embedded.livescript

368− push:

369− - meta_scope: source.livescript.embedded.source

370− - match: '\}'

371− captures:

372− 0: punctuation.section.embedded.livescript

373− pop: true

374− - include: main

375− - match: '\#'

376− push:

377− - meta_scope: source.livescript.embedded.source.simple

378− - match: ""

379− pop: true

380− - include: main

381− numeric:

382− - match: '(?<![\$@a-zA-Z_])(([0-9]+r[0-9_]+)|((16r|0[xX])[0-9a-fA-F_]+)|([0-9]+(\.[0-9]+[0-9_]*)?(e[+\-]?[0-9_]+)?)[_a-zA-Z0-9]*)'

383− scope: constant.numeric.livescript

384− single_quoted_string:

385− - match: "'"

386− captures:

387− 0: punctuation.definition.string.begin.livescript

388− push:

389− - meta_scope: string.quoted.single.livescript

390− - match: "'"

391− captures:

392− 0: punctuation.definition.string.end.livescript

393− pop: true

394− - match: '\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)'

395− scope: constant.character.escape.livescript

396− variable_name:

397− - match: '([a-zA-Z\$_][\w$-]*(\.\w+)*)(?!\-)'

398− scope: variable.assignment.livescript

399− captures:

400− 1: variable.assignment.livescript

assets/syntaxes/02_Extra/Manpage.sublime-syntaxdeleted−171

@@ -1,171 +0,0 @@

1−%YAML 1.2

2−---

3−# http://www.sublimetext.com/docs/3/syntax.html

4−name: Manpage

5−file_extensions:

6− - man

7−scope: source.man

8−

9−variables:

10− section_heading: '^(?!#)\S.*$'

11− command_line_option: '(--?[A-Za-z0-9][_A-Za-z0-9-]*)'

12−

13−contexts:

14− prototype:

15− # ignore syntax test lines

16− - match: '^#'

17− push:

18− - meta_scope: comment.syntax-test.man

19− - match: $\n?

20− pop: true

21− main:

22− - match: ^

23− push: first_line

24−

25− first_line:

26− - match: '([A-Z0-9_\-]+)($)([^)]+)($)\s*'

27− captures:

28− 1: meta.preprocessor.man

29− 2: keyword.operator.man

30− 3: string.quoted.other.man

31− 4: keyword.operator.man

32− push:

33− - match: (?:[\w'-]+|\s(?!\s))

34− scope: markup.heading.title.man

35− - match: \s\s

36− pop: true

37− - match: '(?=\S|$)'

38− pop: true

39−

40− - match: '$'

41− set: body

42−

43− body:

44− # English, ..., ..., ..., Russian, ...

45−

47− scope: markup.heading.synopsis.man

48− embed: synopsis

49− escape: '(?={{section_heading}})'

50−

51− - match: '^(?:USAGE)'

52− scope: markup.heading.synopsis.man

53− embed: synopsis

54− escape: '(?={{section_heading}})'

55−

56− - match: '{{section_heading}}'

57− scope: markup.heading.other.man

58− embed: options # some man pages put command line options under the description heading

59− escape: '(?={{section_heading}})'

60−

61− function-call:

62− - match: '\b([A-Za-z0-9_\-]+\.)?([A-Za-z0-9_\-]+)($)([^)]*)($)'

63− captures:

64− 1: entity.name.function.man

65− 2: entity.name.function.man

66− 3: keyword.operator.man

67− 4: constant.numeric.man

68− 5: keyword.operator.man

69−

70− env-var:

71− - match: '(\$)(?!\d)(\w+)\b'

72− captures:

73− 1: punctuation.definition.variable.man

74− 2: constant.other.man

75−

76− options:

77− # command-line options like --option=value, --some-flag, or -x

78− - match: '^[ ]{7}(?=-)'

79− push: expect-command-line-option

80− - match: '(?:[^a-zA-Z0-9_-]|^|\s){{command_line_option}}'

81− captures:

82− 1: entity.name.command-line-option

83− push:

84− - match: '='

85− scope: keyword.operator.man

86− set:

87− - match: '[^],.() ]+'

88− scope: variable.parameter.man

89− pop: true

90− - match: $

91− pop: true

92− - match: ''

93− pop: true

94− - include: function-call

95− - include: c-code

96− - include: env-var

97−

98− expect-command-line-option:

99− - match: '[A-Za-z0-9-]+'

100− scope: entity.name.command-line-option.man

101− - match: '(\[)(=)'

102− captures:

103− 1: punctuation.section.brackets.begin.man

104− 2: keyword.operator.man

105− push: [command-line-option-or-pipe, expect-parameter]

106− - match: '\['

107− push:

108− - meta_scope: entity.name.command-line-option.man

109− - match: '\]'

110− pop: true

111− - match: '='

112− scope: keyword.operator.man

113− push: expect-parameter

114− - match: (?=.*\.)

115− pop: true

116− - match: '\s'

117− push: expect-parameter

118− - match: '(,)\s*'

119− captures:

120− 1: punctuation.separator.man

121− - match: $|(?=\])

122− pop: true

123−

124− expect-parameter:

125− - match: '[A-Za-z0-9-]+'

126− scope: variable.parameter.man

127− - match: (?=\s+\|)

128− pop: true

129− - match: \|

130− scope: keyword.operator.logical.man

131− - match: '\['

132− scope: punctuation.section.brackets.begin.man

133− push:

134− - match: '\]'

135− scope: punctuation.section.brackets.end.man

136− pop: true

137− - include: expect-parameter

138− - match: '$|(?=[],]|{{command_line_option}})'

139− pop: true

140−

141− c-code:

142− - match: '^(?=\s+(?:#include\b|#define\b|/\*|struct\s+(\w+\s*)?\{))'

143− embed: scope:source.c

144− #embed_scope: source.c.embedded.man

145− #escape: ^(?!#|\1|\s*(?:$|/\*|#include\b|#define\b))

146− escape: ^(?=\s*(?:$.*\.$\s*$|[A-Z](?![A-Z])))

147−

148− synopsis:

149− - include: c-code

150− - match: \[

151− scope: punctuation.section.brackets.begin.man

152− push: command-line-option-or-pipe

153− - include: options

154−

155− command-line-option-or-pipe:

156− - match: (\|)\s*

157− captures:

158− 1: keyword.operator.logical.man

159− #- match: (?={{command_line_option}})

160− - match: \w+-\w+

161− - match: (?=-)

162− push:

163− - match: (?=\s*\|)

164− pop: true

165− - include: expect-command-line-option

166− - match: \]

167− scope: punctuation.section.brackets.end.man

168− pop: true

169− - match: \[

170− scope: punctuation.section.brackets.begin.man

171− push: command-line-option-or-pipe

assets/syntaxes/02_Extra/MediaWikideleted−1

Submodule changed.

assets/syntaxes/02_Extra/MemInfo.sublime-syntaxdeleted−14

@@ -1,14 +0,0 @@

1−%YAML 1.2

2−---

3−# http://www.sublimetext.com/docs/3/syntax.html

4−name: MemInfo

5−file_extensions:

6− - meminfo

7−scope: source.meminfo

8−

9−contexts:

10− main:

11− - match: '^([^:]+)\w*:\w*(.*)$'

12− captures:

13− 1: keyword.other.meminfo-key

14− 2: string.other.meminfo-value

assets/syntaxes/02_Extra/Nginxdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/Ninjadeleted−1

Submodule changed.

assets/syntaxes/02_Extra/Ninja.sublime-syntaxdeleted−52

@@ -1,52 +0,0 @@

1−%YAML 1.2

2−---

3−# http://www.sublimetext.com/docs/3/syntax.html

4−name: Ninja

5−file_extensions:

6− - ninja

7−scope: source.ninja

8−contexts:

9− main:

10− - match: (#).*$\n?

11− comment: Comment line.

12− scope: comment.line.number-sign.ninja

13− captures:

14− 1: punctuation.definition.comment.ninja

15− - match: ^(rule)\b

16− comment: Rule keyword and keywords for a rule.

17− captures:

18− 1: keyword.other.ninja

19− push:

20− - match: ^(?=\S)

21− pop: true

22− - include: main

24− scope: keyword.other.ninja

25− - match: ^(pool)\b

26− comment: Pool keyword and keywords for a pool.

27− captures:

28− 1: keyword.other.ninja

29− push:

30− - match: ^(?=\S)

31− pop: true

32− - include: main

33− - match: \b(?:depth)\b

34− scope: keyword.other.ninja

35− - match: ^(?:build|rule|default|include|subninja)\b

36− comment: Other Keywords.

37− scope: keyword.other.ninja

38− - match: '(?:[=:]|\|{1,2})(?=\s)'

39− comment: Operators for variable assignment (=), rule definition (:), implicit (|) and order only (||) dependencies.

40− scope: keyword.operator.ninja

41− - match: \$$

42− comment: Line wrap.

43− scope: keyword.operator.ninja

44− - match: \$\$

45− comment: Dollar literal.

46− scope: keyword.operator.ninja

47− - match: '\$[[:alnum:]_-]+'

48− comment: Simple variables, e.g. $var.

49− scope: variable.other.ninja

50− - match: '\${[[:alnum:]_.-]+}'

51− comment: "Variables, e.g. ${some.var.name}."

52− scope: variable.other.ninja

assets/syntaxes/02_Extra/Nixdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/PowerShelldeleted−1

Submodule changed.

assets/syntaxes/02_Extra/QMLdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/QML.sublime-syntaxdeleted−103

@@ -1,103 +0,0 @@

1−%YAML 1.2

2−---

3−# http://www.sublimetext.com/docs/3/syntax.html

4−name: QML

5−file_extensions:

6− - qml

7− - qmlproject

8−scope: source.qml

9−contexts:

10− main:

11− - match: /\*(?!/)

12− comment: Block comment.

13− push:

14− - meta_scope: comment.block.documentation.qml

15− - match: \*/

16− pop: true

17− - match: //.*$

18− comment: Line comment.

19− scope: comment.line.double-slash.qml

20− - match: \b(import)\s+

21− comment: import statement.

22− captures:

23− 1: keyword.other.import.qml

24− push:

25− - meta_scope: meta.import.qml

26− - match: $

27− pop: true

28− - match: '([\w\d\.]+)\s+(\d+\.\d+)(?:\s+(as)\s+([A-Z][\w\d]*))?'

29− comment: "import Namespace VersionMajor.VersionMinor [as SingletonTypeIdentifier]"

30− scope: meta.import.namespace.qml

31− captures:

32− 1: entity.name.class.qml

33− 2: constant.numeric.qml

34− 3: keyword.other.import.qml

35− 4: entity.name.class.qml

36− - match: '(\"[^\"]+\")(?:\s+(as)\s+([A-Z][\w\d]*))?'

37− comment: "import <string> [as Script]"

38− scope: meta.import.dirjs.qml

39− captures:

40− 1: string.quoted.double.qml

41− 2: keyword.other.import.qml

42− 3: entity.name.class.qml

43− - match: '\b[A-Z]\w*\b'

44− comment: Capitalized word (class or enum).

45− scope: support.class.qml

46− - match: '(((^|\{)\s*)|\b)on[A-Z]\w*\b'

47− comment: onSomething - handler.

48− scope: support.class.qml

49− - match: '(?:^|\{)\s*(id)\s*\:\s*([^;\s]+)\b'

50− comment: "id: <something>"

51− scope: meta.id.qml

52− captures:

53− 1: keyword.other.qml

54− 2: storage.modifier.qml

55− - match: '^\s*(?:(default|readonly)\s+)?(property)\s+(?:(alias)|([\w\<\>]+))\s+(\w+)'

56− comment: property definition.

57− scope: meta.propertydef.qml

58− captures:

59− 1: keyword.other.qml

60− 2: keyword.other.qml

61− 3: keyword.other.qml

62− 4: storage.type.qml

63− 5: entity.other.attribute-name.qml

64− - match: \b(signal)\s+(\w+)\s*

65− comment: "signal <signalName>[([<type> <parameter>[, ...]])]"

66− captures:

67− 1: keyword.other.qml

68− 2: support.function.qml

69− push:

70− - meta_scope: meta.signal.qml

71− - match: ;|(?=/)|$

72− pop: true

73− - match: (\w+)\s+(\w+)

74− scope: meta.signal.parameters.qml

75− captures:

76− 1: storage.type.qml

77− 2: variable.parameter.qml

79− comment: js keywords.

80− scope: meta.keyword.qml

81− captures:

82− 1: constant.language.qml

83− 2: storage.type.qml

84− 3: keyword.control.qml

85− - match: '\b(function)\s+([\w_]+)\s*(?=\()'

86− comment: function definition.

87− scope: meta.function.qml

88− captures:

89− 1: storage.type.qml

90− 2: entity.name.function.untitled

91− - match: '\b[\w_]+\s*(?=\()'

92− comment: function call.

93− scope: support.function.qml

94− - match: '(?:^|\{|;)\s*[a-z][\w\.]*\s*(?=\:)'

95− comment: "property (property: <something>)."

96− scope: entity.other.attribute-name.qml

97− - match: (?<=\.)\b\w*

98− comment: property of the variable (name.property).

99− scope: entity.other.attribute-name.qml

100− - match: '\b([a-z_]\w*)\b'

101− comment: All non colored words are assumed to be variables.

102− scope: variable.parameter

103− - include: scope:source.js

assets/syntaxes/02_Extra/Racketdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/Racket.sublime-syntaxdeleted−52

@@ -1,52 +0,0 @@

1−%YAML 1.2

2−---

3−# http://www.sublimetext.com/docs/3/syntax.html

4−name: Racket

5−file_extensions:

6− - rkt

7−scope: source.racket

8−contexts:

9− main:

10− - match: '[^\\](\"[^\"]*\")'

11− captures:

12− 1: string.quoted.double.source.racket

13− - match: '\((define)\s+([a-zA-Z0-9_\-?\+^]+)\s*'

14− scope: meta.variable.source.racket

15− captures:

16− 1: keyword.source.racket

17− 2: entity.name.variable.source.racket

18− - match: '\((define)\s+\(([a-zA-Z0-9_\-?\+^]+)\s*'

19− scope: meta.function.source.racket

20− captures:

21− 1: keyword.source.racket

22− 2: entity.name.function

23− - match: '\((struct)\s+([a-zA-Z0-9_\-?\+^]+)\s+'

24− scope: meta.struct.source.racket

25− captures:

26− 1: keyword.source.racket

27− 2: entity.name.type

29− scope: meta.keywords.source.racket

30− captures:

31− 1: keyword.source.racket

32− - match: '[\s$](true|false|empty|null)[\s$]'

33− captures:

34− 1: constant.language.source.racket

35− - match: '[\s$\[\{](#t|#true|#f|#false)[\s$\]\}]'

36− captures:

37− 1: constant.language.source.racket

38− - match: '(#\\[a-zA-Z0-9_\-?\+\.\!\"]+)'

39− captures:

40− 1: constant.language.source.racket

41− - match: '\b(0|([1-9][0-9_]*))\b'

42− scope: constant.numeric.integer.source.racket

43− - match: ;

44− push:

45− - meta_scope: comment.line.documentation.source.racket

46− - match: $\n

47− pop: true

48− - match: '#\|'

49− push:

50− - meta_scope: comment.block.source.racket

51− - match: '\|#'

52− pop: true

assets/syntaxes/02_Extra/Rego.sublime-syntaxdeleted−97

@@ -1,97 +0,0 @@

1−%YAML 1.2

2−---

3−# http://www.sublimetext.com/docs/3/syntax.html

4−name: Rego

5−file_extensions:

6− - rego

7−scope: source.rego

8−contexts:

9− main:

10− - include: comment

11− - include: keyword

12− - include: operator

13− - include: head

14− - include: term

15− comment:

16− - match: (#).*$\n?

17− scope: comment.line.number-sign.rego

18− captures:

19− 1: punctuation.definition.comment.rego

20− call:

21− - match: '([a-zA-Z_][a-zA-Z0-9_]*)\('

22− scope: meta.function-call.rego

23− captures:

24− 1: support.function.any-method.rego

25− constant:

26− - match: \b(?:true|false|null)\b

27− scope: constant.language.rego

28− head:

29− - match: "^([[:alpha:]_][[:alnum:]_]*)"

30− captures:

31− 1: entity.name.function.declaration

32− push:

33− - meta_scope: meta.function.rego

34− - match: '(=|{|\n)'

35− pop: true

36− - include: term

37− keyword:

39− scope: keyword.other.rego

40− number:

41− - match: |-

42− (?x: # turn on extended mode

43− -? # an optional minus

44− (?:

45− 0 # a zero

46− | # ...or...

47− [1-9] # a 1-9 character

48− \d* # followed by zero or more digits

49− )

50− (?:

51− (?:

52− \. # a period

53− \d+ # followed by one or more digits

54− )?

55− (?:

56− [eE] # an e character

57− [+-]? # followed by an option +/-

58− \d+ # followed by one or more digits

59− )? # make exponent optional

60− )? # make decimal portion optional

61− )

62− scope: constant.numeric.rego

63− operator:

64− - match: \=|\!\=|>|<|<\=|>\=|\+|-|\*|%|/|\||&|:\=

65− scope: keyword.operator.comparison.rego

66− string:

67− - match: '"'

68− captures:

69− 0: punctuation.definition.string.begin.rego

70− push:

71− - meta_scope: string.quoted.double.rego

72− - match: '"'

73− captures:

74− 0: punctuation.definition.string.end.rego

75− pop: true

76− - match: |-

77− (?x: # turn on extended mode

78− \\ # a literal backslash

79− (?: # ...followed by...

80− ["\\/bfnrt] # one of these characters

81− | # ...or...

82− u # a u

83− [0-9a-fA-F]{4} # and four hex digits

84− )

85− )

86− scope: constant.character.escape.rego

87− - match: \\.

88− scope: invalid.illegal.unrecognized-string-escape.rego

89− term:

90− - include: constant

91− - include: string

92− - include: number

93− - include: call

94− - include: variable

95− variable:

96− - match: '\b[[:alpha:]_][[:alnum:]_]*\b'

97− scope: meta.identifier.rego

assets/syntaxes/02_Extra/SCSS_Sassdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/SML.sublime-syntaxdeleted−33

@@ -1,33 +0,0 @@

1−%YAML 1.2

2−---

3−# http://www.sublimetext.com/docs/3/syntax.html

4−name: SML

5−file_extensions:

6− - sml

7− - cm

8− - sig

9−scope: source.sml

10−contexts:

11− main:

13− comment: SML keywords

14− scope: keyword.source.sml

15− - match: '\b[0-9]+\b'

16− comment: Numeric constants

17− scope: constant.numeric.sml

18− - match: '\b[A-Z]([A-z0-9]*)\b'

19− comment: Built in types

20− scope: support.type.sml

21− - match: '"(\\"|[^"])*"'

22− comment: String constant

23− scope: string.sml

24− - match: \(\*

25− comment: Comment

26− push:

27− - meta_scope: comment.sml

28− - match: \*\)

29− pop: true

30− - match: '(|=>|::|\[\]|->|:>)'

31− comment: Character

32− scope: constant.character.sml

33−

assets/syntaxes/02_Extra/Slimdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/Slim.sublime-syntaxdeleted−306

@@ -1,306 +0,0 @@

1−%YAML 1.2

2−---

3−# http://www.sublimetext.com/docs/syntax.html

4−name: Ruby Slim

5−file_extensions:

6− - slim

7− - skim

8−scope: text.slim

9−contexts:

10− main:

11− - match: ^(\s*)(ruby):$

12− captures:

13− 2: constant.language.name.ruby.filter.slim

14− push:

15− - meta_scope: text.ruby.filter.slim

16− - match: ^(?!(\1\s)|\s*$)

17− pop: true

18− - include: scope:source.ruby

19− - match: ^(\s*)(javascript):$

20− captures:

21− 2: constant.language.name.javascript.filter.slim

22− push:

23− - meta_scope: source.js.filter.slim

24− - match: ^(?!(\1\s)|\s*$)

25− pop: true

26− - include: scope:source.js

27− - match: ^(---)\s*\n

28− captures:

29− 1: storage.frontmatter.slim

30− push:

31− - meta_scope: source.yaml.meta.slim

32− - match: ^(---)\s*\n

33− captures:

34− 1: storage.frontmatter.slim

35− pop: true

36− - include: scope:source.yaml

37− - match: ^(\s*)(coffee):$

38− captures:

39− 2: constant.language.name.coffeescript.filter.slim

40− push:

41− - meta_scope: text.coffeescript.filter.slim

42− - match: ^(?!(\1\s)|\s*$)

43− pop: true

44− - include: scope:source.coffee

45− - match: ^(\s*)(markdown):$

46− captures:

47− 2: constant.language.name.markdown.filter.slim

48− push:

49− - meta_scope: text.markdown.filter.slim

50− - match: ^(?!(\1\s)|\s*$)

51− pop: true

52− - include: scope:text.html.markdown

53− - match: ^(\s*)(css):$

54− captures:

55− 2: constant.language.name.css.filter.slim

56− push:

57− - meta_scope: text.css.filter.slim

58− - match: ^(?!(\1\s)|\s*$)

59− pop: true

60− - include: scope:source.css

61− - match: ^(\s*)(sass):$

62− captures:

63− 2: constant.language.name.sass.filter.slim

64− push:

65− - meta_scope: text.sass.filter.slim

66− - match: ^(?!(\1\s)|\s*$)

67− pop: true

68− - include: scope:source.sass

69− - match: ^(\s*)(scss):$

70− captures:

71− 2: constant.language.name.scss.filter.slim

72− push:

73− - meta_scope: text.scss.filter.slim

74− - match: ^(?!(\1\s)|\s*$)

75− pop: true

76− - include: scope:source.scss

77− - match: ^(\s*)(less):$

78− captures:

79− 2: constant.language.name.less.filter.slim

80− push:

81− - meta_scope: text.less.filter.slim

82− - match: ^(?!(\1\s)|\s*$)

83− pop: true

84− - include: scope:source.less

85− - match: ^(\s*)(erb):$

86− captures:

87− 2: constant.language.name.erb.filter.slim

88− push:

89− - meta_scope: text.erb.filter.slim

90− - match: ^(?!(\1\s)|\s*$)

91− pop: true

92− - include: scope:source.erb

93− - match: ^(! )($|\s.*)

94− scope: meta.prolog.slim

95− captures:

96− 1: punctuation.definition.prolog.slim

97− - match: ^(\s*)(/)\s*.*$

98− captures:

99− 2: comment.line.slash.slim

100− push:

101− - meta_scope: comment.block.slim

102− - match: ^(?!(\1\s)|\s*$)

103− pop: true

104− - match: ^\s*(?=-)

105− push:

106− - match: $

107− pop: true

108− - include: rubyline

109− - match: (?==+|~)

110− push:

111− - match: $

112− pop: true

113− - include: rubyline

114− - include: tag-attribute

115− - include: embedded-ruby

116− - match: ^(\s*)(\||')\s*

117− comment: Verbatim text (can include HTML tags and copied lines)

118− push:

119− - match: ^(?!(\1\s)|\s*$)

120− pop: true

121− - include: scope:text.html.basic

122− - include: embedded-ruby

123− - match: '^\s*(\.|#|[-a-zA-Z0-9]+)([\w-]+)?'

124− comment: '1 - dot OR hash OR any combination of word, number; 2 - OPTIONAL any combination of word, number, dash or underscore (following a . or'

125− captures:

126− 1: entity.name.tag.slim

127− 2: entity.other.attribute-name.event.slim

128− push:

129− - meta_scope: meta.tag

130− - match: '$|(?!\.|#|:|-|~|/|\}|\]|\*|\s?[\*\{])'

131− captures:

132− 1: entity.name.tag.slim

133− 2: entity.other.attribute-name.event.slim

134− pop: true

135− - match: '(:[\w\d]+)+'

136− comment: XML

137− push:

138− - meta_scope: entity.name.tag.slim

139− - match: $|\s

140− pop: true

141− - match: '(:\s)(\.|#|[a-zA-Z0-9]+)([\w-]+)?'

142− comment: Inline HTML / 1 - colon; 2 - dot OR hash OR any combination of word, number; 3 - OPTIONAL any combination of word, number, dash or underscore (following a . or

143− captures:

144− 1: punctuation.definition.tag.end.slim

145− 2: entity.name.tag.slim

146− 3: entity.other.attribute-name.event.slim

147− push:

148− - match: '$|(?!\.|#|=|-|~|/|\}|\]|\*|\s?[\*\{])'

149− captures:

150− 1: punctuation.definition.tag.end.slim

151− 2: entity.name.tag.slim

152− 3: entity.other.attribute-name.event.slim

153− pop: true

154− - include: root-class-id-tag

155− - include: tag-attribute

156− - match: '(\*\{)(?=.*\}|.*\|\s*$)'

157− comment: Splat attributes

158− captures:

159− 1: punctuation.section.embedded.ruby

160− push:

161− - meta_scope: source.ruby.embedded.slim

162− - match: '(\})|$|^(?!.*\|\s*$)'

163− captures:

164− 1: punctuation.section.embedded.ruby

165− pop: true

166− - include: embedded-ruby

167− - include: root-class-id-tag

168− - include: rubyline

169− - match: /

170− scope: punctuation.terminator.tag.slim

171− - match: ^\s*(\\.)

172− captures:

173− 1: meta.escape.slim

174− - match: ^\s*(?=\||')

175− push:

176− - match: $

177− pop: true

178− - include: embedded-ruby

179− - include: scope:text.html.basic

180− - match: '(?=<[\w\d\:]+)'

181− comment: Inline and root-level HTML tags

182− push:

183− - match: $|\/\>

184− pop: true

185− - include: scope:text.html.basic

186− continuation:

187− - match: '([\\,])\s*\n'

188− captures:

189− 1: punctuation.separator.continuation.slim

190− delimited-ruby-a:

191− - match: '=\('

192− push:

193− - meta_scope: source.ruby.embedded.slim

194− - match: \)(?=( \w|$))

195− pop: true

196− - include: scope:source.ruby.rails

197− delimited-ruby-b:

198− - match: '=\['

199− push:

200− - meta_scope: source.ruby.embedded.slim

201− - match: '\](?=( \w|$))'

202− pop: true

203− - include: scope:source.ruby.rails

204− delimited-ruby-c:

205− - match: '=\{'

206− push:

207− - meta_scope: source.ruby.embedded.slim

208− - match: '\}(?=( \w|$))'

209− pop: true

210− - include: scope:source.ruby.rails

211− embedded-ruby:

212− - match: '(?<!\\)#\{{1,2}'

213− captures:

214− 0: punctuation.section.embedded.ruby

215− push:

216− - meta_scope: source.ruby.embedded.html

217− - match: '\}{1,2}'

218− captures:

219− 0: punctuation.section.embedded.ruby

220− pop: true

221− - include: scope:source.ruby.rails

222− entities:

223− - match: '(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)'

224− scope: constant.character.entity.html

225− captures:

226− 1: punctuation.definition.entity.html

227− 3: punctuation.definition.entity.html

228− - match: '&'

229− scope: invalid.illegal.bad-ampersand.html

230− interpolated-ruby:

231− - match: '=(?=\b)'

232− push:

233− - meta_scope: source.ruby.embedded.html

234− - match: \s|\w$

235− pop: true

236− root-class-id-tag:

237− - match: '(\.|#)([\w\d\-]+)'

238− captures:

239− 1: punctuation.separator.key-value.html

240− 2: entity.other.attribute-name.html

241− rubyline:

242− - match: (==|=)(<>|><|<'|'<|<|>)?|-

243− comment: Hack to thwart Sublime's Ruby highlighter. It thinks do without a variable continues the next line (this can be muted with a / at the end of the line). For things like yields, do is unnecessary without an argument, so this hack will suffice

244− push:

245− - meta_scope: meta.line.ruby.slim

246− - meta_content_scope: source.ruby.embedded.slim

247− - match: (do\s*\n$)|(?<!\\|,|,\n|\\\n)$

248− captures:

249− 1: keyword.control.start-block.ruby

250− pop: true

251− - match: '#.*$'

252− comment: Hack to let ruby comments work in this context properly

253− scope: comment.line.number-sign.ruby

254− - include: continuation

255− - include: scope:source.ruby.rails

256− string-double-quoted:

257− - match: (")(?=.*")

258− captures:

259− 0: punctuation.definition.string.begin.html

260− push:

261− - meta_scope: string.quoted.double.html

262− - meta_content_scope: meta.toc-list.id.html

263− - match: '"'

264− captures:

265− 0: punctuation.definition.string.end.html

266− pop: true

267− - include: embedded-ruby

268− - include: entities

269− string-single-quoted:

270− - match: (')(?=.*')

271− captures:

272− 0: punctuation.definition.string.begin.html

273− push:

274− - meta_scope: string.quoted.single.html

275− - meta_content_scope: meta.toc-list.id.html

276− - match: "'"

277− captures:

278− 0: punctuation.definition.string.end.html

279− pop: true

280− - include: embedded-ruby

281− - include: entities

282− tag-attribute:

283− - match: '([\w.#_-]+)(=)(?!\s)(true|false|nil)?(\s*\(|\{)?'

284− captures:

285− 1: entity.other.attribute-name.event.slim

286− 2: punctuation.separator.key-value.html

287− 3: constant.language.slim

288− push:

289− - meta_scope: meta.attribute-with-value.slim

290− - match: '\}|\)|$'

291− captures:

292− 1: entity.other.attribute-name.event.slim

293− 2: punctuation.separator.key-value.html

294− 3: constant.language.slim

295− pop: true

296− - include: tag-stuff

297− - include: string-double-quoted

298− - include: string-single-quoted

299− tag-stuff:

300− - include: tag-attribute

301− - include: interpolated-ruby

302− - include: delimited-ruby-a

303− - include: delimited-ruby-b

304− - include: delimited-ruby-c

305− - include: rubyline

306− - include: embedded-ruby

assets/syntaxes/02_Extra/Stylusdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/Stylus.sublime-syntaxdeleted−711

@@ -1,711 +0,0 @@

1−%YAML 1.2

2−---

3−# http://www.sublimetext.com/docs/3/syntax.html

4−name: Stylus

5−file_extensions:

6− - styl

7− - stylus

8−scope: source.stylus

9−contexts:

10− main:

11− - include: comments

12− - match: '^\s*(@(?:import|charset|css|font-face|(?:-webkit-)?keyframes)(?:\s+([\w-]+))?)\b'

13− captures:

14− 1: keyword.control.at-rule.other.stylus

15− 2: variable.other.animation-name.stylus

16− push:

17− - match: '$|;|(?=\{)'

18− pop: true

19− - include: string-quoted

20− - match: ^\s*(@media)\s*

21− captures:

22− 1: keyword.control.at-rule.media.stylus

23− push:

24− - match: '$|(?=\{)'

25− pop: true

26− - include: media-query

27− - match: |-

28− (?x)

29− (?<=^|;|})

30− \s*

31− (?=

32− [\[\]'".\w$-]+

33− \s*

34− ([?:]?=)

35− (?![^\[]*\])

36− )

37− push:

38− - match: $|;

39− pop: true

40− - include: expression

41− - include: iteration

42− - include: conditionals

43− - include: return

44− - match: |-

45− (?x) # multi-line regex definition mode

46−

47− ^(\s*) # starts at the beginning of line

48− ([\w$-]+) # identifier (name)

49− (\() # start of argument list

50− (?=

51− .*?

52− \)\s*\{ # we see a curly brace afterwards

53− ) # which means this is a function definition

54− captures:

55− 2: entity.name.function.stylus

56− 3: punctuation.definition.parameters.start.stylus

57− push:

58− - meta_scope: meta.function-call.stylus

59− - match: (\))

60− captures:

61− 1: punctuation.definition.parameters.end.stylus

62− pop: true

63− - include: expression

64− - match: |-

65− (?x) # multi-line regex definition mode

66− (

67−

68− (^|;) # starts at the beginning of line or at a ;

69− \s*

70− (\+?\s* # for block mixins

71− [\w$-]+) # identifier (name)

72− (\() # start of argument list

73− (?=

74− .*?

75− \)\s*;?\s* # if there are only spaces and semicolons

76− $|; # then this a

77− )

78− )

79− captures:

80− 3: entity.other.attribute-name.mixin.stylus

81− 4: punctuation.definition.parameters.start.stylus

82− push:

83− - meta_scope: meta.function-call.stylus

84− - match: (\))

85− captures:

86− 1: punctuation.definition.parameters.end.stylus

87− pop: true

88− - include: expression

89− - match: |-

90− (?x) # multi-line regex definition mode

91− (^|(?<=\*/|\}))\s*

92− (?=

93− font(?!

94− \s*:\s

95− |

96− -

97− |

98− .*?

99− (?:

101− \b\d+(?:\b|px|r?em|%)|

102− var\s*\(|

103− ['"][^\]]*$

104− )

105− ) | # we need to distinguish between tag and property `cursor`

106− cursor(?!

107− \s*[:;]\s

108− |

109− -

110− |

111− .*?

112− (?:

113− (?:url\s*\()|

114− (?:-moz-|-webkit-|-ms-)?

122− )

123− ) | (

124− (

128− feComponentTransfer|feComposite|feConvolveMatrix|

129− feDiffuseLighting|feDisplacementMap|feDistantLight|feFlood|

131− feMergeNode|feMorphology|feOffset|fePointLight|

133− font-face|font-face-format|font-face-name|font-face-src|

141− datalist|dd|decorator|del|details|dfn|dir|div|dl|dt|element|

143− frameset|h1|h2|h3|h4|h5|h6|head|header|hgroup|hr|html|i|iframe|

147− plaintext|pre|progress|q|rp|rt|ruby|s|samp|script|section|

150− thead|time|title|tr|track|tt|u|ul|var|video|wbr|xmp)

151−

152− \s*([\s,.#\[]|:[^\s]|(?=\{|$))

153−

154− ) | (

155− [:~>\[*\/] # symbols but they are valid for selector

156−

157− ) | (

158−

159− \+\s*[\w$-]+\b\s* # are an identifier starting with $

160− (?!\() # and they can't have anything besides

161−

162− ) | ( # for animtions

163−

164− \d+(\.\d+)?%|(from|to)\b

165−

166− ) | ( # Placeholder selectors

167−

168− \$[\w$-]+\b\s* # are an identifier starting with $

169− (?=$|\{) # and they can't have anything besides

170−

171− ) | ( # CSS class

172−

173− \.[a-zA-Z0-9_-]+

174−

175− ) | ( # CSS id

176−

177− \#[a-zA-Z0-9_-]+

178−

179− ) | ( # Reference to parent

180−

181− ([\w\d_-]+)? # matching any word right before &

182− (&) # & itself, escaped because of plist

183− ([\w\d_-]+)? # matching any word right after &

184− )

185− )

186− push:

187− - meta_scope: meta.selector.stylus

188− - match: |-

189−

190− |$|(?=\{\s*\}.*$)|(?=\{.*?[:;])|(?=\{)(?!.+\}.*$)

191− pop: true

192− - include: comma

193− - match: \d+(\.\d+)?%|from|to

194− scope: entity.other.animation-keyframe.stylus

195− - include: selector-components

196− - match: .

197− scope: entity.other.attribute-name.stylus

198− - match: |-

199− (?x) # multi-line regex definition mode

200− (?<=^|;|{)\s* # starts after beginning of line, '{' or ';''

201− (?= # lookahead for

202− (

203− [a-zA-Z0-9_-] # then a letter

204− | # or

205− (\{(.*?)\}) # interpolation

206− | # or

207− (/\*.*?\*/) # comment

208− )+

209−

210− \s*[:\s]\s* # value is separated by colon or space

211−

212− (?!(\s*\{)) # if there are only spaces afterwards

213−

214− (?!

215− [^}]*? # checking for an unclosed curly braces on this

216− \{ # line because if one exists it means that

217− [^}]* # this is a selector and not a property

218− ($|\})

219− )

220− )

221− push:

222− - match: '(?=\}|;)|(?<!,)\s*\n'

223− pop: true

224− - include: comments

225− - include: interpolation

226− - match: '(?<!^|;|{)\s*(?:(:)|\s)'

227− captures:

228− 1: punctuation.separator.key-value.stylus

229− push:

230− - match: '(;)|(?=\})|(?=(?<!\,)\s*\n)'

231− captures:

232− 1: punctuation.terminator.rule.stylus

233− pop: true

234− - include: comments

235− - include: expression

236− - match: "-(moz|o|ms|webkit|khtml)-"

237− scope: support.type.vendor-prefix.stylus

238− - match: .

239− scope: meta.property-name.stylus support.type.property-name.stylus

240− - match: '@extends?\s'

241− captures:

242− 0: keyword.language.stylus

243− push:

244− - match: (?=$|;)

245− pop: true

246− - include: selector-components

247− - include: string-quoted

248− - include: escape

249− - include: language-constants

250− - include: language-operators

251− - include: language-keywords

252− - include: property-reference

253− - include: function-call

254− - match: '\{'

255− scope: punctuation.section.start.stylus

256− - match: '\}'

257− scope: punctuation.section.end.stylus

258− attribute-selector:

259− - match: '\[(?=[^\]]*\])'

260− captures:

261− 0: punctuation.definition.entity.start.stylus

262− push:

263− - meta_scope: meta.attribute-selector.stylus

264− - match: '\]'

265− captures:

266− 0: punctuation.definition.entity.end.stylus

267− pop: true

268− - match: '(?<=\[)|(?<=\{)'

269− push:

270− - match: '(?=[|~=\]\s])'

271− pop: true

272− - include: interpolation

273− - match: .

274− captures:

275− 0: entity.other.attribute-name.stylus

276− - include: interpolation

277− - match: "([|~]?=)"

278− captures:

279− 1: keyword.operator.stylus

280− - include: string-quoted

281− - match: .

282− captures:

283− 0: string.unquoted.stylus

284− color-values:

286− scope: constant.color.w3c-standard-color-name.stylus

287− - match: (hsla?|rgba?)\s*(\()

288− captures:

289− 1: keyword.language.function.misc.stylus

290− 2: punctuation.definition.parameters.start.stylus

291− push:

292− - match: \)

293− captures:

294− 0: punctuation.definition.parameters.end.stylus

295− pop: true

296− - match: |-

297− (?x) # multi-line regex definition mode

298− \b

299− (?:0*((?:1?[0-9]{1,2})|(?:2(?:[0-4][0-9]|5[0-5])))\s*(,)\s*)

300− (?:0*((?:1?[0-9]{1,2})|(?:2(?:[0-4][0-9]|5[0-5])))\s*(,)\s*)

301− (?:0*((?:1?[0-9]{1,2})|(?:2(?:[0-4][0-9]|5[0-5])))\b)

302− captures:

303− 1: constant.other.color.rgb-value.stylus constant.other.color.rgb-value.red.stylus

304− 2: punctuation.delimiter.comma.stylus

305− 3: constant.other.color.rgb-value.stylus constant.other.color.rgb-value.green.stylus

306− 4: punctuation.delimiter.comma.stylus

307− 5: constant.other.color.rgb-value.stylus constant.other.color.rgb-value.blue.stylus

308− - match: |-

309− (?x) # multi-line regex definition mode

310− \b

311− ((?:[0-9]{1,2}|100)%)(,) # red

312− \s*

313− ((?:[0-9]{1,2}|100)%)(,) # green

314− \s*

315− ((?:[0-9]{1,2}|100)%) # blue

316− captures:

317− 1: constant.other.color.rgb-value.stylus constant.other.color.rgb-value.red.stylus

318− 2: punctuation.delimiter.comma.stylus

319− 3: constant.other.color.rgb-value.stylus constant.other.color.rgb-value.green.stylus

320− 4: punctuation.delimiter.comma.stylus

321− 5: constant.other.color.rgb-value.stylus constant.other.color.rgb-value.blue.stylus

322− - match: |-

323− (?x) # multi-line regex definition mode

324− (?:\s*(,)\s*((0?\.[0-9]+)|[0-1]))?

325− captures:

326− 1: punctuation.delimiter.comma.stylus

327− 2: constant.other.color.rgb-value.stylus constant.other.color.rgb-value.alpha.stylus

328− - include: numeric-values

329− - include: numeric-values

330− comma:

331− - match: \s*,\s*

332− scope: punctuation.delimiter.comma.stylus

333− comments:

334− - include: single-line-comment

335− - match: \/\*

336− captures:

337− 0: punctuation.definition.comment.stylus

338− push:

339− - meta_scope: comment.block.stylus

340− - match: \*\/

341− captures:

342− 0: punctuation.definition.comment.stylus

343− pop: true

344− conditionals:

345− - match: '(^\s*|\s+)(if|unless|else)(?=[\s({]|$)\s*'

346− captures:

347− 2: keyword.control.stylus

348− push:

349− - match: '(?=$|\{)'

350− pop: true

351− - include: expression

352− escape:

353− - match: \\.

354− scope: constant.character.escape.stylus

355− expression:

356− - include: single-line-comment

357− - include: comma

358− - include: iteration

359− - include: conditionals

360− - include: language-operators

361− - include: language-keywords

362− - include: hash-definition

363− - include: color-values

364− - include: url

365− - include: function-call

366− - include: string-quoted

367− - include: escape

368− - include: hash-access

369− - include: language-constants

370− - include: language-property-value-constants

371− - include: property-reference

372− - include: variable

373− function-call:

374− - match: '([\w$-]+)(\()'

375− captures:

376− 1: entity.function-name.stylus

377− 2: punctuation.definition.parameters.start.stylus

378− push:

379− - meta_scope: meta.function-call.stylus

380− - match: (\))

381− captures:

382− 1: punctuation.definition.parameters.end.stylus

383− pop: true

384− - include: expression

385− hash-access:

386− - match: '(?=[\w$-]+(?:\.|\[[^\]=]*\]))'

387− push:

388− - meta_scope: meta.hash-access.stylus

389− - match: '(?=[^''''""\[\]\w.$-]|\s|$)'

390− pop: true

391− - match: \.

392− scope: punctuation.delimiter.hash.stylus

393− - match: '\['

394− scope: punctuation.definition.entity.start.stylus

395− - match: '\]'

396− scope: punctuation.definition.entity.end.stylus

397− - include: string-quoted

398− - include: variable

399− hash-definition:

400− - match: '\{'

401− captures:

402− 0: punctuation.section.embedded.start.stylus

403− push:

404− - meta_scope: meta.hash.stylus

405− - match: '\}'

406− captures:

407− 0: punctuation.section.embedded.end.stylus

408− pop: true

409− - include: single-line-comment

410− - match: |-

411− (?x)

412− (?:

413− ([\w$-]+)

414− |

415− ('[^']*')

416− |

417− ("[^"]*")

418− )

419− \s*

420− (:)

421− \s*

422− captures:

423− 1: support.type.property-name.stylus

424− 2: string.quoted.single.stylus

425− 3: string.quoted.double.stylus

426− 4: punctuation.separator.key-value.stylus

427− push:

428− - match: '(;)|(?=\}|$)'

429− captures:

430− 1: punctuation.terminator.statement.stylus

431− pop: true

432− - include: expression

433− interpolation:

434− - match: '\{'

435− captures:

436− 0: punctuation.section.embedded.start.stylus

437− push:

438− - meta_scope: stylus.embedded.source

439− - match: '\}'

440− captures:

441− 0: punctuation.section.embedded.end.stylus

442− pop: true

443− - include: expression

444− iteration:

445− - match: (^\s*|\s+)(for)\s+(?=.*?\s+in\s+)

446− captures:

447− 2: keyword.control.stylus

448− push:

449− - match: '$|\{'

450− pop: true

451− - include: expression

452− language-constants:

453− - match: \b(true|false|null)\b

454− scope: constant.language.stylus

455− language-keywords:

456− - match: (\b|\s)(return|else)\b

457− scope: keyword.control.stylus

458− - match: (\b|\s)(!important|in|is defined|is a)\b

459− scope: keyword.other.stylus

460− - match: \barguments\b

461− scope: variable.language.stylus

462− language-operators:

463− - match: ((?:\?|:|!|~|\+|-|(?:\*)?\*|\/|%|(\.)?\.\.|<|>|(?:=|:|\?|\+|-|\*|\/|%|<|>)?=|!=)|\b(?:in|is(?:nt)?|(?<!:)not)\b)

464− scope: keyword.operator.stylus

465− language-property-value-constants:

467− scope: constant.property-value.stylus

468− media-query:

469− - match: '\s*(?![{;]|$)'

470− push:

471− - meta_scope: meta.at-rule.media.stylus

472− - match: '\s*(?=[{;]|$)'

473− pop: true

475− captures:

476− 1: keyword.operator.logic.media.stylus

477− 2: support.constant.media.stylus

478− push:

479− - match: '\s*(?:(,)|(?=[{;]|$))'

480− pop: true

481− - include: media-query-list

482− - include: variable

483− media-query-list:

484− - match: \s*(and)?\s*(\()\s*

485− captures:

486− 1: keyword.operator.logic.media.stylus

487− 2: punctuation.definition.parameters.start.stylus

488− push:

489− - match: \)

490− captures:

491− 0: punctuation.definition.parameters.end.stylus

492− pop: true

493− - include: media-query-properties

494− - include: numeric-values

495− media-query-properties:

496− - match: \s*:\s*

497− captures:

498− 0: punctuation.separator.key-value.stylus

499− - match: |-

500− (?x)

501− (

502− ((min|max)-)?

503− (

504− ((device-)?(height|width|aspect-ratio))|

505− (color(-index)?)|monochrome|resolution

506− )

507− )|grid|scan|orientation

508− captures:

509− 0: support.type.property-name.media.stylus

510− - match: \b(portrait|landscape|progressive|interlace)\b

511− captures:

512− 1: support.constant.property-value.stylus

513− numeric-values:

514− - match: |-

515− (?x) # multi-line regex definition mode

516− (\#)(?:

517− ([0-9a-fA-F])

518− ([0-9a-fA-F])

519− ([0-9a-fA-F])

520− ([0-9a-fA-F])?

521− | ([0-9a-fA-F]{2})

522− ([0-9a-fA-F]{2})

523− ([0-9a-fA-F]{2})

524− ([0-9a-fA-F]{2})?

525− )\b

526− scope: constant.other.color.rgb-value.stylus

527− captures:

528− 1: punctuation.definition.constant.stylus

529− 2: constant.other.color.rgb-value.red.stylus

530− 3: constant.other.color.rgb-value.green.stylus

531− 4: constant.other.color.rgb-value.blue.stylus

532− 5: constant.other.color.rgb-value.alpha.stylus

533− 6: constant.other.color.rgb-value.red.stylus

534− 7: constant.other.color.rgb-value.green.stylus

535− 8: constant.other.color.rgb-value.blue.stylus

536− 9: constant.other.color.rgb-value.alpha.stylus

537− - match: |-

538− (?x) # multi-line regex definition mode

539− (?:-|\+)? # negative / positive

540− (?:

541− (?:

542− [0-9]+ # integer part

543− (?:\.[0-9]+)? # fraction

544− ) |

545− (?:\.[0-9]+) # fraction without leading zero

546− )

547− ((?: # units

548− px|pt|ch|cm|mm|in|

549− r?em|ex|pc|vw|vh|vmin|vmax|deg|

550− g?rad|turn|dpi|dpcm|dppx|m?s|k?Hz

551− )\b|%)?

552− scope: constant.numeric.stylus

553− captures:

554− 1: keyword.other.unit.stylus

555− property-reference:

556− - match: "@[a-z-]+"

557− scope: variable.other.property.stylus

558− pseudo:

560− scope: entity.other.attribute-name.pseudo-class.stylus

561− captures:

562− 1: puncutation.definition.entity.stylus

563− - match: (:?:)(before|after)\b

564− scope: entity.other.attribute-name.pseudo-element.stylus

565− captures:

566− 1: puncutation.definition.entity.stylus

567− - match: (::)(first-letter|first-number|selection)\b

568− scope: entity.other.attribute-name.pseudo-element.stylus

569− captures:

570− 1: puncutation.definition.entity.stylus

571− - match: ((:)dir)\s*(?:($)(ltr|rtl)?($))?

572− captures:

573− 1: entity.other.attribute-name.pseudo-element.stylus

574− 2: puncutation.definition.entity.stylus

575− 3: puncutation.definition.parameters.start.stylus

576− 4: constant.language.stylus

577− 5: puncutation.definition.parameters.end.stylus

578− - match: ((:)lang)\s*(?:($)(\w+(-\w+)?)?($))?

579− captures:

580− 1: entity.other.attribute-name.pseudo-element.stylus

581− 2: puncutation.definition.entity.stylus

582− 3: puncutation.definition.parameters.start.stylus

583− 4: constant.language.stylus

584− 5: puncutation.definition.parameters.end.stylus

585− - include: pseudo-nth

586− - include: pseudo-not

587− pseudo-not:

588− - match: ((:)not)\s*(\()

589− captures:

590− 1: entity.other.attribute-name.pseudo-element.stylus

591− 2: puncutation.definition.entity.stylus

592− 3: puncutation.definition.parameters.start.stylus

593− push:

594− - match: \)

595− captures:

596− 0: puncutation.definition.parameters.end.stylus

597− pop: true

598− - include: selector-components

599− pseudo-nth:

601− captures:

602− 1: entity.other.attribute-name.pseudo-class.stylus

603− 2: puncutation.definition.entity.stylus

604− 3: puncutation.definition.parameters.start.stylus

605− push:

606− - match: \)

607− captures:

608− 0: puncutation.definition.parameters.end.stylus

609− pop: true

610− - include: language-operators

611− - include: interpolation

612− - match: \b(odd|even)\b

613− scope: constant.language.stylus

614− - match: \b(\d+)?n\b

615− scope: variable.language.stylus

616− captures:

617− 1: constant.numeric.stylus

618− - match: \d+

619− scope: constant.numeric.stylus

620− return:

621− - match: ^\s*(return)

622− captures:

623− 1: keyword.control.stylus

624− push:

625− - match: (;)|(?=$)

626− captures:

627− 1: punctuation.terminator.statement.stylus

628− pop: true

629− - include: expression

630− selector-components:

631− - include: comments

632− - include: interpolation

633− - include: attribute-selector

634− - include: pseudo

635− - match: '\$[\w$-]+\b'

636− scope: entity.other.placeholder.stylus

637− - match: "[:~>]"

638− scope: keyword.operator.selector.stylus

639− - match: |-

640− (?x) # multi-line regex definition mode

641− \b(

645− feComponentTransfer|feComposite|feConvolveMatrix|

646− feDiffuseLighting|feDisplacementMap|feDistantLight|feFlood|

648− feMergeNode|feMorphology|feOffset|fePointLight|

650− font-face|font-face-format|font-face-name|font-face-src|

658− datalist|dd|decorator|del|details|dfn|dir|div|dl|dt|element|

660− frameset|h1|h2|h3|h4|h5|h6|head|header|hgroup|hr|html|i|iframe|

664− plaintext|pre|progress|q|rp|rt|ruby|s|samp|script|section|

667− thead|time|title|tr|track|tt|u|ul|var|video|wbr|xmp

668− )\b

669− scope: entity.name.tag.stylus

670− - match: '\.[a-zA-Z0-9_-]+'

671− scope: entity.other.attribute-name.class.stylus

672− - match: "#[a-zA-Z0-9_-]+"

673− scope: entity.other.attribute-name.id.stylus

674− - match: |-

675− (?x) # multi-line regex definition mode

676− ([\w\d_-]+)? # matching any word right before &

677− (&) # & itself, escaped because of plist

678− ([\w\d_-]+)? # matching any word right after &

679− captures:

680− 1: entity.other.attribute-name.stylus

681− 2: variable.language.stylus

682− 3: entity.other.attribute-name.stylus

683− single-line-comment:

684− - match: (\/\/).*$

685− scope: comment.line.stylus

686− captures:

687− 1: punctuation.definition.comment.stylus

688− string-quoted:

689− - match: "'[^']*'"

690− scope: string.quoted.single.stylus

691− - match: '"[^"]*"'

692− scope: string.quoted.double.stylus

693− url:

694− - match: (url)\s*(\()

695− captures:

696− 1: entity.function-name.stylus

697− 2: punctuation.definition.parameters.start.stylus

698− push:

699− - meta_scope: meta.function-call.stylus

700− - match: (\))

701− captures:

702− 1: punctuation.definition.parameters.end.stylus

703− pop: true

704− - include: string-quoted

705− - include: language-constants

706− - include: language-property-value-constants

707− - include: property-reference

708− - include: variable

709− variable:

710− - match: '([\w$-]+\b)'

711− scope: variable.other.stylus

assets/syntaxes/02_Extra/SublimeEthereumdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/SublimeJQdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/Sveltedeleted−1

Submodule changed.

assets/syntaxes/02_Extra/SystemVerilogdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/TOMLdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/Terraformdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/TypeScriptdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/VimLdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/Vuedeleted−1

Submodule changed.

assets/syntaxes/02_Extra/Zigdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/cmd-helpdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/gnuplotdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/gnuplot.sublime-syntaxdeleted−182

@@ -1,182 +0,0 @@

1−%YAML 1.2

2−---

3−# http://www.sublimetext.com/docs/3/syntax.html

4−name: gnuplot

5−file_extensions:

6− - gp

7− - gpl

8− - gnuplot

9− - gnu

10− - plot

11− - plt

12−scope: source.gnuplot

13−contexts:

14− main:

15− - include: number

16− - include: string_single

17− - include: string_double

18− - match: '\b(for)\b\s*(\[)'

19− comment: |

20− gnuplot iteration statement.

21− There are two forms:

22− numeric [n = 1:2{:inc}]

23− string based [str in "x y z"]

24− but both can also iterate over lists etc, so this is kept loose.

25− captures:

26− 1: keyword.other.iteration.gnuplot

27− 2: punctuation.definition.range.begin.gnuplot

28− push:

29− - meta_scope: meta.structure.iteration.gnuplot

30− - match: '\]'

31− captures:

32− 0: punctuation.definition.range.end.gnuplot

33− pop: true

34− - include: number

35− - include: operator

36− - include: string_double

37− - include: string_single

38− - match: ":"

39− scope: punctuation.separator.range.gnuplot

40− - match: '\b([a-zA-Z]\w*)\b\s*(=|in)'

41− scope: variable-assignment.range.gnuplot

42− - match: '(?i:[^\s(pi|e)\]])'

43− scope: invalid.illegal.expected-range-separator.gnuplot

44− - match: '\['

45− comment: "gnuplot range statement [a:b]. Lots of things are legal, still more make no sense!"

46− captures:

47− 0: punctuation.definition.range.begin.gnuplot

48− push:

49− - meta_scope: meta.structure.range.gnuplot

50− - match: '\]'

51− captures:

52− 0: punctuation.definition.range.end.gnuplot

53− pop: true

54− - include: number

55− - include: operator

56− - match: ":"

57− scope: punctuation.separator.range.gnuplot

58− - match: '(?i:[^\s(pi|e)\]])'

59− scope: invalid.illegal.expected-range-separator.gnuplot

60− - match: \\.

61− scope: constant.character.escape.gnuplot

62− - match: '(?<!\$)(#)(?!\{).*$\n?'

63− scope: comment.line.number-sign.gnuplot

64− captures:

65− 1: punctuation.definition.comment.gnuplot

66− - match: for

67− comment: introduce in gnuplot 4.3.

68− scope: keyword.other.iteration.gnuplot

70− scope: keyword.other.setting.gnuplot

72− comment: missuse of scopes alert! Just for pretty colours

73− scope: keyword.other.command.gnuplot

75− scope: support.function.gnuplot

77− scope: support.function.string.gnuplot

79− scope: constant.other.type.gnuplot

81− scope: constant.other.terminal.gnuplot

83− scope: keyword.modifier.gnuplot

84− - match: |-

85− (?x:

86− \b # Start with a word boundary

87− (?=\b[\w$]*(\(|.*=)) # Look-ahead for a bracket or equals

88− (?![^(]*\)) # negative look ahead for a closing bracket without an opening one. This stops a from matching in f(a)

89− ( # Group variable name

90− [A-Za-z] # A letter

91− [\w$]* # Any word chars or $

92− ) # That is it for the name.

93− )

94− comment: user defined function / variable

95− scope: variable.other.gnuplot

96− - match: \b(if)\b

97− scope: keyword.control.gnuplot

98− - match: \b(show)\b

99− captures:

100− 0: keyword.other.command.gnuplot

101− push:

102− - meta_scope: keyword.line.show.gnuplot

103− - meta_content_scope: keyword.line.show.gnuplot

104− - match: (?!\#)($\n?)

105− pop: true

106− - include: main

107− - match: \b(set)\b\s*\b(terminal|term)\b

108− captures:

109− 1: keyword.other.command.gnuplot

110− 2: keyword.other.setting.gnuplot

111− push:

112− - meta_scope: keyword.line.set.terminal.gnuplot

113− - match: (?!\#)($\n?)

114− pop: true

115− - include: main

116− - match: \b(set)\b\s*\b(key)\b

117− captures:

118− 1: keyword.other.command.gnuplot

119− 2: keyword.other.setting.gnuplot

120− push:

121− - meta_scope: keyword.line.set.key.gnuplot

122− - match: (?!\#)($\n?)

123− pop: true

124− - include: main

125− - match: \b(set|unset)\b\s*(?!\b(terminal|key|for)\b)

126− captures:

127− 1: keyword.other.command.gnuplot

128− 2: keyword.other.setting.gnuplot

129− push:

130− - meta_scope: keyword.line.set.gnuplot

131− - meta_content_scope: keyword.line.set.gnuplot

132− - match: (?!\#)($\n?)

133− pop: true

134− - include: main

135− number:

136− - match: |-

137− (?x: # turn on extended mode

138− -? # an optional minus

139− (?:

140− 0 # a zero

141− | # ...or...

142− [1-9] # a 1-9 character

143− \d* # followed by zero or more digits

144− )

145− (?:

146− \. # a period

147− \d+ # followed by one or more digits

148− (?:

149− [eE] # an e character

150− [+-]? # followed by an option +/-

151− \d+ # followed by one or more digits

152− )? # make exponent optional

153− )? # make decimal portion optional

154− )

155− comment: borrowed from textmate book

156− scope: constant.numeric.gnuplot

157− operator:

158− - match: \s*(==|~=|>|>=|<|<=|&|&&|:|\||\|\||\+|-|\*|\.\*|/|\./|\\|\.\\|\^|\.\^)\s*

159− comment: Operator symbols

160− scope: keyword.operator.symbols.matlab

161− string_double:

162− - match: '"'

163− captures:

164− 0: punctuation.definition.string.begin.gnuplot

165− push:

166− - meta_scope: string.quoted.double.gnuplot

167− - match: '"'

168− captures:

169− 0: punctuation.definition.string.end.gnuplot

170− pop: true

171− - match: '\\[\$`"\\\n]'

172− scope: constant.character.escape.gnuplot

173− string_single:

174− - match: "'"

175− captures:

176− 0: punctuation.definition.string.begin.gnuplot

177− push:

178− - meta_scope: string.quoted.single.gnuplot

179− - match: "'"

180− captures:

181− 0: punctuation.definition.string.end.gnuplot

182− pop: true

assets/syntaxes/02_Extra/http-request-responsedeleted−1

Submodule changed.

assets/syntaxes/02_Extra/log.sublime-syntaxdeleted−140

@@ -1,140 +0,0 @@

1−%YAML 1.2

2−---

3−# See http://www.sublimetext.com/docs/3/syntax.html

4−file_extensions:

5− - log

6−scope: text.log

7−variables:

8− ipv4_part: (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)

9− hours_minutes_seconds: (?:[01]\d|2[0-3]):(?:[0-5]\d):(?:[0-5]\d)

10−contexts:

11− main:

12− - match: (\w+)(=)

13− captures:

14− 1: variable.parameter.log

15− 2: keyword.operator.assignment.log

16− - match: (')([^']*)(')

17− scope: string.quoted.single.log

18− captures:

19− 1: punctuation.definition.string.begin.log

20− 3: punctuation.definition.string.end.log

21− - match: \"

22− captures:

23− 1: punctuation.definition.string.begin.log

24− push: double_quoted_string

25− - include: dates

26− - include: ip_addresses

27− - include: numbers

28− - match: \b(?i:fail(?:ure|ed)?|error|exception)\b

29− scope: markup.error.log

30− - match: \b(?i:warn(?:ing)?)\b

31− scope: markup.warning.log

32− - match: \b(?i:debug)\b

33− scope: markup.info.log

34− #- include: scope:text.html.markdown#autolink-inet

35− - match: \b\w+:/{2,3}

36− scope: markup.underline.link.scheme.log

37− push: url-host

38− dates:

39− - match: \b\d{4}-\d{2}-\d{2}(?=\b|T)

40− scope: meta.date.log meta.number.integer.decimal.log constant.numeric.value.log

41− push: maybe_date_time_separator

42− - match: \b\d{4}/\d{2}/\d{2}(?=\b|T)

43− scope: meta.date.log meta.number.integer.decimal.log constant.numeric.value.log

44− push: maybe_date_time_separator

45− - match: \b(?={{hours_minutes_seconds}})

46− push: time

47− time:

48− - match: (?:{{hours_minutes_seconds}})(?:(\.)\d{3})?\b

49− scope: meta.time.log meta.number.integer.decimal.log constant.numeric.value.log

50− captures:

51− 1: punctuation.separator.decimal.log

52− - match: ''

53− pop: true

54− maybe_date_time_separator:

55− - match: T(?={{hours_minutes_seconds}})

56− scope: meta.date.log meta.time.log keyword.other.log

57− set: time

58− - match: ''

59− pop: true

60− ip_addresses:

61− - match: \b(?=(?:{{ipv4_part}}\.){3}{{ipv4_part}}\b)

62− push:

63− - meta_scope: meta.ipaddress.v4.log meta.number.integer.decimal.log

64− - match: \d+

65− scope: constant.numeric.value.log

66− - match: \.

67− scope: punctuation.separator.sequence.log

68− - match: ''

69− pop: true

70− - match: (?=(?:\h{0,4}:){2,6}\h{1,4}\b)

71− push:

72− - meta_scope: meta.ipaddress.v6.log meta.number.integer.hexadecimal.log

73− - match: \h{1,4}

74− scope: constant.numeric.value.log

75− - match: ':'

76− scope: punctuation.separator.sequence.log

77− - match: ''

78− pop: true

79− numbers:

80− - match: \b(0x)(\h+)(?:(\.)(\h+))?\b

81− scope: meta.number.float.hexadecimal.log

82− captures:

83− 1: constant.numeric.base.log

84− 2: constant.numeric.value.log

85− 3: constant.numeric.value.log punctuation.separator.decimal.log

86− 4: constant.numeric.value.log

87− - match: \b\d+(\.)\d+\b

88− scope: meta.number.float.log constant.numeric.value.log

89− captures:

90− 1: punctuation.separator.decimal.log

91− - match: \b\d+\b

92− scope: meta.number.integer.log constant.numeric.value.log

93− url-host:

94− - meta_content_scope: markup.underline.link.host.log

95− - match: \[

96− scope: punctuation.section.brackets.begin.log

97− push:

98− - match: \]

99− scope: punctuation.section.brackets.end.log

100− pop: true

101− - include: ip_addresses

102− - match: '[^:/\s]+'

103− - match: ''

104− set: url-after-host

105− url-after-host:

106− - match: (:)(\d+)

107− scope: markup.underline.link.port.log

108− captures:

109− 1: punctuation.separator.mapping.port.log

110− 2: constant.numeric.value.log

111− #- include: scope:text.html.markdown#url-escaped-chars

112− - match: (%)\h{2}

113− scope: markup.underline.link.path.log constant.character.escape.url.log

114− captures:

115− 1: punctuation.definition.escape.log

116− # After a valid domain, zero or more non-space non-< characters may follow

117− - match: (?=[?!.,:*_~]*[\s<]) # Trailing punctuation (specifically, ?, !, ., ,, :, *, _, and ~) will not be considered part of the autolink, though they may be included in the interior of the link

118− pop: true

119− - match: \( # When an autolink ends in ), we scan the entire autolink for the total number of parentheses. If there is a greater number of closing parentheses than opening ones, we don’t consider the last character part of the autolink, in order to facilitate including an autolink inside a parenthesis

120− push:

121− - meta_scope: markup.underline.link.path.log

122− - match: (?=[?!.,:*_~]*[\s<])

123− pop: true

124− - match: \)

125− pop: true

126− - match: (?=\)[?!.,:*_~]*[\s<])

127− pop: true

128− - match: '[^?!.,:*_~\s<&()%]+|\S'

129− scope: markup.underline.link.path.log

130− - match: ''

131− pop: true

132− double_quoted_string:

133− - meta_scope: string.quoted.double.log

134− - match: \\"

135− scope: constant.character.escape.log

136− - match: \\n

137− scope: constant.character.escape.log

138− - match: \"

139− scope: punctuation.definition.string.end.log

140− pop: true

assets/syntaxes/02_Extra/ssh-configdeleted−1

Submodule changed.

assets/syntaxes/02_Extra/syntax_test_csv.csvdeleted−60

@@ -1,60 +0,0 @@

1−# SYNTAX TEST "CSV.sublime-syntax"

2−Forename,Surname,House No.,Street,City,Postcode

3−#^^^^^^^ meta.field-1

4−# ^ punctuation.separator.sequence

5−# ^^^^^^^ meta.field-2

6−# ^ punctuation.separator.sequence

7−# ^^^^^^^^^ meta.field-3

8−# ^ punctuation.separator.sequence

9−# ^^^^^^ meta.field-4

10−# ^ punctuation.separator.sequence

11−# ^^^^ meta.field-1

12−# ^ punctuation.separator.sequence

13−# ^^^^^^^^ meta.field-2

14−John,Doe,87,Logon Road,Citiville,TU43 6GH

15−#^^^ meta.field-1

16−# ^ punctuation.separator.sequence

17−# ^^^ meta.field-2

18−# ^ punctuation.separator.sequence

19−# ^^ meta.field-3

20−# ^ punctuation.separator.sequence

21−# ^^^^^^^^^^ meta.field-4

22−# ^ punctuation.separator.sequence

23−# ^^^^^^^^^ meta.field-1

24−# ^ punctuation.separator.sequence

25−# ^^^^^^^^ meta.field-2

26−Jane,Doe,22,"""Fun"" Street","The City, County",FA90 1XA

27−#^^^ meta.field-1

28−# ^ punctuation.separator.sequence

29−# ^^^ meta.field-2

30−# ^ punctuation.separator.sequence

31−# ^^ meta.field-3

32−# ^ punctuation.separator.sequence

33−# ^^^^^^^^^^^^^^^^ meta.field-4 string.quoted.double

34−# ^^ constant.character.escape

35−# ^^ constant.character.escape

36−# ^ punctuation.separator.sequence

37−# ^ meta.field-1 string.quoted.double punctuation.definition.string.begin

38−# ^^^^^^^^^^^^^^^^^ meta.field-1 string.quoted.double

39−# ^ meta.field-1 string.quoted.double punctuation.definition.string.end

40−# ^ punctuation.separator.sequence

41−# ^^^^^^^^ meta.field-2

42−Fred,Bloggs,"19","Street

43−#^^^ meta.field-1

44−# ^ punctuation.separator.sequence

45−# ^^^^^^ meta.field-2

46−# ^ punctuation.separator.sequence

47−# ^^^ meta.field-3 string.quoted.double

48−# ^ punctuation.separator.sequence

49−# ^ meta.field-4 punctuation.definition.string.begin

50−# ^^^^^^^^ meta.field-4 string.quoted.double

51−Spanning Multiple ""

52−#^^^^^^^^^^^^^^^^^^^^ meta.field-4 string.quoted.double

53−# ^^ constant.character.escape

54−Lines",Citee,P0stc0d3

55−#^^^^^ meta.field-4 string.quoted.double

56−# ^ meta.field-4 punctuation.definition.string.end

57−# ^ punctuation.separator.sequence

58−# ^^^^^ meta.field-1

59−# ^ punctuation.separator.sequence

60−# ^^^^^^^^ meta.field-2

assets/syntaxes/02_Extra/syntax_test_man.mandeleted−162

@@ -1,162 +0,0 @@

1−# SYNTAX TEST "Manpage.sublime-syntax"

2−SOMETHING(8) System Manager's Manual SOMETHING(8)

3−# ^^^^^ meta.preprocessor

4−# ^^^^^^^^^^^^^^^^^^^^^^^ markup.heading.title

5−# ^^^^^^^ meta.preprocessor

6−

7−NAME

8−#^^^ markup.heading.other

9− example - do something useful

10−

11−SYNOPSIS

12− example [options] [--home DIR] [--shell SHELL] [--no-create-home]

13−# ^ punctuation.section.brackets.begin

14−# ^^^^^^ entity.name.command-line-option

15−# ^^^ variable.parameter

16−# ^ punctuation.section.brackets.end

17−# ^ punctuation.section.brackets.begin

18−# ^^^^^^^ entity.name.command-line-option

19−# ^^^^^ variable.parameter

20−# ^ punctuation.section.brackets.end

21−# ^ punctuation.section.brackets.begin

22−# ^^^^^^^^^^^^^^^^ entity.name.command-line-option

23−# ^ punctuation.section.brackets.end

24− [-u | --set-upstream] [-o <string> | --push-option=<string>]

25−# ^ punctuation.section.brackets.begin

26−# ^^ entity.name.command-line-option

27−# ^ keyword.operator.logical

28−# ^^^^^^^^^^^^^^ entity.name.command-line-option

29−# ^ punctuation.section.brackets.end

30−# ^^^^^^^^^^^^^ entity.name.command-line-option

31− [--force-with-lease[=<refname>[:<expect>]]]

32−# ^ punctuation.section.brackets.begin

33−# ^^^^^^^^^^^^^^^^^^ entity.name.command-line-option

34−# ^ punctuation.section.brackets.begin

35−# ^ keyword.operator

36−# ^^^^^^^ variable.parameter

37−# ^ punctuation.section.brackets.begin

38−# ^^^^^^ variable.parameter

39−# ^^^ punctuation.section.brackets.end

40−

41− example --system [options]

42−# ^^^^^^^^ entity.name

43−

44− COMMON OPTIONS

45− [--quiet] [--debug] [--help|-h] [--version] [--conf FILE]

46−

47− /* According to POSIX.1-2001, POSIX.1-2008 */

48−# ^^ source.c comment.block punctuation.definition.comment

49− #include <sys/select.h>

50−# ^^^^^^^^ source.c meta.preprocessor.include keyword.control.import.include

51− struct timeval {

52−# ^^^^^^ source.c storage.type

53−

54− time_t tv_sec; /* seconds */

55− suseconds_t tv_usec; /* microseconds */

56− };

57−

58−

59−

60−DESCRIPTION

61− example does something useful in relation to the command line options

62− and configuration information in /etc/example.conf.

63−

64−OPTIONS

65− --conf FILE

66−# ^^^^^^ entity.name.command-line-option

67−#^^^^^^ - variable - entity - markup

68−# ^^^^ variable.parameter

69− Use FILE instead of /etc/example.conf.

70−# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - variable - entity

71−

72− --disabled-login

73− Do not run passwd to set the password. The user won't be able

74− to use her account until the password is set.

75−

76− --disabled-password

77− Like --disabled-login, but logins are still possible (for exam-

78−# ^^^^^^^^^^^^^^^^ entity.name

79−#^^^^^^^^^^^^^^^^^^ - entity - variable - markup

80−# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - entity - variable - markup

81− ple using SSH RSA keys) but not using password authentication.

82−

83− --help Display brief instructions.

84−# ^^^^^^ entity.name.command-line-option

85−# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - variable.parameter

86−

87− --home DIR

88−# ^^^^^^ entity.name.command-line-option

89−# ^^^ variable.parameter

90−# ^ - variable - entity - markup

91− Use DIR as the user's home directory, rather than the default

92− specified by the configuration file. If the directory does not

93− exist, it is created and skeleton files are copied.

94−

95− --[no-]signed, --signed=(true|false|if-asked)

96−# ^^^^^^^^^^^^^ entity.name.command-line-option

97−# ^ punctuation.separator

98−# ^^^^^^^^ entity.name.command-line-option

99−# ^ keyword.operator

100−# ^ - variable

101−# ^^^^ variable.parameter

102−# ^ keyword.operator.logical

103−# ^^^^^ variable.parameter

104−# ^ keyword.operator.logical

105−# ^^^^^^^^ variable.parameter

106−# ^ - variable

107− --no-recurse-submodules, --recurse-submodules=check|on-demand|only|no

108−# ^^^^^^^^^^^^^^^^^^^^^^^ entity.name.command-line-option

109−# ^ punctuation.separator

110−# ^^^^^^^^^^^^^^^^^^^^ entity.name.command-line-option

111−# ^ keyword.operator

112−# ^^^^^ variable.parameter

113−# ^ keyword.operator.logical

114−# ^^^^^^^^^ variable.parameter

115−# ^ keyword.operator.logical

116−# ^^^^ variable.parameter

117−# ^ keyword.operator.logical

118−# ^^ variable.parameter

119− May be used to make sure all submodule commits used by the

120−

121− -c, -C NUM, --context[=NUM]

122−# ^^ entity.name.command-line-option

123−# ^ punctuation.separator

124−# ^^ entity.name.command-line-option

125−# ^^^ variable.parameter

126−# ^ punctuation.separator

127−# ^^^^^^^^^ entity.name.command-line-option

128−# ^^^^^^^ - entity.name

129−# ^ keyword.operator

130−# ^^^ variable.parameter

131−# ^^ - variable

132− output NUM (default 3) lines of copied context

133−

134−EXAMPLE

135− #include <stdio.h>

136−# ^^^^^^^^ source.c meta.preprocessor.include keyword.control.import.include

137−

138− (This is not C code.)

139−# ^^^^^^^^^^^^^^^^^^^^^^ - source.c

140−

141− struct timeval {

142− time_t tv_sec; /* seconds */

143− suseconds_t tv_usec; /* microseconds */

144− };

145−# ^ source.c punctuation.terminator

146−

147− The corresponding argument for pselect() has the following type:

148−#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.c

149− #define POLLIN_SET (EPOLLRDNORM | EPOLLRDBAND | EPOLLIN |

150− EPOLLHUP | EPOLLERR)

151−# ^ source.c meta.preprocessor.macro meta.group punctuation.section.group.end

152−

153−ENVIRONMENT

154− $SYSTEMD_LOG_LEVEL

155−# ^ punctuation.definition.variable

156−# ^^^^^^^^^^^^^^^^^ constant.other

157− systemd reads the log level from this environment variable. This

158− can be overridden with --log-level=.

159−

160−SEE ALSO

161− The systemd Homepage[11], systemd-system.conf(5), locale.conf(5)

162−# ^^^^^^^^^^^^^^^^^^^ entity.name.function

assets/syntaxes/02_Extra/syntax_test_tsv.tsvdeleted−60

@@ -1,60 +0,0 @@

1−# SYNTAX TEST "CSV.sublime-syntax"

2−Forename Surname House No. Street City Postcode

3−#^^^^^^^ meta.field-1

4−# ^ punctuation.separator.sequence

5−# ^^^^^^^ meta.field-2

6−# ^ punctuation.separator.sequence

7−# ^^^^^^^^^ meta.field-3

8−# ^ punctuation.separator.sequence

9−# ^^^^^^ meta.field-4

10−# ^ punctuation.separator.sequence

11−# ^^^^ meta.field-1

12−# ^ punctuation.separator.sequence

13−# ^^^^^^^^ meta.field-2

14−John Doe 87 Logon Road Citiville TU43 6GH

15−#^^^ meta.field-1

16−# ^ punctuation.separator.sequence

17−# ^^^ meta.field-2

18−# ^ punctuation.separator.sequence

19−# ^^ meta.field-3

20−# ^ punctuation.separator.sequence

21−# ^^^^^^^^^^ meta.field-4

22−# ^ punctuation.separator.sequence

23−# ^^^^^^^^^ meta.field-1

24−# ^ punctuation.separator.sequence

25−# ^^^^^^^^ meta.field-2

26−Jane Doe 22 """Fun"" Street" "The City County" FA90 1XA

27−#^^^ meta.field-1

28−# ^ punctuation.separator.sequence

29−# ^^^ meta.field-2

30−# ^ punctuation.separator.sequence

31−# ^^ meta.field-3

32−# ^ punctuation.separator.sequence

33−# ^^^^^^^^^^^^^^^^ meta.field-4 string.quoted.double

34−# ^^ constant.character.escape

35−# ^^ constant.character.escape

36−# ^ punctuation.separator.sequence

37−# ^ meta.field-1 string.quoted.double punctuation.definition.string.begin

38−# ^^^^^^^^^^^^^^^^^ meta.field-1 string.quoted.double

39−# ^ meta.field-1 string.quoted.double punctuation.definition.string.end

40−# ^ punctuation.separator.sequence

41−# ^^^^^^^^ meta.field-2

42−Fred Bloggs "19" "Street

43−#^^^ meta.field-1

44−# ^ punctuation.separator.sequence

45−# ^^^^^^ meta.field-2

46−# ^ punctuation.separator.sequence

47−# ^^^ meta.field-3 string.quoted.double

48−# ^ punctuation.separator.sequence

49−# ^ meta.field-4 punctuation.definition.string.begin

50−# ^^^^^^^^ meta.field-4 string.quoted.double

51−Spanning Multiple ""

52−#^^^^^^^^^^^^^^^^^^^^ meta.field-4 string.quoted.double

53−# ^^ constant.character.escape

54−Lines" Citee P0stc0d3

55−#^^^^^ meta.field-4 string.quoted.double

56−# ^ meta.field-4 punctuation.definition.string.end

57−# ^ punctuation.separator.sequence

58−# ^^^^^ meta.field-1

59−# ^ punctuation.separator.sequence

60−# ^^^^^^^^ meta.field-2

assets/syntaxes/02_Extra/syslog.sublime-syntaxdeleted−63

@@ -1,63 +0,0 @@

1−%YAML 1.2

2−---

3−# http://www.sublimetext.com/docs/3/syntax.html

4−name: syslog

5−file_extensions:

6− - syslog

7−scope: text.log.syslog

8−contexts:

9− main:

10− - match: ^(\w+\s+\d+)\s+(\d{2}:\d{2}:\d{2})

11− scope: meta.datetime.syslog constant.numeric.syslog

12− captures:

13− 1: meta.date.syslog

14− 2: meta.time.syslog

15− push: loghost

16− - match: ^

17− push: text

18− loghost:

19− - match: '[\w:.-]+'

20− scope: entity.other.attribute-name.loghost.syslog

21− set: process

22− process:

23− - match: ([\w.-]+)(?:(\[)(\d+)(\]))?([ :])

24− captures:

25− 1: support.function.process.syslog

26− 2: punctuation.separator.pid.begin.syslog

27− 3: meta.pid.syslog meta.number.integer.syslog constant.numeric.value.syslog

28− 4: punctuation.separator.pid.end.syslog

29− 5: punctuation.separator.mapping.syslog

30− set: structured-data

31− structured-data:

32− - match: '\['

33− scope: punctuation.section.mapping.begin.syslog

34− push:

35− - match: \]

36− scope: punctuation.section.mapping.end.syslog

37− pop: true

38− - match: \w+

39− scope: variable.parameter.syslog

40− - match: =

41− scope: keyword.operator.assignment.syslog

42− push:

43− - match: '[^\s\]]+'

44− scope: constant.other.syslog

45− pop: true

46− - match: (?=\])

47− pop: true

48− - match: (?=\S)

49− set: text

50− text:

51− - match: $

52− pop: true

53− - match: '<\w+>'

54− scope: constant.language.syslog

55− - match: \b(CMD)\b\s+(\()

56− captures:

57− 1: entity.name.label.syslog

58− 2: punctuation.section.block.begin.syslog

59− embed: scope:source.shell.bash

60− escape: \)$

61− escape_captures:

62− 0: punctuation.section.block.end.syslog

63− - include: scope:text.log

assets/syntaxes/AWKnew file+1

Submodule changed.

assets/syntaxes/AsciiDocnew file+1

Submodule changed.

assets/syntaxes/AsciiDoc.sublime-syntaxnew file+283

@@ -0,0 +1,283 @@

1+%YAML 1.2

2+---

3+# http://www.sublimetext.com/docs/3/syntax.html

4+name: AsciiDoc

5+comment: |

6+ A very early hack. Mostly ripped from other syntaxes.

7+ Only the very basic stuff is working.

8+file_extensions:

9+ - adoc

10+ - asciidoc

11+ - asc

12+scope: text.html.asciidoc

13+contexts:

14+ main:

15+ - include: heading_inline

16+ - include: heading-block

17+ - include: heading-blockattr

18+ - match: \$\$(?!\$)

19+ push:

20+ - meta_scope: comment.block.passthrough.macro.doubledollar.asciidoc

21+ - match: \$\$(?!\$)

22+ pop: true

23+ - match: \+\+\+(?!\+)

24+ push:

25+ - meta_scope: comment.block.passthrough.macro.tripeplus.asciidoc

26+ - match: \+\+\+(?!\+)

27+ pop: true

28+ - match: (//).*$\n?

29+ scope: comment.line.double-slash.asciidoc

30+ - match: |-

31+ (?x)^

32+ (?= ([/+-.*_=]{4,})\s*$

33+ | ([ \t]{1,})

34+ | [=]{1,6}\s*+

35+ | [ ]{,3}(?<marker>[-*_])([ ]{,2}\k<marker>){2,}[ \t]*+$

36+ )

37+ push:

38+ - meta_scope: meta.block-level.asciidoc

39+ - match: |-

40+ (?x)^

41+ (?! \1

42+ | ([ \t]{1,})

43+ | [=]{1,6}\s*+

44+ | [ ]{,3}(?<marker>[-*_])([ ]{,2}\k<marker>){2,}[ \t]*+$

45+ )

46+ pop: true

47+ - include: block_quote

48+ - include: block_raw

49+ - include: heading_inline

50+ - include: heading-block

51+ - include: separator

52+ - match: '^[ ]{0,3}([*+-])(?=\s)'

53+ captures:

54+ 1: punctuation.definition.list_item.asciidoc

55+ push:

56+ - meta_scope: markup.list.unnumbered.asciidoc

57+ - match: ^(?=\S)

58+ captures:

59+ 1: punctuation.definition.list_item.asciidoc

60+ pop: true

61+ - include: list-paragraph

62+ - match: '^[ ]{0,3}[0-9]+(\.)(?=\s)'

63+ captures:

64+ 1: punctuation.definition.list_item.asciidoc

65+ push:

66+ - meta_scope: markup.list.numbered.asciidoc

67+ - match: ^(?=\S)

68+ captures:

69+ 1: punctuation.definition.list_item.asciidoc

70+ pop: true

71+ - include: list-paragraph

72+ - match: '^([/+-.*_=]){4,}\s*$'

73+ push:

74+ - meta_scope: comment.block.asciidoc

75+ - match: '^\1{4,}\s*$'

76+ pop: true

77+ - match: '^([/+.]){4,}\s*$'

78+ comment: asciidoc formatting is disabled inside certain blocks.

79+ push:

80+ - meta_scope: meta.disable-asciidoc

81+ - match: '^[/+.]{4,}\s*$'

82+ pop: true

83+ - match: '^(?=\S)(?![=-]{3,}(?=$))(?!\.\S+)'

84+ push:

85+ - meta_scope: meta.paragraph.asciidoc

86+ - match: '^(?:\s*$|(?=[ ]{,3}>.))|(?=[ \t]*\n)(?<=^===|^====|=====|^---|^----|-----)[ \t]*\n'

87+ pop: true

88+ - include: inline

89+ - include: scope:text.html.basic

90+ - match: '^(={3,})(?=[ \t]*$)'

91+ scope: markup.heading.0.asciidoc

92+ captures:

93+ 1: punctuation.definition.heading.asciidoc

94+ - match: '^(-{3,})(?=[ \t]*$)'

95+ scope: markup.heading.1.asciidoc

96+ captures:

97+ 1: punctuation.definition.heading.asciidoc

98+ - match: '^(~{3,})(?=[ \t]*$)'

99+ scope: markup.heading.2.asciidoc

100+ captures:

101+ 1: punctuation.definition.heading.asciidoc

102+ - match: '^(\^{3,})(?=[ \t]*$)'

103+ scope: markup.heading.3.asciidoc

104+ captures:

105+ 1: punctuation.definition.heading.asciidoc

106+ - match: '^(\+{3,})(?=[ \t]*$)'

107+ scope: markup.heading.4.asciidoc

108+ captures:

109+ 1: punctuation.definition.heading.asciidoc

110+ attribute-entry:

111+ - match: '^:[-_. A-Za-z0-9]+:\s*(.*)\s*$'

112+ scope: variable.other

113+ attribute-reference:

114+ - match: "{[-_. A-Za-z0-9]+}"

115+ scope: variable.other

116+ attribute-reference-predefined:

117+ - match: "{(?i:amp|asciidoc-dir|asciidoc-file|asciidoc-version|author|authored|authorinitials|backend-docbook|backend-xhtml11|backend-html4|docbook-article|xhtml11-article|html4-article|docbook-book|xhtml11-book|html4-book|docbook-manpage|xhtml11-manpage|html4-manpage|backend|backslash|basebackend|brvbar|date|docdate|doctime|docname|docfile|docdir|doctitle|doctype-article|doctype-book|doctype-manpage|doctype|email|empty|encoding|filetype|firstname|gt|id|indir|infile|lastname|level|listindex|localdate|localtime|lt|manname|manpurpose|mantitle|manvolnum|middlename|nbsp|outdir|outfile|reftext|revision|sectnum|showcomments|title|two_colons|two_semicolons|user-dir|verbose)}"

118+ scope: support.variable

119+ block_quote:

120+ - match: '^([/+-.*_=]){4,}\s*$'

121+ push:

122+ - meta_scope: comment.block.asciidoc

123+ - match: '^\1{4,}\s*$'

124+ pop: true

125+ block_raw:

126+ - match: '\G([ ]{4}|\t).*$\n?'

127+ scope: markup.raw.block.asciidoc

128+ bracket:

129+ - match: '<(?![a-z/?\$!])'

130+ comment: |

131+ asciidoc will convert this for us. We match it so that the

132+ HTML grammar will not mark it up as invalid.

133+ scope: meta.other.valid-bracket.asciidoc

134+ character-replacements:

135+ - match: $C$|$R$|$TM$|--(?!-)|\.\.\.(?!\.)|->|<-|=>|<=

136+ scope: constant.character.asciidoc

137+ escape:

138+ - match: '\\[-`*_#+.!(){}\[\]\\>:]'

139+ scope: constant.character.escape.asciidoc

140+ heading:

141+ - match: '(?m)^(\S+)$([=-~^+])+\s*$'

142+ scope: markup.heading.asciidoc

143+ captures:

144+ 1: punctuation.definition.heading.asciidoc

145+ heading-block:

146+ - match: ^\.(\w.*)$

147+ scope: markup.heading.asciidoc

148+ captures:

149+ 1: punctuation.definition.heading.asciidoc

150+ heading-blockattr:

151+ - match: '^\[\[?(\w.*)\]$'

152+ scope: markup.heading.asciidoc

153+ captures:

154+ 1: punctuation.definition.heading.asciidoc

155+ heading_inline:

156+ - match: '\G(={1,6})(?!=)\s*(?=\S)'

157+ captures:

158+ 1: punctuation.definition.heading.asciidoc

159+ push:

160+ - meta_scope: markup.heading.asciidoc

161+ - meta_content_scope: entity.name.section.asciidoc

162+ - match: \s*(=*)$\n?

163+ captures:

164+ 1: punctuation.definition.heading.asciidoc

165+ pop: true

166+ - include: inline

167+ inline:

168+ - include: line-break

169+ - include: line-page-break

170+ - include: line-ruler

171+ - include: escape

172+ - include: passthrough-macro-trippleplus-inline

173+ - include: passthrough-macro-doubledollar-inline

174+ - include: character-replacements

175+ - include: bracket

176+ - include: raw

177+ - include: text-quote-single

178+ - include: text-quote-double

179+ - include: text-quote-other

180+ - include: text-bold-unconstrained

181+ - include: text-italic-unconstrained

182+ - include: text-monospace-unconstrained

183+ - include: text-unquoted-unconstrained

184+ - include: text-bold

185+ - include: text-italic

186+ - include: text-monospace

187+ - include: text-unquoted

188+ - include: attribute-entry

189+ - include: attribute-reference-predefined

190+ - include: attribute-reference

191+ line-break:

192+ - match: (?<=\S)\s+\+$

193+ scope: constant.character.escape.asciidoc

194+ line-page-break:

195+ - match: "^<{3,}$"

196+ scope: constant.character.escape.asciidoc

197+ line-ruler:

198+ - match: "^'{3,}$"

199+ scope: constant.character.escape.asciidoc

200+ list-paragraph:

201+ - match: \G\s+(?=\S)

202+ push:

203+ - meta_scope: meta.paragraph.list.asciidoc

204+ - match: ^\s*$

205+ pop: true

206+ - include: inline

207+ passthrough-macro-doubledollar-inline:

208+ - match: '(?:\[.*\])?\$\$(?!\$).+\$\$(?!\$)'

209+ scope: comment.block.passthrough.asciidoc

210+ passthrough-macro-trippleplus-inline:

211+ - match: '(?:\[.*\])?\+\+\+(?!\+).+\+\+\+(?!\+)'

212+ scope: comment.block.passthrough.asciidoc

213+ raw:

214+ - match: '(`+)(?:[^`]|(?!(?<!`)\1(?!`))`)*+(\1)'

215+ scope: markup.raw.inline.asciidoc

216+ captures:

217+ 1: punctuation.definition.raw.asciidoc

218+ 2: punctuation.definition.raw.asciidoc

219+ separator:

220+ - match: '\G[ ]{,3}([-*_])([ ]{,2}\1){2,}[ \t]*$\n?'

221+ scope: meta.separator.asciidoc

222+ text-bold:

223+ - match: (?<!\w)(\*)(?=\S)

224+ captures:

225+ 1: punctuation.definition.bold.asciidoc

226+ push:

227+ - meta_scope: markup.bold.asciidoc

228+ - match: (?<=\S)(\1)(?!\w)

229+ captures:

230+ 1: punctuation.definition.bold.asciidoc

231+ pop: true

232+ text-bold-unconstrained:

233+ - match: (\*\*)(?=\S)

234+ captures:

235+ 1: punctuation.definition.bold.asciidoc

236+ push:

237+ - meta_scope: markup.bold.asciidoc

238+ - match: (?<=\S)(\1)

239+ captures:

240+ 1: punctuation.definition.bold.asciidoc

241+ pop: true

242+ text-italic:

243+ - match: (?<!\w)('|_)(?=\S)

244+ captures:

245+ 1: punctuation.definition.italic.asciidoc

246+ push:

247+ - meta_scope: markup.italic.asciidoc

248+ - match: (?<=\S)(\1)((?!\1)|(?=\1\1))(?!\w)

249+ captures:

250+ 1: punctuation.definition.italic.asciidoc

251+ pop: true

252+ text-italic-unconstrained:

253+ - match: (__)(?=\S)

254+ captures:

255+ 1: punctuation.definition.italic.asciidoc

256+ push:

257+ - meta_scope: markup.italic.asciidoc

258+ - match: (?<=\S)(\1)

259+ captures:

260+ 1: punctuation.definition.italic.asciidoc

261+ pop: true

262+ text-monospace:

263+ - match: '(?<!\w)([\+`])[^\+]*(\1)(?!\w)'

264+ scope: string.interpolated.asciidoc

265+ text-monospace-unconstrained:

266+ - match: (\+\+).*(\1)

267+ scope: string.interpolated.asciidoc

268+ text-quote-double:

269+ - match: '(?<!\w)(?:\[.*\])?``(?!`).*''''(?!'')(?!\w)'

270+ scope: string.quoted.double.asciidoc

271+ text-quote-other:

272+ - match: '(?<!\w)(?:\[.*\])?([~^]).*(\1)(?!\w)'

273+ scope: string.quoted.single.asciidoc

274+ text-quote-single:

275+ - match: '(?<!\w)(?:\[.*\])?`(?!`).*''(?!'')(?!\w)'

276+ comment: "TODO: Sub- and Superscript are really unconstrained"

277+ scope: string.quoted.single.asciidoc

278+ text-unquoted:

279+ - match: (?<!\w)(#).*(\1)(?!\w)

280+ scope: string.unquoted.asciidoc

281+ text-unquoted-unconstrained:

282+ - match: (##).*(\1)

283+ scope: string.unquoted.asciidoc

assets/syntaxes/02_Extra/Assembly (ARM) → assets/syntaxes/Assembly (ARM)renamed

The content is the same.

assets/syntaxes/02_Extra/Assembly (ARM).sublime-syntax → assets/syntaxes/Assembly (ARM).sublime-syntaxrenamed

The content is the same.

assets/syntaxes/02_Extra/Assembly (x86_64).sublime-syntax → assets/syntaxes/Assembly (x86_64).sublime-syntaxrenamed

The content is the same.

assets/syntaxes/CMakenew file+1

Submodule changed.

assets/syntaxes/CSVnew file+1

Submodule changed.

assets/syntaxes/CSV.sublime-syntaxnew file+46

@@ -0,0 +1,46 @@

1+%YAML 1.2

2+---

3+# http://www.sublimetext.com/docs/3/syntax.html

4+name: Advanced CSV

5+file_extensions:

6+ - csv

7+ - tsv

8+scope: text.advanced_csv

9+contexts:

10+ main:

11+ - match: (\")

12+ captures:

13+ 1: string.quoted.double.advanced_csv

14+ push:

15+ - meta_scope: meta.quoted.advanced_csv

16+ - match: (\")

17+ captures:

18+ 1: string.quoted.double.advanced_csv

19+ pop: true

20+ - include: main

21+ - match: '(\[([+-]?\d*)(\:)?([+-]?\d*)(\,)?([+-]?\d*)(\:)?([+-]?\d*)\])?\s*([<>v^])?\s*(=)'

22+ captures:

23+ 1: keyword.operator.advanced_csv

24+ 2: constant.numeric.formula.advanced_csv

25+ 4: constant.numeric.formula.advanced_csv

26+ 6: constant.numeric.formula.advanced_csv

27+ 8: constant.numeric.formula.advanced_csv

28+ 9: keyword.operator.advanced_csv

29+ 10: keyword.operator.advanced_csv

30+ push:

31+ - meta_scope: meta.range.advanced_csv

32+ - match: (?=(\")|$)

33+ pop: true

34+ - include: scope:source.python

35+ - match: '(?<=^|,|\s|\")([0-9.eE+-]+)(?=$|,|\s|\")'

36+ scope: meta.number.advanced_csv

37+ captures:

38+ 1: constant.numeric.advanced_csv

39+ - match: '(?<=^|,|\s|\")([^, \t\"]+)(?=$|,|\s|\")'

40+ scope: meta.nonnumber.advanced_csv

41+ captures:

42+ 1: storage.type.advanced_csv

43+ - match: (\,)

44+ scope: meta.delimiter.advanced_csv

45+ captures:

46+ 1: keyword.operator.advanced_csv

assets/syntaxes/Cabalnew file+1

Submodule changed.

assets/syntaxes/02_Extra/Cabal.sublime-syntax → assets/syntaxes/Cabal.sublime-syntaxrenamed+1−1

@@ -33,7 +33,7 @@ contexts:

33 captures:

34 1: constant.other.cabal

35 2: punctuation.entity.cabal

37 scope: entity.cabal

38 captures:

39 1: keyword.entity.cabal

assets/syntaxes/Crystalnew file+1

Submodule changed.

assets/syntaxes/02_Extra/Crystal.sublime-syntax → assets/syntaxes/Crystal.sublime-syntaxrenamed+11−12

@@ -108,7 +108,7 @@ contexts:

108 - match: (?<!\.)\belse(\s)+if\b

109 comment: else if is a common mistake carried over from other languages. it works if you put in a second end, but it’s never what you want.

110 scope: invalid.deprecated.crystal

112 comment: everything being a reserved word, not a value and needing a 'end' is a..

113 scope: keyword.control.primary.crystal

114 - match: '(?<!\.)\b(when|else|elsif)\b(?![?!])'

@@ -131,9 +131,9 @@ contexts:

131 scope: keyword.control.pseudo-method.crystal

132 - match: '\b(nil|true|false)\b(?![?!])'

133 scope: constant.language.crystal

134+ - match: '\b(__(DIR|FILE|LINE)__|self)\b(?![?!])'

135 scope: variable.language.crystal

137 comment: everything being a method but having a special function is a..

138 scope: keyword.control.special-method.crystal

139 - match: \b(require)\b

@@ -180,7 +180,7 @@ contexts:

180 (?<=^|\s)(def)\s+ # the def keyword

181 ( (?>[a-zA-Z_\x{80}-\x{10FFFF}][\x{80}-\x{10FFFF}\w]*(?>\.|::))? # a method name prefix

182 (?>[a-zA-Z_\x{80}-\x{10FFFF}][\x{80}-\x{10FFFF}\w]*(?>[?!]|=(?!>))? # the method name

183− |===?|>[>=]?|<=>|<[<=]?|[%&`/\|]|\*\*?|=?~|[-+]@?|\[\](?:=|\?)?) ) # …or an operator method

183+ |===?|>[>=]?|<=>|<[<=]?|[%&`/\|]|\*\*?|=?~|[-+]@?|\[\]=?) ) # …or an operator method

184 \s*(\() # the openning parenthesis for arguments

185 comment: the method pattern comes from the symbol pattern, see there for a explaination

186 captures:

@@ -190,7 +190,7 @@ contexts:

190 push:

191 - meta_scope: meta.function.method.with-arguments.crystal

192 - meta_content_scope: variable.parameter.function.crystal

193− - match: \)

193+ - match: \)\s*$|\)\s*:|\)\s*;

194 captures:

195 0: punctuation.definition.parameters.crystal

196 pop: true

@@ -201,7 +201,7 @@ contexts:

201 (?<=^|\s)(def)\s+ # the def keyword

202 ( (?>[a-zA-Z_\x{80}-\x{10FFFF}][\w\x{80}-\x{10FFFF}]*(?>\.|::))? # a method name prefix

203 (?>[a-zA-Z_\x{80}-\x{10FFFF}][\w\x{80}-\x{10FFFF}]*(?>[?!]|=(?!>))? # the method name

204− |===?|>[>=]?|<=>|<[<=]?|[%&`/\|]|\*\*?|=?~|[-+]@?|\[\](?:=|\?)?) ) # …or an operator method

204+ |===?|>[>=]?|<=>|<[<=]?|[%&`/\|]|\*\*?|=?~|[-+]@?|\[\]=?) ) # …or an operator method

205 [ \t] # the space separating the arguments

206 (?=[ \t]*[^\s#;]) # make sure arguments and not a comment follow

207 comment: same as the previous rule, but without parentheses around the arguments

@@ -221,7 +221,7 @@ contexts:

221 ( \s+ # an optional group of whitespace followed by…

222 ( (?>[a-zA-Z_\x{80}-\x{10FFFF}][\w\x{80}-\x{10FFFF}]*(?>\.|::))? # a method name prefix

223 (?>[a-zA-Z_\x{80}-\x{10FFFF}][\w\x{80}-\x{10FFFF}]*(?>[?!]|=(?!>))? # the method name

224− |===?|>[>=]?|<=>|<[<=]?|[%&`/\|]|\*\*?|=?~|[-+]@?|\[\](?:=|\?)?) ) )? # …or an operator method

224+ |===?|>[>=]?|<=>|<[<=]?|[%&`/\|]|\*\*?|=?~|[-+]@?|\[\]=?) ) )? # …or an operator method

225 comment: the optional name is just to catch the def also without a method-name

226 scope: meta.function.method.without-arguments.crystal

227 captures:

@@ -588,7 +588,7 @@ contexts:

588 pop: true

589 - match: \\.

590 comment: Cant be named because its not neccesarily an escape.

591− - match: '(?<!:)(:)(?>[a-zA-Z_\x{80}-\x{10FFFF}][\w\x{80}-\x{10FFFF}]*(?>[?!]|=(?![>=]))?|===?|>[>=]?|<[<=]?|<=>|[%&`/\|]|\*\*?|=?~|[-+]@?|\[\](?:=|\?)?|@@?[a-zA-Z_\x{80}-\x{10FFFF}][\w\x{80}-\x{10FFFF}]*|!=?(?![?!]))'

591+ - match: '(?<!:)(:)(?>[a-zA-Z_\x{80}-\x{10FFFF}][\w\x{80}-\x{10FFFF}]*(?>[?!]|=(?![>=]))?|===?|>[>=]?|<[<=]?|<=>|[%&`/\|]|\*\*?|=?~|[-+]@?|\[\]=?|@@?[a-zA-Z_\x{80}-\x{10FFFF}][\w\x{80}-\x{10FFFF}]*)'

592 comment: symbols

593 scope: constant.other.symbol.crystal

594 captures:

@@ -705,7 +705,6 @@ contexts:

705 0: punctuation.definition.string.end.crystal

706 pop: true

707 - include: heredoc

708− - include: scope:text.html.basic

709 - include: scope:source.js

708 - include: scope:source.js

710 - include: interpolated_crystal

709 - include: interpolated_crystal

711 - include: escaped_char

710 - include: escaped_char

@@ -714,14 +713,14 @@ contexts:

714 captures:

713 captures:

715 0: punctuation.definition.string.begin.crystal

714 0: punctuation.definition.string.begin.crystal

716 push:

715 push:

717− - meta_scope: string.unquoted.embedded.js.crystal

716+ - meta_scope: string.unquoted.embedded.js.jquery.crystal

718− - meta_content_scope: text.js.embedded.crystal

717+ - meta_content_scope: text.js.jquery.embedded.crystal

719 - match: \s*\2$

718 - match: \s*\2$

720 captures:

719 captures:

721 0: punctuation.definition.string.end.crystal

720 0: punctuation.definition.string.end.crystal

722 pop: true

721 pop: true

723 - include: heredoc

722 - include: heredoc

724− - include: scope:source.js

723+ - include: scope:source.js.jquery

725 - include: interpolated_crystal

724 - include: interpolated_crystal

726 - include: escaped_char

725 - include: escaped_char

727 - match: '(?><<-("?)((?:[_\w]+_|)(?:SH|SHELL))\b\1)'

726 - match: '(?><<-("?)((?:[_\w]+_|)(?:SH|SHELL))\b\1)'

assets/syntaxes/Dartnew file+1

Submodule changed.

assets/syntaxes/Dart.sublime-syntaxnew file+369

@@ -0,0 +1,369 @@

1+%YAML 1.2

2+---

3+# http://www.sublimetext.com/docs/3/syntax.html

4+name: Dart

5+file_extensions:

6+ - dart

7+scope: source.dart

8+contexts:

9+ main:

10+ - match: ^(#!.*)$

11+ scope: meta.preprocessor.script.dart

12+ - match: ^\s*\b(library|import|export|part of|part)\b

13+ captures:

14+ 0: keyword.other.import.dart

15+ push:

16+ - meta_scope: meta.declaration.dart

17+ - match: ;

18+ captures:

19+ 0: punctuation.terminator.dart

20+ pop: true

21+ - include: strings

22+ - match: \b(as|show|hide|deferred)\b

23+ scope: keyword.other.import.dart

24+ - include: comments

25+ - include: constants-and-special-vars

26+ - include: annotations

27+ - include: decl-typedef

28+ - include: decl-class

29+ - include: decl-enum

30+ - include: decl-function

31+ - include: keywords

32+ - include: strings

33+ annotations:

34+ - match: '^(?:\s*)((@)([a-zA-Z0-9_]+))'

35+ captures:

36+ 1: annotation.dart

37+ 2: entity.name.function.annotation.dart

38+ 3: support.type.dart

39+ comments:

40+ - match: /\*\*/

41+ scope: comment.block.empty.dart

42+ captures:

43+ 0: punctuation.definition.comment.dart

44+ - include: comments-inline

45+ comments-inline:

46+ - match: /\*

47+ push:

48+ - meta_scope: comment.block.dart

49+ - match: \*/

50+ pop: true

51+ - include: scope:text.dart-doccomments

52+ - match: (///)

53+ captures:

54+ 1: marker.dart

55+ push:

56+ - meta_scope: comment.line.triple-slash.dart

57+ - match: $

58+ pop: true

59+ - include: scope:text.dart-doccomments

60+ - match: (//)

61+ captures:

62+ 1: marker.dart

63+ push:

64+ - meta_scope: comment.line.double-slash.dart

65+ - match: $

66+ pop: true

67+ - include: scope:text.dart-doccomments

68+ constants-and-special-vars:

69+ - match: \b(true|false|null)\b

70+ scope: constant.language.dart

71+ - match: \b(this|super)\b

72+ scope: variable.language.dart

73+ - match: '\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)\b'

74+ scope: constant.numeric.dart

75+ decl-class:

76+ - match: \bclass\b

77+ captures:

78+ 0: keyword.control.new.dart

79+ push:

80+ - meta_scope: meta.declaration.class.dart

81+ - match: "(?={)"

82+ pop: true

83+ - include: keywords

84+ - match: "[A-Za-z_][A-Za-z0-9_]*"

85+ scope: class.name.dart

86+ decl-enum:

87+ - match: \benum\b

88+ captures:

89+ 0: keyword.declaration.dart

90+ push:

91+ - meta_scope: meta.declaration.enum.dart

92+ - match: "(?={)"

93+ pop: true

94+ - include: keywords

95+ - match: "[A-Za-z_][A-Za-z0-9_]*"

96+ scope: enum.name.dart

97+ decl-function:

99+ comment: A getter with a primitive return type.

100+ scope: meta.declaration.function.dart

101+ captures:

102+ 1: storage.type.primitive.dart

103+ 2: keyword.declaration.dart

104+ 3: function.name.dart

105+ - match: ^\s*(?:\b(\w+)\b\s+)?(get)\s+(\w+)\s+(?==>)

106+ comment: A getter with a user-defined return type or no return type.

107+ scope: meta.declaration.function.dart

108+ captures:

109+ 1: type.user-defined.dart

110+ 2: keyword.declaration.dart

111+ 3: function.name.dart

112+ - match: ^\s*(set)\s+(\w+)(?=\()

113+ comment: A setter.

114+ captures:

115+ 1: keyword.declaration.dart

116+ 2: function.name.dart

117+ push:

118+ - meta_scope: meta.declaration.function.dart

119+ - match: \)

120+ pop: true

121+ - include: comments-inline

122+ - include: decl-function-parameter

123+ - include: strings

124+ - include: keywords

126+ comment: A function with a primitive return type.

127+ captures:

128+ 1: storage.type.primitive.dart

129+ 2: function.name.dart

130+ push:

131+ - meta_scope: meta.declaration.function.dart

132+ - match: \)

133+ pop: true

134+ - include: comments-inline

135+ - include: decl-function-parameter

136+ - include: strings

137+ - include: keywords

138+ - match: ^\s*(?:\b(return)\b)\s+(\w+)(?=\()

139+ comment: A function invocation after 'return'

140+ captures:

141+ 1: keyword.control.dart

142+ 2: function.name.dart

143+ push:

144+ - meta_scope: meta.invocation.function.dart

145+ - match: \)

146+ pop: true

147+ - include: comments-inline

148+ - include: decl-function-parameter

149+ - include: strings

150+ - include: keywords

151+ - match: ^\s*\b(new)\b\s+(\w+)(?=\()

152+ comment: A class instantiation after 'new'

153+ captures:

154+ 1: keyword.declaration.dart

155+ 2: function.name.dart

156+ push:

157+ - meta_scope: meta.invocation.function.dart

158+ - match: \)

159+ pop: true

160+ - include: comments-inline

161+ - include: decl-function-parameter

162+ - include: strings

163+ - include: keywords

164+ decl-function-parameter:

165+ - include: constants-and-special-vars

167+ comment: A function with a primitive return type.

168+ captures:

169+ 1: storage.type.primitive.dart

170+ 2: function.name.dart

171+ push:

172+ - meta_scope: meta.parameter.function.dart

173+ - match: \)

174+ pop: true

175+ - include: decl-function-parameter

176+ - include: strings

177+ - include: keywords

178+ - match: \b(new)\b\s+(\w+)(?=\()

179+ comment: A class instantiation after 'new'

180+ captures:

181+ 1: keyword.declaration.dart

182+ 2: function.name.dart

183+ push:

184+ - meta_scope: meta.invocation.function.dart

185+ - match: \)

186+ pop: true

187+ - include: decl-function-parameter

188+ - include: strings

189+ - include: keywords

190+ - match: (?:\b(\w+)\b)\s+(\w+)(?=\()

191+ comment: A function with a user-defined return type.

192+ captures:

193+ 1: type.user-defined.dart

194+ 2: function.name.dart

195+ push:

196+ - meta_scope: meta.parameter.function.dart

197+ - match: \)

198+ pop: true

199+ - include: decl-function-parameter

200+ - include: strings

201+ - include: keywords

202+ - match: (\w+)(?=\()

203+ comment: A function with no return type.

204+ captures:

205+ 1: function.name.dart

206+ push:

207+ - meta_scope: meta.parameter.function.dart

208+ - match: \)

209+ pop: true

210+ - include: decl-function-parameter

211+ - include: strings

212+ - include: keywords

213+ decl-typedef:

214+ - match: typedef

215+ captures:

216+ 0: keyword.control.new.dart

217+ push:

218+ - meta_scope: meta.declaration.typedef.dart

219+ - match: ;

220+ captures:

221+ 0: punctuation.terminator.dart

222+ pop: true

224+ captures:

225+ 1: storage.type.primitive.dart

226+ 2: typedef.return.dart

227+ 3: typedef.name.dart

228+ - match: \(

229+ push:

230+ - meta_scope: typedef.params.dart

231+ - match: \)

232+ pop: true

233+ - include: keywords

234+ keywords:

235+ - match: \bassert\b

236+ scope: keyword.control.assert.dart

237+ - match: \bas\b

238+ scope: keyword.cast.dart

240+ scope: keyword.control.catch-exception.dart

241+ - match: \s+\?\s+|\s+:\s+

242+ scope: keyword.control.ternary.dart

244+ scope: keyword.control.dart

245+ - match: \b(async\*|async|await\*|await|yield)\b

246+ scope: keyword.control.async.dart

247+ - match: \b(new)\b

248+ scope: keyword.control.new.dart

250+ scope: keyword.declaration.dart

251+ - match: \b(is\!?)\b

252+ scope: keyword.operator.dart

253+ - match: (<<|>>>?|~|\^|\||&)

254+ scope: keyword.operator.bitwise.dart

255+ - match: ((&|\^|\||<<|>>>?)=)

256+ scope: keyword.operator.assignment.bitwise.dart

257+ - match: (===?|!==?|<=?|>=?)

258+ scope: keyword.operator.comparison.dart

259+ - match: '(([+*/%-]|\~)=)'

260+ scope: keyword.operator.assignment.arithmetic.dart

261+ - match: (=)

262+ scope: keyword.operator.assignment.dart

263+ - match: (\-\-|\+\+)

264+ scope: keyword.operator.increment-decrement.dart

265+ - match: (\-|\+|\*|\/|\~\/|%)

266+ scope: keyword.operator.arithmetic.dart

267+ - match: (!|&&|\|\|)

268+ scope: keyword.operator.logical.dart

269+ - match: ;

270+ scope: punctuation.terminator.dart

271+ - match: \b(static|final|const)\b

272+ scope: storage.modifier.dart

274+ scope: storage.type.primitive.dart

275+ regexp:

276+ - match: '\\[^''"]'

277+ scope: constant.character.escaped.regex.dart

278+ - match: \(

279+ push:

280+ - meta_content_scope: meta.capture.regex.dart

281+ - match: \)

282+ pop: true

283+ - match: \?(:|=|!)

284+ scope: ignore.capture.regex.dart

285+ - match: \*|\+|\?|\.|\|

286+ scope: keyword.other.regex.dart

287+ - match: \^|\$

288+ scope: keyword.other.regex.dart

289+ - match: \.

290+ scope: constant.other.regex.dart

291+ - match: '\[(\^)?'

292+ captures:

293+ 1: keyword.other.negation.regex.dart

294+ push:

295+ - meta_scope: constant.character.range.regex.dart

296+ - match: '\]'

297+ pop: true

298+ - match: '\\[^"'']'

299+ scope: constant.character.escaped.regex.dart

300+ - match: '\{(?:\d+)?,(?:\d+)?\}'

301+ scope: keyword.other.regex.dart

302+ string-interp:

303+ - match: '(\$)(\{)'

304+ captures:

305+ 1: keyword.other.dart

306+ 2: keyword.other.dart

307+ push:

308+ - meta_scope: interpolation.dart

309+ - meta_content_scope: source.dart

310+ - match: '(\})'

311+ captures:

312+ 1: keyword.other.dart

313+ pop: true

314+ - include: main

315+ - match: (\$)(\w+)

316+ captures:

317+ 1: keyword.other.dart

318+ 2: variable.parameter.dart

319+ - match: \\.

320+ scope: constant.character.escape.dart

321+ strings:

322+ - match: (?<!r)"""

323+ push:

324+ - meta_scope: string.interpolated.triple.double.dart

325+ - match: '"""(?!")'

326+ pop: true

327+ - include: string-interp

328+ - match: (?<!r)'''

329+ push:

330+ - meta_scope: string.interpolated.triple.single.dart

331+ - match: "'''(?!')"

332+ pop: true

333+ - include: string-interp

334+ - match: r"""

335+ push:

336+ - meta_scope: string.quoted.triple.double.dart

337+ - match: '"""(?!")'

338+ pop: true

339+ - match: r'''

340+ push:

341+ - meta_scope: string.quoted.triple.single.dart

342+ - match: "'''(?!')"

343+ pop: true

344+ - match: (?<!\\|r)"

345+ push:

346+ - meta_scope: string.interpolated.double.dart

347+ - match: '"'

348+ pop: true

349+ - match: \n

350+ scope: invalid.string.newline

351+ - include: string-interp

352+ - match: r"

353+ push:

354+ - meta_scope: string.quoted.double.dart

355+ - match: '"'

356+ pop: true

357+ - include: regexp

358+ - match: (?<!\|r)'

359+ push:

360+ - meta_scope: string.interpolated.single.dart

361+ - match: "'"

362+ pop: true

363+ - include: string-interp

364+ - match: r'

365+ push:

366+ - meta_scope: string.quoted.single.dart

367+ - match: "'"

368+ pop: true

369+ - include: regexp

assets/syntaxes/02_Extra/Docker → assets/syntaxes/Dockerrenamed

The content is the same.

assets/syntaxes/DotENVnew file+1

Submodule changed.

assets/syntaxes/02_Extra/DotENV.sublime-syntax → assets/syntaxes/DotENV.sublime-syntaxrenamed+2−4

@@ -4,6 +4,7 @@

4name: DotENV

5file_extensions:

6 - .env

7+ - .envrc

7 - .env.dist

8 - .env.dist

8 - .env.local

9 - .env.local

9 - .env.sample

10 - .env.sample

@@ -18,11 +19,8 @@ file_extensions:

18 - .env.production

19 - .env.production

19 - .env.production.local

20 - .env.production.local

20 - .env.dusk.local

21 - .env.dusk.local

21− - .env.staging

22− - .env.default

23− - .env.defaults

24− - .envrc

25 - .flaskenv

22 - .flaskenv

23+ - .env.staging

26scope: source.env

24scope: source.env

27contexts:

25contexts:

28 main:

26 main:

assets/syntaxes/Elixirnew file+1

Submodule changed.

assets/syntaxes/Elmnew file+1

Submodule changed.

assets/syntaxes/FSharpnew file+1

Submodule changed.

assets/syntaxes/FSharp.sublime-syntaxnew file+672

@@ -0,0 +1,672 @@

1+%YAML 1.2

2+---

3+# http://www.sublimetext.com/docs/3/syntax.html

4+name: "F#"

5+file_extensions:

6+ - fs

7+ - fsi

8+ - fsx

9+scope: source.fsharp

10+contexts:

11+ main:

12+ - include: compiler_directives

13+ - include: comments

14+ - include: constants

15+ - include: strings

16+ - include: chars

17+ - include: double_tick

18+ - include: definition

19+ - include: abstract_definition

20+ - include: attributes

21+ - include: modules

22+ - include: anonymous_functions

23+ - include: du_declaration

24+ - include: record_declaration

25+ - include: records

26+ - include: strp_inlined

27+ - include: keywords

28+ - include: cexprs

29+ - include: text

30+ abstract_definition:

31+ - match: '\b(abstract)\s+(member)?(\s+\[\<.*\>\])?\s*([_[:alpha:]0-9,\._`\s]+)(:)'

32+ captures:

33+ 1: keyword.fsharp

34+ 2: keyword.fsharp

35+ 3: support.function.attribute.fsharp

36+ 5: keyword.fsharp

37+ push:

38+ - meta_scope: abstract.definition.fsharp

39+ - match: \s*(with)\b|=|$

40+ captures:

41+ 1: keyword.fsharp

42+ pop: true

43+ - include: comments

44+ - include: common_declaration

45+ - match: '(\?{0,1})([[:alpha:]0-9''`^._ ]+)\s*(:)(\s*([[:alpha:]0-9''`^._ ]+)){0,1}'

46+ captures:

47+ 1: keyword.symbol.fsharp

48+ 2: variable.parameter.fsharp

49+ 3: keyword.symbol.fsharp

50+ 4: entity.name.type.fsharp

51+ - match: '(?!with|get|set\b)\b([\w0-9''`^._]+)'

52+ captures:

53+ 1: entity.name.type.fsharp

54+ - include: keywords

55+ anonymous_functions:

56+ - match: \b(fun)\b

57+ captures:

58+ 1: keyword.fsharp

59+ push:

60+ - meta_scope: function.anonymous

61+ - match: (->)

62+ captures:

63+ 1: keyword.fsharp

64+ pop: true

65+ - include: comments

66+ - match: (\()

67+ captures:

68+ 1: keyword.symbol.fsharp

69+ push:

70+ - match: \s*(?=(->))

71+ captures:

72+ 1: keyword.symbol.fsharp

73+ pop: true

74+ - include: member_declaration

75+ - include: variables

76+ attributes:

77+ - match: '\[\<'

78+ push:

79+ - meta_scope: support.function.attribute.fsharp

80+ - match: '\>\]|\]'

81+ pop: true

82+ - include: main

83+ cexprs:

84+ - match: '\b(async|seq|promise|task|maybe|asyncMaybe|controller|scope|application|pipeline)\s*\{'

85+ scope: cexpr.fsharp

86+ captures:

87+ 0: keyword.fsharp

88+ chars:

89+ - match: ('\\?.')

90+ scope: char.fsharp

91+ captures:

92+ 1: string.quoted.single.fsharp

93+ comments:

94+ - match: ($\*(?!$))

95+ captures:

96+ 1: comment.block.fsharp

97+ push:

98+ - meta_scope: comment.block.fsharp

99+ - match: (\*\))

100+ captures:

101+ 1: comment.block.fsharp

102+ pop: true

103+ - match: //.*$

104+ scope: comment.line.double-slash.fsharp

105+ common_binding_definition:

106+ - include: comments

107+ - include: attributes

108+ - match: (:)\s*(\()\s*(static member|member)

109+ captures:

110+ 1: keyword.symbol.fsharp

111+ 2: keyword.symbol.fsharp

112+ 3: keyword.fsharp

113+ push:

114+ - match: (\))\s*((?=,)|(?=\=))

115+ captures:

116+ 1: keyword.symbol.fsharp

117+ pop: true

118+ - match: '(\^[[:alpha:]0-9''._]+)'

119+ captures:

120+ 1: entity.name.type.fsharp

121+ - include: variables

122+ - include: keywords

123+ - match: (:)\s*(\()

124+ captures:

125+ 1: keyword.symbol.fsharp

126+ 2: keyword.symbol.fsharp

127+ push:

128+ - match: '(\)\s*(([?[:alpha:]0-9''`^._ ]*)))'

129+ captures:

130+ 1: keyword.symbol.fsharp

131+ 2: entity.name.type.fsharp

132+ pop: true

133+ - include: tuple_signature

134+ - match: '(:)\s*(\^[[:alpha:]0-9''._]+)\s*(when)'

135+ captures:

136+ 1: keyword.symbol.fsharp

137+ 2: entity.name.type.fsharp

138+ 3: keyword.fsharp

139+ push:

140+ - match: (?=:)

141+ captures:

142+ 1: keyword.symbol.fsharp

143+ pop: true

144+ - match: \b(and|when|or)\b

145+ scope: keyword.fsharp

146+ - match: "([[:alpha:]0-9'^._]+)"

147+ comment: Because we first capture the keywords, we can capture what looks like a word and assume it's an entity definition

148+ captures:

149+ 1: entity.name.type.fsharp

150+ - match: ($|$)

151+ scope: keyword.symbol.fsharp

152+ - match: '(:)\s*([?[:alpha:]0-9''`^._ ]+)'

153+ captures:

154+ 1: keyword.symbol.fsharp

155+ 2: entity.name.type.fsharp

156+ - match: '(->)\s*(\()?\s*([?[:alpha:]0-9''`^._ ]+)*'

157+ captures:

158+ 1: keyword.symbol.fsharp

159+ 2: keyword.symbol.fsharp

160+ 3: entity.name.type.fsharp

161+ - match: (\*)\s*(\()

162+ captures:

163+ 1: keyword.symbol.fsharp

164+ 2: keyword.symbol.fsharp

165+ push:

166+ - match: '(\)\s*(([?[:alpha:]0-9''`^._ ]+))+)'

167+ captures:

168+ 1: keyword.symbol.fsharp

169+ 2: entity.name.type.fsharp

170+ pop: true

171+ - include: tuple_signature

172+ - match: '(\*)(\s*([?[:alpha:]0-9''`^._ ]+))*'

173+ captures:

174+ 1: keyword.symbol.fsharp

175+ 2: entity.name.type.fsharp

176+ - match: '(<(?![[:space:]]*\)))'

177+ captures:

178+ 1: keyword.symbol.fsharp

179+ push:

180+ - match: ((?<!:)>)

181+ captures:

182+ 1: keyword.symbol.fsharp

183+ pop: true

184+ - include: generic_declaration

185+ - match: "({)"

186+ captures:

187+ 1: keyword.symbol.fsharp

188+ push:

189+ - match: "(})"

190+ captures:

191+ 1: keyword.symbol.fsharp

192+ pop: true

193+ - include: record_signature

194+ - include: definition

195+ - include: variables

196+ - include: keywords

197+ common_declaration:

198+ - match: '\s*(->)\s*([[:alpha:]0-9''`^._ ]+)(<)'

199+ captures:

200+ 1: keyword.symbol.fsharp

201+ 2: entity.name.type.fsharp

202+ 3: keyword.symbol.fsharp

203+ push:

204+ - match: (>)

205+ captures:

206+ 1: keyword.symbol.fsharp

207+ pop: true

208+ - match: "([[:alpha:]0-9'`^._ ]+)"

209+ captures:

210+ 1: entity.name.type.fsharp

211+ - include: keywords

212+ - match: '\s*(->)\s*(?!with|get|set\b)\b([\w0-9''`^._]+)'

213+ captures:

214+ 1: keyword.symbol.fsharp

215+ 2: entity.name.type.fsharp

216+ - match: '(\?{0,1})([[:alpha:]0-9''`^._ ]+)\s*(:)(\s*([?[:alpha:]0-9''`^._ ]+)(<))'

217+ captures:

218+ 1: keyword.symbol.fsharp

219+ 2: variable.parameter.fsharp

220+ 3: keyword.symbol.fsharp

221+ 4: keyword.symbol.fsharp

222+ 5: entity.name.type.fsharp

223+ push:

224+ - match: (>)

225+ captures:

226+ 1: keyword.symbol.fsharp

227+ pop: true

228+ - match: "([[:alpha:]0-9'`^._ ]+)"

229+ captures:

230+ 1: entity.name.type.fsharp

231+ - include: keywords

232+ compiler_directives:

234+ scope: compiler_directive.fsharp

235+ captures:

236+ constants:

237+ - match: 

238+ scope: constant.language.unit.fsharp

239+ - match: '\b-?[0-9][0-9_]*((\.([0-9][0-9_]*([eE][+-]??[0-9][0-9_]*)?)?)|([eE][+-]??[0-9][0-9_]*))'

240+ scope: constant.numeric.floating-point.fsharp

241+ - match: '\b(-?((0(x|X)[0-9a-fA-F][0-9a-fA-F_]*)|(0(o|O)[0-7][0-7_]*)|(0(b|B)[01][01_]*)|([0-9][0-9_]*)))'

242+ scope: constant.numeric.integer.nativeint.fsharp

243+ - match: \b(true|false|null|unit)\b

244+ scope: constant.others.fsharp

245+ definition:

247+ captures:

248+ 1: keyword.fsharp

249+ 2: keyword.fsharp

250+ 3: support.function.attribute.fsharp

251+ 4: keyword.fsharp

252+ 5: variable.fsharp

253+ push:

254+ - meta_scope: binding.fsharp

255+ - match: \s*(with\b|=|\n+=|(?<=\=))

256+ captures:

257+ 1: keyword.fsharp

258+ pop: true

259+ - include: common_binding_definition

261+ captures:

262+ 1: keyword.fsharp

263+ 2: keyword.fsharp

264+ 3: support.function.attribute.fsharp

265+ 4: keyword.fsharp

266+ 5: variable.fsharp

267+ push:

268+ - meta_scope: binding.fsharp

269+ - match: \n$

270+ pop: true

271+ - include: common_binding_definition

272+ double_tick:

273+ - match: (``)(.*)(``)

274+ scope: variable.other.binding.fsharp

275+ captures:

276+ 1: string.quoted.single.fsharp

277+ 2: variable.other.binding.fsharp

278+ 3: string.quoted.single.fsharp

279+ du_declaration:

280+ - match: \b(of)\b

281+ captures:

282+ 1: keyword.fsharp

283+ push:

284+ - meta_scope: du_declaration.fsharp

285+ - match: $|(\|)

286+ captures:

287+ 1: keyword.symbol.fsharp

288+ pop: true

289+ - include: comments

290+ - match: '([[:alpha:]0-9''`<>^._]+|``[[:alpha:]0-9'' <>^._]+``)\s*(:)\s*([[:alpha:]0-9''`<>^._]+|``[[:alpha:]0-9'' <>^._]+``)'

291+ captures:

292+ 1: variable.parameter.fsharp

293+ 2: keyword.symbol.fsharp

294+ 3: entity.name.type.fsharp

295+ - match: "([[:alpha:]0-9'`^._]+)|``([[:alpha:]0-9'^._ ]+)``"

296+ captures:

297+ 1: entity.name.type.fsharp

298+ - include: keywords

299+ generic_declaration:

300+ - match: (:)\s*(\()\s*(static member|member)

301+ captures:

302+ 1: keyword.symbol.fsharp

303+ 2: keyword.symbol.fsharp

304+ 3: keyword.fsharp

305+ push:

306+ - match: (\))

307+ captures:

308+ 1: keyword.symbol.fsharp

309+ pop: true

310+ - match: (\()

311+ captures:

312+ 1: keyword.symbol.fsharp

313+ push:

314+ - match: (\))

315+ captures:

316+ 1: keyword.symbol.fsharp

317+ pop: true

318+ - include: member_declaration

319+ - match: '((''|\^)[[:alpha:]0-9''._]+)'

320+ captures:

321+ 1: entity.name.type.fsharp

322+ - include: variables

323+ - include: keywords

325+ scope: keyword.fsharp

326+ - match: ":"

327+ scope: keyword.fsharp

328+ - include: constants

329+ - match: '((''|\^)[[:alpha:]0-9''._]+)'

330+ captures:

331+ 1: entity.name.type.fsharp

332+ - match: (<)

333+ captures:

334+ 1: keyword.symbol.fsharp

335+ push:

336+ - match: (>)

337+ captures:

338+ 1: keyword.symbol.fsharp

339+ pop: true

340+ - match: '((''|\^)[[:alpha:]0-9''._]+)'

341+ captures:

342+ 1: entity.name.type.fsharp

343+ - include: tuple_signature

344+ - include: generic_declaration

345+ - match: '(?!when|and|or\b)\b([\w0-9''`^._]+)'

346+ captures:

347+ 1: entity.name.type.fsharp

348+ - match: (\|)

349+ captures:

350+ 1: keyword.symbol.fsharp

351+ - include: keywords

352+ keywords:

354+ scope: keyword.fsharp

355+ - match: '(&&&|\|\|\||\^\^\^|~~~|<<<|>>>|\|>|\->|\<\-|:>|:\?>|:|\[|\]|\;|<>|=|@|\|\||&&|{|}|\||_|\.\.|\,|\+|\-|\*|\/|\^|\!|\>|\>\=|\>\>|\<|\<\=|$|$|\<\<)'

356+ scope: keyword.symbol.fsharp

357+ member_declaration:

358+ - include: comments

359+ - include: common_declaration

360+ - match: (:)\s*(\()\s*(static member|member)

361+ captures:

362+ 1: keyword.symbol.fsharp

363+ 2: keyword.symbol.fsharp

364+ 3: keyword.fsharp

365+ push:

366+ - match: (\))\s*((?=,)|(?=\=))

367+ captures:

368+ 1: keyword.symbol.fsharp

369+ pop: true

370+ - match: (\()

371+ captures:

372+ 1: keyword.symbol.fsharp

373+ push:

374+ - match: (\))

375+ captures:

376+ 1: keyword.symbol.fsharp

377+ pop: true

378+ - include: member_declaration

379+ - match: '(\^[[:alpha:]0-9''._]+)'

380+ captures:

381+ 1: entity.name.type.fsharp

382+ - include: variables

383+ - include: keywords

384+ - match: '(\^[[:alpha:]0-9''._]+)'

385+ captures:

386+ 1: entity.name.type.fsharp

387+ - match: \b(and|when|or)\b

388+ scope: keyword.fsharp

389+ - match: ($|$)

390+ scope: keyword.symbol.fsharp

391+ - match: '(\?{0,1})([[:alpha:]0-9''`^._]+|``[[:alpha:]0-9''`^:,._ ]+``)\s*(:{0,1})(\s*([?[:alpha:]0-9''`<>._ ]+)){0,1}'

392+ captures:

393+ 1: keyword.symbol.fsharp

394+ 2: variable.parameter.fsharp

395+ 3: keyword.symbol.fsharp

396+ 4: entity.name.type.fsharp

397+ - include: keywords

398+ modules:

399+ - match: '\b(namespace|module)\s*(public|internal|private)?\s+([[:alpha:]][[:alpha:]0-9''_. ]*)'

400+ captures:

401+ 1: keyword.fsharp

402+ 2: keyword.fsharp

403+ 3: entity.name.section.fsharp

404+ push:

405+ - meta_scope: entity.name.section.fsharp

406+ - match: (\s?=|\s|$)

407+ captures:

408+ 1: keyword.symbol.fsharp

409+ pop: true

410+ - match: '(\.)([A-Z][[:alpha:]0-9''_]*)'

411+ scope: entity.name.section.fsharp

412+ captures:

413+ 1: punctuation.separator.namespace-reference.fsharp

414+ 2: entity.name.section.fsharp

415+ - match: '\b(open)\s+([[:alpha:]][[:alpha:]0-9''_]*)(?=(\.[A-Z][[:alpha:]0-9_]*)*)'

416+ captures:

417+ 1: keyword.fsharp

418+ 2: entity.name.section.fsharp

419+ push:

420+ - meta_scope: namespace.open.fsharp

421+ - match: (\s|$)

422+ pop: true

423+ - match: '(\.)([[:alpha:]][[:alpha:]0-9''_]*)'

424+ scope: entity.name.section.fsharp

425+ captures:

426+ 1: punctuation.separator.namespace-reference.fsharp

427+ 2: entity.name.section.fsharp

428+ - match: '^\s*(module)\s+([A-Z][[:alpha:]0-9''_]*)\s*(=)\s*([A-Z][[:alpha:]0-9''_]*)'

429+ captures:

430+ 1: keyword.fsharp

431+ 2: entity.name.type.namespace.fsharp

432+ 3: punctuation.separator.namespace-definition.fsharp

433+ 4: entity.name.section.fsharp

434+ push:

435+ - meta_scope: namespace.alias.fsharp

436+ - match: (\s|$)

437+ pop: true

438+ - match: '(\.)([A-Z][[:alpha:]0-9''_]*)'

439+ scope: entity.name.section.fsharp

440+ captures:

441+ 1: punctuation.separator.namespace-reference.fsharp

442+ 2: entity.name.section.fsharp

443+ record_declaration:

444+ - match: '(\{)'

445+ captures:

446+ 1: keyword.symbol.fsharp

447+ push:

448+ - match: '(?<=\})'

449+ pop: true

450+ - include: comments

451+ - match: '(((mutable)\s[[:alpha:]]+)|[[:alpha:]0-9''`<>^._]*)\s*((?<!:):(?!:))\s*'

452+ captures:

453+ 3: keyword.fsharp

454+ 4: keyword.symbol.fsharp

455+ push:

456+ - match: '$|(;|\})'

457+ captures:

458+ 1: keyword.symbol.fsharp

459+ pop: true

460+ - include: comments

461+ - match: "([[:alpha:]0-9'`^_ ]+)"

462+ captures:

463+ 1: entity.name.type.fsharp

464+ - include: keywords

465+ - include: compiler_directives

466+ - include: constants

467+ - include: strings

468+ - include: chars

469+ - include: double_tick

470+ - include: definition

471+ - include: attributes

472+ - include: anonymous_functions

473+ - include: keywords

474+ - include: cexprs

475+ - include: text

476+ record_signature:

477+ - match: "[[:alpha:]0-9'`^_ ]+(=)([[:alpha:]0-9'`^_ ]+)"

478+ captures:

479+ 1: keyword.symbol.fsharp

480+ 2: variable.parameter.fsharp

481+ - match: "({)"

482+ captures:

483+ 1: keyword.symbol.fsharp

484+ push:

485+ - match: "(})"

486+ captures:

487+ 1: keyword.symbol.fsharp

488+ pop: true

489+ - match: "[[:alpha:]0-9'`^_ ]+(=)([[:alpha:]0-9'`^_ ]+)"

490+ captures:

491+ 1: keyword.symbol.fsharp

492+ 2: variable.parameter.fsharp

493+ - include: record_signature

494+ - include: keywords

495+ records:

496+ - match: '\b(type)[\s]+(private|internal|public)?\s*'

497+ captures:

498+ 1: keyword.fsharp

499+ 2: keyword.fsharp

500+ push:

501+ - meta_scope: record.fsharp

502+ - match: '\s*((with)|((as)\s+([[:alpha:]0-9'']+))|(=)|[\n=]|())'

503+ captures:

504+ 2: keyword.fsharp

505+ 3: keyword.fsharp

506+ 4: keyword.fsharp

507+ 5: variable.parameter.fsharp

508+ 6: keyword.symbol.fsharp

509+ 7: constant.language.unit.fsharp

510+ pop: true

511+ - include: comments

512+ - include: attributes

513+ - match: "([[:alpha:]0-9'^._]+|``[[:alpha:]0-9'`^:,._ ]+``)"

514+ captures:

515+ 1: entity.name.type.fsharp

516+ - match: (<)

517+ captures:

518+ 1: keyword.fsharp

519+ push:

520+ - match: ((?<!:)>)

521+ captures:

522+ 1: keyword.fsharp

523+ pop: true

524+ - match: '((''|\^)``[[:alpha:]0-9`^:,._ ]+``|(''|\^)[[:alpha:]0-9`^:._]+)'

525+ captures:

526+ 1: entity.name.type.fsharp

528+ scope: keyword.fsharp

529+ - match: (\()

530+ captures:

531+ 1: keyword.symbol.fsharp

532+ push:

533+ - match: (\))

534+ captures:

535+ 1: keyword.symbol.fsharp

536+ pop: true

537+ - match: (static member|member|new)

538+ captures:

539+ 1: keyword.fsharp

540+ - include: common_binding_definition

541+ - match: '([\w0-9''`^._]+)'

542+ captures:

543+ 1: entity.name.type.fsharp

544+ - include: keywords

545+ - match: \s*(private|internal|public)

546+ captures:

547+ 1: keyword.symbol.fsharp

548+ 2: keyword.fsharp

549+ - match: (\()

550+ captures:

551+ 1: keyword.symbol.fsharp

552+ push:

553+ - match: '\s*(?=(=)|[\n=]|()|(as))'

554+ captures:

555+ 1: keyword.symbol.fsharp

556+ pop: true

557+ - include: member_declaration

558+ - include: keywords

559+ string_formatter:

560+ - match: (%0?-?(\d+)?((a|t)|(\.\d+)?(f|F|e|E|g|G|M)|(b|c|s|d|i|x|X|o|u)|(s|b|O)|(\+?A)))

561+ scope: entity.name.type.format.specifier.fsharp

562+ captures:

563+ 1: keyword.format.specifier.fsharp

564+ strings:

565+ - match: '(?=[^\\])(@")'

566+ captures:

567+ 1: punctuation.definition.string.begin.fsharp

568+ push:

569+ - meta_scope: string.quoted.literal.fsharp

570+ - match: (")(?!")

571+ captures:

572+ 1: punctuation.definition.string.end.fsharp

573+ pop: true

574+ - match: '"(")'

575+ scope: constant.character.string.escape.fsharp

576+ - match: '(?=[^\\])(""")'

577+ captures:

578+ 1: punctuation.definition.string.begin.fsharp

579+ push:

580+ - meta_scope: string.quoted.triple.fsharp

581+ - match: (""")

582+ captures:

583+ 1: punctuation.definition.string.end.fsharp

584+ pop: true

585+ - include: string_formatter

586+ - match: '(?=[^\\])(")'

587+ captures:

588+ 1: punctuation.definition.string.begin.fsharp

589+ push:

590+ - meta_scope: string.quoted.double.fsharp

591+ - match: (")

592+ captures:

593+ 1: punctuation.definition.string.end.fsharp

594+ pop: true

595+ - match: '\\$[ \t]*'

596+ scope: punctuation.separator.string.ignore-eol.fsharp

597+ - match: '\\([\\''''ntbr]|u[a-fA-F0-9]{4}|u[a-fA-F0-9]{8})'

598+ scope: constant.character.string.escape.fsharp

599+ - match: '\\(?![\\''''ntbr]|u[a-fA-F0-9]{4}|u[a-fA-F0-9]{8}).'

600+ scope: invalid.illeagal.character.string.fsharp

601+ - include: string_formatter

602+ strp_inlined:

603+ - match: (\()

604+ captures:

605+ 1: keyword.symbol.fsharp

606+ push:

607+ - match: (\))

608+ captures:

609+ 1: keyword.symbol.fsharp

610+ pop: true

611+ - include: strp_inlined_body

612+ strp_inlined_body:

613+ - include: comments

614+ - include: anonymous_functions

615+ - match: '(\^[[:alpha:]0-9''._]+)'

616+ captures:

617+ 1: entity.name.type.fsharp

618+ - match: \b(and|when|or)\b

619+ scope: keyword.fsharp

620+ - match: (\()

621+ captures:

622+ 1: keyword.symbol.fsharp

623+ push:

624+ - match: (\))

625+ captures:

626+ 1: keyword.symbol.fsharp

627+ pop: true

628+ - include: strp_inlined_body

629+ - match: '(static member|member)\s*([[:alpha:]0-9''`<>^._]+|``[[:alpha:]0-9'' <>^._]+``)\s*(:)'

630+ captures:

631+ 1: keyword.fsharp

632+ 2: variable.fsharp

633+ 3: keyword.symbol.fsharp

634+ - include: compiler_directives

635+ - include: constants

636+ - include: strings

637+ - include: chars

638+ - include: double_tick

639+ - include: keywords

640+ - include: text

641+ - include: definition

642+ - include: attributes

643+ - include: keywords

644+ - include: cexprs

645+ - include: text

646+ text:

647+ - match: \\

648+ scope: text.fsharp

649+ tuple_signature:

650+ - match: "(([?[:alpha:]0-9'`^._ ]+))+"

651+ captures:

652+ 1: entity.name.type.fsharp

653+ - match: (\()

654+ captures:

655+ 1: keyword.symbol.fsharp

656+ push:

657+ - match: (\))

658+ captures:

659+ 1: keyword.symbol.fsharp

660+ pop: true

661+ - match: "(([?[:alpha:]0-9'`^._ ]+))+"

662+ captures:

663+ 1: entity.name.type.fsharp

664+ - include: tuple_signature

665+ - include: keywords

666+ variables:

667+ - match: 

668+ scope: constant.language.unit.fsharp

669+ - match: '(\?{0,1})(``[[:alpha:]0-9''`^:,._ ]+``|[[:alpha:]0-9''`<>^._ ]\w*)'

670+ captures:

671+ 1: keyword.symbol.fsharp

672+ 2: variable.parameter.fsharp

assets/syntaxes/Fishnew file+1

Submodule changed.

assets/syntaxes/02_Extra/Fstab.sublime-syntax → assets/syntaxes/Fstab.sublime-syntaxrenamed−2

@@ -4,8 +4,6 @@

4name: fstab

5file_extensions:

6 - fstab

7− - crypttab

8− - mtab

9scope: source.fstab

7scope: source.fstab

10

8

11contexts:

9contexts:

assets/syntaxes/GraphQLnew file+1

Submodule changed.

assets/syntaxes/02_Extra/Group.sublime-syntax → assets/syntaxes/Group.sublime-syntaxrenamed

The content is the same.

assets/syntaxes/02_Extra/HTML (Twig) → assets/syntaxes/HTML (Twig)renamed

The content is the same.

assets/syntaxes/02_Extra/HTML (Twig).sublime-syntax → assets/syntaxes/HTML (Twig).sublime-syntaxrenamed

The content is the same.

assets/syntaxes/02_Extra/Hosts.sublime-syntax → assets/syntaxes/Hosts.sublime-syntaxrenamed

The content is the same.

assets/syntaxes/02_Extra/INI → assets/syntaxes/INIrenamed

The content is the same.

assets/syntaxes/02_Extra/INI.sublime-syntax → assets/syntaxes/INI.sublime-syntaxrenamed+3−4

@@ -5,8 +5,8 @@ name: INI

5file_extensions:

6 - ini

7 - INI

8− - "inf"

8+ - inf

9− - "INF"

9+ - INF

10 - reg

11 - REG

12 - lng

@@ -25,13 +25,12 @@ contexts:

25 scope: comment.line.semicolon.ini

26 captures:

27 1: punctuation.definition.comment.ini

28− - match: '^\s*(\[)(.*?)(\])\s*(;.*)?$\n?'

28+ - match: '^\s*(\[)(.*?)(\])'

29 scope: meta.tag.section.ini

30 captures:

31 1: punctuation.definition.section.ini

32 2: entity.section.ini

33 3: punctuation.definition.section.ini

34− 4: comment.definition.section.ini

35 - match: '^(\s*(["'']?)(.+?)(\2)\s*(=))?\s*((["'']?)(.*?)(\7))\s*(;.*)?$\n?'

34 - match: '^(\s*(["'']?)(.+?)(\2)\s*(=))?\s*((["'']?)(.*?)(\7))\s*(;.*)?$\n?'

36 scope: meta.declaration.ini

35 scope: meta.declaration.ini

37 captures:

36 captures:

assets/syntaxes/JavaScript (Babel)new file+1

Submodule changed.

assets/syntaxes/02_Extra/JavaScript (Babel).sublime-syntax → assets/syntaxes/Javascript (Babel).sublime-syntaxrenamed−2

@@ -4,11 +4,9 @@

4name: JavaScript (Babel)

5file_extensions:

6 - js

7− - mjs

8 - jsx

7 - jsx

9 - babel

8 - babel

10 - es6

9 - es6

11− - cjs

12first_line_match: ^#!\s*/.*\b(node|js)$\n?

10first_line_match: ^#!\s*/.*\b(node|js)$\n?

13scope: source.js

11scope: source.js

14contexts:

12contexts:

assets/syntaxes/02_Extra/Jinja2 → assets/syntaxes/Jinja2renamed

The content is the same.

assets/syntaxes/02_Extra/Jsonnet → assets/syntaxes/Jsonnetrenamed

The content is the same.

assets/syntaxes/Julianew file+1

Submodule changed.

assets/syntaxes/02_Extra/Kotlin → assets/syntaxes/Kotlinrenamed

The content is the same.

assets/syntaxes/02_Extra/Kotlin.sublime-syntax → assets/syntaxes/Kotlin.sublime-syntaxrenamed

The content is the same.

assets/syntaxes/LESSnew file+1

Submodule changed.

assets/syntaxes/Manpage.sublime-syntaxnew file+53

@@ -0,0 +1,53 @@

1+%YAML 1.2

2+---

3+# http://www.sublimetext.com/docs/3/syntax.html

4+name: Manpage

5+file_extensions:

6+ - man

7+scope: source.man

8+

9+variables:

10+ section_heading: '^\S.*$'

11+

12+contexts:

13+ main:

14+ - match: ^

15+ push: first_line

16+

17+ first_line:

18+ - match: '([A-Z0-9_\-]+)($)([^)]+)($)'

19+ captures:

20+ 1: meta.preprocessor

21+ 2: keyword.operator

22+ 3: string.quoted.other

23+ 4: keyword.operator

24+

25+ - match: '$'

26+ push: body

27+

28+ body:

30+ push: Packages/C/C.sublime-syntax

31+ scope: markup.heading

32+ with_prototype:

33+ - match: '(?={{section_heading}})'

34+ pop: true

35+

36+ - match: '^\S.*$'

37+ scope: markup.heading

38+

39+ - match: '\b([A-Za-z0-9_\-]+)($)([^)]*)($)'

40+ captures:

41+ 1: entity.name.function

42+ 2: keyword.operator

43+ 3: constant.numeric

44+ 4: keyword.operator

45+

46+ # command-line options like --option=value, --some-flag, or -x

47+ - match: '(?:[^a-zA-Z0-9_-]|^|\s)(--?[A-Za-z0-9][A-Za-z0-9-]*)(?:(=)?("?)([A-Za-z0-9]+)("?))?'

48+ captures:

49+ 1: entity.name

50+ 2: keyword.operator

51+ 3: punctuation.definition.string.begin

52+ 4: variable.parameter

53+ 3: punctuation.definition.string.end

assets/syntaxes/02_Extra/Nim.sublime-syntax → assets/syntaxes/Nim.sublime-syntaxrenamed−1

@@ -5,7 +5,6 @@ name: Nim

5file_extensions:

6 - nim

7 - nims

8− - nimble

9scope: source.nim

8scope: source.nim

10contexts:

9contexts:

11 main:

10 main:

assets/syntaxes/Nixnew file+1

Submodule changed.

assets/syntaxes/02_Extra/Nix.sublime-syntax → assets/syntaxes/Nix.sublime-syntaxrenamed+2−2

@@ -140,7 +140,7 @@ contexts:

140 push:

141 - match: '(?=([\])};]|\b(else|then)\b))'

142 pop: true

143− - match: '(?=(\s*\}|\"|\binherit\b|\b[a-zA-Z\_][a-zA-Z0-9\_\''\-]*(\s*\.|\s*=[^=])|\$\{[a-zA-z0-9\_\''\-]+\}(\s*\.|\s*=[^=])))'

143+ - match: '(?=(\s*\}|\"|\binherit\b|\b[a-zA-Z\_][a-zA-Z0-9\_\''\-]*(\s*\.|\s*=[^=])))'

144 push:

145 - match: '(?=([\])};,]|\b(else|then)\b))'

146 pop: true

@@ -563,7 +563,7 @@ contexts:

563 pop: true

564 - include: string-quoted

565 - include: expression-cont

566− - match: '(~?[a-zA-Z0-9\.\_\-\+]*(\/[a-zA-Z0-9\.\_\-\+]+)+)'

566+ - match: '([a-zA-Z0-9\.\_\-\+]*(\/[a-zA-Z0-9\.\_\-\+]+)+)'

567 captures:

568 0: string.unquoted.path.nix

569 push:

assets/syntaxes/02_Extra/Org mode → assets/syntaxes/Org moderenamed

The content is the same.

assets/syntaxes/02_Extra/Org mode.sublime-syntax → assets/syntaxes/Org mode.sublime-syntaxrenamed

The content is the same.

assets/syntaxes/Packagesnew file+1

Submodule changed.

assets/syntaxes/02_Extra/Passwd.sublime-syntax → assets/syntaxes/Passwd.sublime-syntaxrenamed

The content is the same.

assets/syntaxes/PowerShellnew file+1

Submodule changed.

assets/syntaxes/02_Extra/PowerShell.sublime-syntax → assets/syntaxes/PowerShell.sublime-syntaxrenamed+76−71

@@ -24,7 +24,7 @@ contexts:

24 - include: commands

25 - include: commentLine

26 - include: variable

27− - include: subexpression

27+ - include: interpolatedStringContent

28 - include: function

29 - include: attribute

30 - include: UsingDirective

@@ -33,38 +33,32 @@ contexts:

33 - include: doubleQuotedString

34 - include: scriptblock

35 - include: doubleQuotedStringEscapes

36− - match: '[''\x{2018}-\x{201B}]'

36+ - match: (?<!')'

37 captures:

38 0: punctuation.definition.string.begin.powershell

39 push:

40 - meta_scope: string.quoted.single.powershell

41− - match: '[''\x{2018}-\x{201B}]{2}'

41+ - match: "'(?!')"

42− scope: constant.character.escape.powershell

43− - match: '[''\x{2018}-\x{201B}]'

44 captures:

42 captures:

45 0: punctuation.definition.string.end.powershell

43 0: punctuation.definition.string.end.powershell

46 pop: true

44 pop: true

45+ - match: "''"

46+ scope: constant.character.escape.powershell

47− - match: '(@["\x{201C}-\x{201E}])\s*$'

47+ - match: \@"(?=$)

48− captures:

49− 1: punctuation.definition.string.begin.powershell

50 push:

48 push:

51 - meta_scope: string.quoted.double.heredoc.powershell

49 - meta_scope: string.quoted.double.heredoc.powershell

52− - match: '^["\x{201C}-\x{201E}]@'

50+ - match: ^"@

53− captures:

54− 0: punctuation.definition.string.end.powershell

55 pop: true

51 pop: true

56 - include: variableNoProperty

52 - include: variableNoProperty

57 - include: doubleQuotedStringEscapes

53 - include: doubleQuotedStringEscapes

58 - include: interpolation

54 - include: interpolation

59− - match: '(@[''\x{2018}-\x{201B}])\s*$'

55+ - match: \@'(?=$)

60− captures:

61− 1: punctuation.definition.string.begin.powershell

62 push:

56 push:

63 - meta_scope: string.quoted.single.heredoc.powershell

57 - meta_scope: string.quoted.single.heredoc.powershell

64− - match: '^[''\x{2018}-\x{201B}]@'

58+ - match: ^'@

65− captures:

66− 0: punctuation.definition.string.end.powershell

67 pop: true

59 pop: true

60+ - match: "''"

61+ scope: constant.character.escape.powershell

68 - include: numericConstant

62 - include: numericConstant

69 - match: (@)(\()

63 - match: (@)(\()

70 captures:

64 captures:

@@ -77,12 +71,11 @@ contexts:

77 0: punctuation.section.group.end.powershell

71 0: punctuation.section.group.end.powershell

78 pop: true

72 pop: true

79 - include: main

73 - include: main

80− - match: ((\$))(\()

74+ - match: (\$)(\()

81 comment: "TODO: move to repo; make recursive."

75 comment: "TODO: move to repo; make recursive."

82 captures:

76 captures:

83− 1: keyword.other.substatement.powershell

84− 2: punctuation.definition.subexpression.powershell

77+ 1: punctuation.definition.variable.powershell

85− 3: punctuation.section.group.begin.powershell

78+ 2: punctuation.section.group.begin.powershell

86 push:

79 push:

87 - meta_scope: meta.group.complex.subexpression.powershell

80 - meta_scope: meta.group.complex.subexpression.powershell

88 - match: \)

81 - match: \)

@@ -92,7 +85,7 @@ contexts:

92 - include: main

85 - include: main

93 - match: '(\b(([A-Za-z0-9\-_\.]+)\.(?i:exe|com|cmd|bat))\b)'

86 - match: '(\b(([A-Za-z0-9\-_\.]+)\.(?i:exe|com|cmd|bat))\b)'

94 scope: support.function.powershell

87 scope: support.function.powershell

96 scope: keyword.control.powershell

89 scope: keyword.control.powershell

97 - match: '(?<!\w|-|[^\)]\.)((?i:(foreach|where)(?!-object))|%|\?)(?!\w)'

90 - match: '(?<!\w|-|[^\)]\.)((?i:(foreach|where)(?!-object))|%|\?)(?!\w)'

98 scope: keyword.control.powershell

91 scope: keyword.control.powershell

@@ -142,7 +135,7 @@ contexts:

142 - meta_scope: meta.requires.powershell

135 - meta_scope: meta.requires.powershell

143 - match: $

136 - match: $

144 pop: true

137 pop: true

138+ - match: \-(?i:Modules|PSSnapin|RunAsAdministrator|ShellId|Version)

146 scope: keyword.other.powershell

139 scope: keyword.other.powershell

147 - match: '(?<!-)\b\p{L}+|\d+(?:\.\d+)*'

140 - match: '(?<!-)\b\p{L}+|\d+(?:\.\d+)*'

148 scope: variable.parameter.powershell

141 scope: variable.parameter.powershell

@@ -154,7 +147,7 @@ contexts:

154 2: keyword.other.powershell

147 2: keyword.other.powershell

155 3: variable.parameter.powershell

148 3: variable.parameter.powershell

156 attribute:

149 attribute:

158 captures:

151 captures:

159 1: punctuation.section.bracket.begin.powershell

152 1: punctuation.section.bracket.begin.powershell

160 2: support.function.attribute.powershell

153 2: support.function.attribute.powershell

@@ -172,11 +165,31 @@ contexts:

172 captures:

165 captures:

173 0: punctuation.section.group.end.powershell

166 0: punctuation.section.group.end.powershell

174 pop: true

167 pop: true

168+ - include: variable

169+ - include: variableNoProperty

170+ - include: hashtable

171+ - include: scriptblock

172+ - include: doubleQuotedStringEscapes

173+ - include: doubleQuotedString

174+ - include: type

175+ - include: numericConstant

176+ - include: doubleQuotedString

175 - include: main

177 - include: main

177 captures:

179 captures:

178 1: variable.parameter.attribute.powershell

180 1: variable.parameter.attribute.powershell

179 2: keyword.operator.assignment.powershell

181 2: keyword.operator.assignment.powershell

182+ - match: (?<!')'

183+ captures:

184+ 0: punctuation.definition.string.begin.powershell

185+ push:

186+ - meta_scope: string.quoted.single.powershell

187+ - match: "'(?!')"

188+ captures:

189+ 0: punctuation.definition.string.end.powershell

190+ pop: true

191+ - match: "''"

192+ scope: constant.character.escape.powershell

180 commands:

193 commands:

181 - match: '(?:(\p{L}|\d|_|-|\\|\:)*\\)?\b(?i:Add|Approve|Assert|Backup|Block|Build|Checkpoint|Clear|Close|Compare|Complete|Compress|Confirm|Connect|Convert|ConvertFrom|ConvertTo|Copy|Debug|Deny|Deploy|Disable|Disconnect|Dismount|Edit|Enable|Enter|Exit|Expand|Export|Find|Format|Get|Grant|Group|Hide|Import|Initialize|Install|Invoke|Join|Limit|Lock|Measure|Merge|Mount|Move|New|Open|Optimize|Out|Ping|Pop|Protect|Publish|Push|Read|Receive|Redo|Register|Remove|Rename|Repair|Request|Reset|Resize|Resolve|Restart|Restore|Resume|Revoke|Save|Search|Select|Send|Set|Show|Skip|Split|Start|Step|Stop|Submit|Suspend|Switch|Sync|Test|Trace|Unblock|Undo|Uninstall|Unlock|Unprotect|Unpublish|Unregister|Update|Use|Wait|Watch|Write)\-.+?(?:\.(?i:exe|cmd|bat|ps1))?\b'

194 - match: '(?:(\p{L}|\d|_|-|\\|\:)*\\)?\b(?i:Add|Approve|Assert|Backup|Block|Build|Checkpoint|Clear|Close|Compare|Complete|Compress|Confirm|Connect|Convert|ConvertFrom|ConvertTo|Copy|Debug|Deny|Deploy|Disable|Disconnect|Dismount|Edit|Enable|Enter|Exit|Expand|Export|Find|Format|Get|Grant|Group|Hide|Import|Initialize|Install|Invoke|Join|Limit|Lock|Measure|Merge|Mount|Move|New|Open|Optimize|Out|Ping|Pop|Protect|Publish|Push|Read|Receive|Redo|Register|Remove|Rename|Repair|Request|Reset|Resize|Resolve|Restart|Restore|Resume|Revoke|Save|Search|Select|Send|Set|Show|Skip|Split|Start|Step|Stop|Submit|Suspend|Switch|Sync|Test|Trace|Unblock|Undo|Uninstall|Unlock|Unprotect|Unpublish|Unregister|Update|Use|Wait|Watch|Write)\-.+?(?:\.(?i:exe|cmd|bat|ps1))?\b'

182 comment: "Verb-Noun pattern:"

195 comment: "Verb-Noun pattern:"

@@ -194,53 +207,51 @@ contexts:

194 comment: Builtin cmdlets with reserved verbs

207 comment: Builtin cmdlets with reserved verbs

195 scope: support.function.powershell

208 scope: support.function.powershell

196 commentEmbeddedDocs:

209 commentEmbeddedDocs:

198− comment: these embedded doc keywords do not support arguments, must be the only thing on the line

199 scope: comment.documentation.embedded.powershell

211 scope: comment.documentation.embedded.powershell

200 captures:

212 captures:

201 1: constant.string.documentation.powershell

213 1: constant.string.documentation.powershell

202 2: keyword.operator.documentation.powershell

214 2: keyword.operator.documentation.powershell

215+ - match: '(?i:\s?(\.)(PARAMETER|FORWARDHELPTARGETNAME|FORWARDHELPCATEGORY|REMOTEHELPRUNSPACE|EXTERNALHELP)\s+([a-z0-9-_]+))'

204− comment: these embedded doc keywords require arguments though the type required may be inconsistent, they may not all be able to use the same argument match

205 scope: comment.documentation.embedded.powershell

216 scope: comment.documentation.embedded.powershell

206 captures:

217 captures:

207 1: constant.string.documentation.powershell

218 1: constant.string.documentation.powershell

208 2: keyword.operator.documentation.powershell

219 2: keyword.operator.documentation.powershell

209 3: keyword.operator.documentation.powershell

220 3: keyword.operator.documentation.powershell

210 commentLine:

221 commentLine:

211− - match: '(?<![`\\-])(#)#*'

222+ - match: '(?<![`\\-])#'

212 captures:

223 captures:

213− 1: punctuation.definition.comment.powershell

224+ 0: punctuation.definition.comment.powershell

214 push:

225 push:

215 - meta_scope: comment.line.powershell

226 - meta_scope: comment.line.powershell

216 - match: $\n?

227 - match: $\n?

217 captures:

228 captures:

218− 1: punctuation.definition.comment.powershell

229+ 0: punctuation.definition.comment.powershell

219 pop: true

230 pop: true

220 - include: commentEmbeddedDocs

231 - include: commentEmbeddedDocs

221 - include: RequiresDirective

232 - include: RequiresDirective

222 doubleQuotedString:

233 doubleQuotedString:

223− - match: '["\x{201C}-\x{201E}]'

234+ - match: (?<!(?<!`)")"

224 captures:

235 captures:

225 0: punctuation.definition.string.begin.powershell

236 0: punctuation.definition.string.begin.powershell

226 push:

237 push:

227 - meta_scope: string.quoted.double.powershell

238 - meta_scope: string.quoted.double.powershell

239+ - match: '"(?!")'

240+ captures:

241+ 0: punctuation.definition.string.end.powershell

242+ pop: true

228 - match: '(?i)\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,64}\b'

243 - match: '(?i)\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,64}\b'

229 - include: variableNoProperty

244 - include: variableNoProperty

245+ - include: variable

230 - include: doubleQuotedStringEscapes

246 - include: doubleQuotedStringEscapes

231− - match: '["\x{201C}-\x{201E}]{2}'

232− scope: constant.character.escape.powershell

233 - include: interpolation

247 - include: interpolation

234 - match: '`\s*$'

248 - match: '`\s*$'

235 scope: keyword.other.powershell

249 scope: keyword.other.powershell

236− - match: '["\x{201C}-\x{201E}]'

237− captures:

238− 0: punctuation.definition.string.end.powershell

239− pop: true

240 doubleQuotedStringEscapes:

250 doubleQuotedStringEscapes:

241− - match: '`[`0abefnrtv''"\x{2018}-\x{201E}$]'

251+ - match: '`[0abnfrvt"''$`]'

252+ scope: constant.character.escape.powershell

253+ - match: '""'

242 scope: constant.character.escape.powershell

254 scope: constant.character.escape.powershell

243− - include: unicodeEscape

244 function:

255 function:

245 - match: '^(?:\s*+)(?i)(function|filter|configuration|workflow)\s+(?:(global|local|script|private):)?((?:\p{L}|\d|_|-|\.)+)'

256 - match: '^(?:\s*+)(?i)(function|filter|configuration|workflow)\s+(?:(global|local|script|private):)?((?:\p{L}|\d|_|-|\.)+)'

246 captures:

257 captures:

@@ -272,23 +283,33 @@ contexts:

272 4: keyword.operator.assignment.powershell

283 4: keyword.operator.assignment.powershell

273 - include: scriptblock

284 - include: scriptblock

274 - include: main

285 - include: main

286+ interpolatedStringContent:

287+ - match: \(

288+ captures:

289+ 0: punctuation.section.group.begin.powershell

290+ push:

291+ - meta_content_scope: interpolated.simple.source.powershell

292+ - match: \)

293+ captures:

294+ 0: punctuation.section.group.end.powershell

295+ pop: true

296+ - include: main

297+ - include: interpolation

298+ - include: interpolatedStringContent

275 interpolation:

299 interpolation:

276− - match: (((\$)))((\())

300+ - match: (\$)(\()

277 captures:

301 captures:

278− 1: keyword.other.substatement.powershell

279− 2: punctuation.definition.substatement.powershell

302+ 1: punctuation.definition.variable.powershell

280− 3: punctuation.section.embedded.substatement.begin.powershell

281− 4: punctuation.section.group.begin.powershell

303+ 2: punctuation.section.group.begin.powershell

282− 5: punctuation.section.embedded.substatement.begin.powershell

283 push:

304 push:

284− - meta_scope: meta.embedded.substatement.powershell

285 - meta_content_scope: interpolated.complex.source.powershell

305 - meta_content_scope: interpolated.complex.source.powershell

286− - match: (\))

306+ - match: \)

287 captures:

307 captures:

288 0: punctuation.section.group.end.powershell

308 0: punctuation.section.group.end.powershell

289− 1: punctuation.section.embedded.substatement.end.powershell

290 pop: true

309 pop: true

291 - include: main

310 - include: main

311+ - include: interpolation

312+ - include: interpolatedStringContent

292 numericConstant:

313 numericConstant:

293 - match: '(?<!\w)([-+]?0(?:x|X)[0-9a-fA-F_]+(?:U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?)((?i:[kmgtp]b)?)\b'

314 - match: '(?<!\w)([-+]?0(?:x|X)[0-9a-fA-F_]+(?:U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?)((?i:[kmgtp]b)?)\b'

294 captures:

315 captures:

@@ -329,17 +350,6 @@ contexts:

329 0: punctuation.section.braces.end.powershell

350 0: punctuation.section.braces.end.powershell

330 pop: true

351 pop: true

331 - include: main

352 - include: main

332− subexpression:

333− - match: \(

334− captures:

335− 0: punctuation.section.group.begin.powershell

336− push:

337− - meta_scope: meta.group.simple.subexpression.powershell

338− - match: \)

339− captures:

340− 0: punctuation.section.group.end.powershell

341− pop: true

342− - include: main

343 type:

353 type:

344 - match: '\['

354 - match: '\['

345 captures:

355 captures:

@@ -352,11 +362,6 @@ contexts:

352 - match: '(?!\d+|\.)(?:\p{L}|\p{N}|\.)+'

362 - match: '(?!\d+|\.)(?:\p{L}|\p{N}|\.)+'

353 scope: storage.type.powershell

363 scope: storage.type.powershell

354 - include: main

364 - include: main

355− unicodeEscape:

356− - match: '`u\{(?:(?:10)?([0-9a-fA-F]){1,4}|0?\g<1>{1,5})}'

357− scope: constant.character.escape.powershell

358− - match: '`u(?:\{[0-9a-fA-F]{,6}.)?'

359− scope: invalid.character.escape.powershell

360 variable:

365 variable:

361 - match: (\$)(?i:(False|Null|True))\b

366 - match: (\$)(?i:(False|Null|True))\b

362 comment: These are special constants.

367 comment: These are special constants.

@@ -369,13 +374,13 @@ contexts:

369 0: support.constant.variable.powershell

374 0: support.constant.variable.powershell

370 1: punctuation.definition.variable.powershell

375 1: punctuation.definition.variable.powershell

371 3: variable.other.member.powershell

376 3: variable.other.member.powershell

372− - match: '(\$)((?:[$^?])|(?i:_|Args|ConsoleFileName|Event|EventArgs|EventSubscriber|ForEach|Input|LastExitCode|Matches|MyInvocation|NestedPromptLevel|Profile|PSBoundParameters|PsCmdlet|PsCulture|PSDebugContext|PSItem|PSCommandPath|PSScriptRoot|PsUICulture|Pwd|Sender|SourceArgs|SourceEventArgs|StackTrace|Switch|This)\b)((?:\.(?:\p{L}|\d|_)+)*\b)?'

377+ - match: '(\$)(?i:(\$|\^|\?|_|Args|ConsoleFileName|Event|EventArgs|EventSubscriber|ForEach|Input|LastExitCode|Matches|MyInvocation|NestedPromptLevel|Profile|PSBoundParameters|PsCmdlet|PsCulture|PSDebugContext|PSItem|PSCommandPath|PSScriptRoot|PsUICulture|Pwd|Sender|SourceArgs|SourceEventArgs|StackTrace|Switch|This))((?:\.(?:\p{L}|\d|_)+)*\b)?\b'

373 comment: Automatic variables are not constants, but they are read-only. In monokai (default) color schema support.variable doesn't have color, so we use constant.

378 comment: Automatic variables are not constants, but they are read-only. In monokai (default) color schema support.variable doesn't have color, so we use constant.

374 captures:

379 captures:

375− 0: support.variable.automatic.powershell

380+ 0: support.constant.automatic.powershell

376 1: punctuation.definition.variable.powershell

381 1: punctuation.definition.variable.powershell

377 3: variable.other.member.powershell

382 3: variable.other.member.powershell

378− - match: '(\$)(?i:(ConfirmPreference|DebugPreference|ErrorActionPreference|ErrorView|FormatEnumerationLimit|InformationPreference|LogCommandHealthEvent|LogCommandLifecycleEvent|LogEngineHealthEvent|LogEngineLifecycleEvent|LogProviderHealthEvent|LogProviderLifecycleEvent|MaximumAliasCount|MaximumDriveCount|MaximumErrorCount|MaximumFunctionCount|MaximumHistoryCount|MaximumVariableCount|OFS|OutputEncoding|PSCulture|PSDebugContext|PSDefaultParameterValues|PSEmailServer|PSItem|PSModuleAutoLoadingPreference|PSModuleAutoloadingPreference|PSSenderInfo|PSSessionApplicationName|PSSessionConfigurationName|PSSessionOption|ProgressPreference|VerbosePreference|WarningPreference|WhatIfPreference))((?:\.(?:\p{L}|\d|_)+)*\b)?\b'

383+ - match: '(\$)(?i:(ConfirmPreference|DebugPreference|ErrorActionPreference|ErrorView|FormatEnumerationLimit|MaximumAliasCount|MaximumDriveCount|MaximumErrorCount|MaximumFunctionCount|MaximumHistoryCount|MaximumVariableCount|OFS|OutputEncoding|ProgressPreference|PsCulture|PSDebugContext|PSDefaultParameterValues|PSEmailServer|PSItem|PSModuleAutoloadingPreference|PSSenderInfo|PSSessionApplicationName|PSSessionConfigurationName|PSSessionOption|VerbosePreference|WarningPreference|WhatIfPreference))((?:\.(?:\p{L}|\d|_)+)*\b)?\b'

379 comment: Style preference variables as language variables so that they stand out.

384 comment: Style preference variables as language variables so that they stand out.

380 captures:

385 captures:

381 0: variable.language.powershell

386 0: variable.language.powershell

@@ -421,19 +426,19 @@ contexts:

421 0: support.constant.variable.powershell

426 0: support.constant.variable.powershell

422 1: punctuation.definition.variable.powershell

427 1: punctuation.definition.variable.powershell

423 3: variable.other.member.powershell

428 3: variable.other.member.powershell

425 comment: Automatic variables are not constants, but they are read-only...

430 comment: Automatic variables are not constants, but they are read-only...

426 captures:

431 captures:

427 0: support.variable.automatic.powershell

432 0: support.variable.automatic.powershell

428 1: punctuation.definition.variable.powershell

433 1: punctuation.definition.variable.powershell

429 3: variable.other.member.powershell

434 3: variable.other.member.powershell

431 comment: Style preference variables as language variables so that they stand out.

436 comment: Style preference variables as language variables so that they stand out.

432 captures:

437 captures:

433 0: variable.language.powershell

438 0: variable.language.powershell

434 1: punctuation.definition.variable.powershell

439 1: punctuation.definition.variable.powershell

435 3: variable.other.member.powershell

440 3: variable.other.member.powershell

436− - match: '(?i:(\$)(global|local|private|script|using|workflow):((?:\p{L}|\d|_)+))'

441+ - match: '(?i:(\$|@)(global|local|private|script|using|workflow):((?:\p{L}|\d|_)+))'

437 captures:

442 captures:

438 0: variable.other.readwrite.powershell

443 0: variable.other.readwrite.powershell

439 1: punctuation.definition.variable.powershell

444 1: punctuation.definition.variable.powershell

assets/syntaxes/02_Extra/Protobuf → assets/syntaxes/Protobufrenamed

The content is the same.

assets/syntaxes/02_Extra/Puppet → assets/syntaxes/Puppetrenamed

The content is the same.

assets/syntaxes/02_Extra/PureScript → assets/syntaxes/PureScriptrenamed

The content is the same.

assets/syntaxes/02_Extra/Resolv.sublime-syntax → assets/syntaxes/Resolv.sublime-syntaxrenamed

The content is the same.

assets/syntaxes/02_Extra/Robot → assets/syntaxes/Robotrenamed

The content is the same.

assets/syntaxes/02_Extra/Robot.sublime-syntax → assets/syntaxes/Robot.sublime-syntaxrenamed+1−2

@@ -1,10 +1,9 @@

1%YAML 1.2

2---

3# http://www.sublimetext.com/docs/3/syntax.html

4−name: Robot Framework

4+name: Robot Framework syntax highlighting.

5file_extensions:

6 - robot

7− - resource

8scope: source.robot

7scope: source.robot

9contexts:

8contexts:

10 main:

9 main:

assets/syntaxes/SCSS_Sassnew file+1

Submodule changed.

assets/syntaxes/02_Extra/SLS → assets/syntaxes/SLSrenamed

The content is the same.

assets/syntaxes/02_Extra/Strace → assets/syntaxes/Stracerenamed

The content is the same.

assets/syntaxes/02_Extra/Swift → assets/syntaxes/Swiftrenamed

The content is the same.

assets/syntaxes/02_Extra/Swift.sublime-syntax → assets/syntaxes/Swift.sublime-syntaxrenamed

The content is the same.

assets/syntaxes/Syslognew file+1

Submodule changed.

assets/syntaxes/TOMLnew file+1

Submodule changed.

assets/syntaxes/Terraformnew file+1

Submodule changed.

assets/syntaxes/TypeScriptnew file+1

Submodule changed.

assets/syntaxes/02_Extra/TypeScript.sublime-syntax → assets/syntaxes/TypeScript.sublime-syntaxrenamed+185−296

@@ -9,7 +9,10 @@ contexts:

9 main:

10 - include: directives

11 - include: statements

12− - include: shebang

12+ - match: \A(#!).*(?=$)

13+ scope: comment.line.shebang.ts

14+ captures:

15+ 1: punctuation.definition.comment.ts

13 comment:

16 comment:

14 - match: /\*\*(?!/)

17 - match: /\*\*(?!/)

15 captures:

18 captures:

@@ -44,7 +47,7 @@ contexts:

44 - match: (?=$)

47 - match: (?=$)

45 pop: true

48 pop: true

46 access-modifier:

49 access-modifier:

48 scope: storage.modifier.ts

51 scope: storage.modifier.ts

49 after-operator-block-as-object-literal:

52 after-operator-block-as-object-literal:

50 - match: '(?<!\+\+|--)(?<=[:=(,\[?+!>]|^await|[^\._$[:alnum:]]await|^return|[^\._$[:alnum:]]return|^yield|[^\._$[:alnum:]]yield|^throw|[^\._$[:alnum:]]throw|^in|[^\._$[:alnum:]]in|^of|[^\._$[:alnum:]]of|^typeof|[^\._$[:alnum:]]typeof|&&|\|\||\*)\s*(\{)'

53 - match: '(?<!\+\+|--)(?<=[:=(,\[?+!>]|^await|[^\._$[:alnum:]]await|^return|[^\._$[:alnum:]]return|^yield|[^\._$[:alnum:]]yield|^throw|[^\._$[:alnum:]]throw|^in|[^\._$[:alnum:]]in|^of|[^\._$[:alnum:]]of|^typeof|[^\._$[:alnum:]]typeof|&&|\|\||\*)\s*(\{)'

@@ -106,7 +109,7 @@ contexts:

106 (?=

109 (?=

107 # sure shot arrow functions even if => is on new line

110 # sure shot arrow functions even if => is on new line

108 (

111 (

109− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

112+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

110 [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

113 [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

111 (

114 (

112 ([)]\s*:) | # ():

115 ([)]\s*:) | # ():

@@ -116,9 +119,9 @@ contexts:

116

119

117 # arrow function possible to detect only with => on same line

120 # arrow function possible to detect only with => on same line

118 (

121 (

119− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

122+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

120− $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\) # parameters

123+ $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()]|(\(([^\($]|($[^\($]*\)))*\)))*)?\) # parameters

121− (\s*:\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

124+ (\s*:\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

122 \s*=> # arrow operator

125 \s*=> # arrow operator

123 )

126 )

124 )

127 )

@@ -268,7 +271,7 @@ contexts:

268 - include: decorator

271 - include: decorator

269 - match: (?<=:)\s*

272 - match: (?<=:)\s*

270 push:

273 push:

271− - match: '(?=\s|[;),}\]:\-\+]|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'

274+ - match: '(?=\s|[;),}\]:\-\+]|;|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'

272 pop: true

275 pop: true

273 - include: expression

276 - include: expression

274 - include: method-declaration

277 - include: method-declaration

@@ -317,12 +320,7 @@ contexts:

318 scope: keyword.control.loop.ts

321 scope: keyword.control.loop.ts

319 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(return)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

322 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(return)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

320− captures:

321− 0: keyword.control.flow.ts

323+ scope: keyword.control.flow.ts

322− push:

323− - match: '(?=[;}]|$|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'

324− pop: true

325− - include: expression

326 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(case|default|switch)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

324 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(case|default|switch)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

327 scope: keyword.control.switch.ts

325 scope: keyword.control.switch.ts

328 - include: if-statement

326 - include: if-statement

@@ -759,25 +757,23 @@ contexts:

759 2: keyword.control.as.ts

757 2: keyword.control.as.ts

760 3: storage.type.namespace.ts

758 3: storage.type.namespace.ts

761 4: entity.name.type.module.ts

759 4: entity.name.type.module.ts

762− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(export)(?:\s+(type))?(?:(?:\s*(=))|(?:\s+(default)(?=\s+)))'

760+ - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(export)(?:(?:\s*(=))|(?:\s+(default)(?=\s+)))'

763 captures:

761 captures:

764 1: keyword.control.export.ts

762 1: keyword.control.export.ts

765− 2: keyword.control.type.ts

766− 3: keyword.operator.assignment.ts

763+ 2: keyword.operator.assignment.ts

767− 4: keyword.control.default.ts

764+ 3: keyword.control.default.ts

768 push:

765 push:

769 - meta_scope: meta.export.default.ts

766 - meta_scope: meta.export.default.ts

771 pop: true

768 pop: true

772 - include: interface-declaration

769 - include: interface-declaration

773 - include: expression

770 - include: expression

774− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(export)(?:\s+(type))?\b(?!(\$)|(\s*:))((?=\s*[\{*])|((?=\s*[_$[:alpha:]][_$[:alnum:]]*(\s|,))(?!\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b)))'

771+ - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(export)\b(?!(\$)|(\s*:))((?=\s*[\{*])|((?=\s*[_$[:alpha:]][_$[:alnum:]]*(\s|,))(?!\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b)))'

775 captures:

772 captures:

776− 1: keyword.control.export.ts

773+ 0: keyword.control.export.ts

777− 2: keyword.control.type.ts

778 push:

774 push:

779 - meta_scope: meta.export.ts

775 - meta_scope: meta.export.ts

781 pop: true

777 pop: true

782 - include: import-export-declaration

778 - include: import-export-declaration

783 expression:

779 expression:

@@ -790,11 +786,11 @@ contexts:

790 - include: string

786 - include: string

791 - include: decorator

787 - include: decorator

792 - include: destructuring-parameter

788 - include: destructuring-parameter

794 captures:

790 captures:

795 1: storage.modifier.ts

791 1: storage.modifier.ts

796 - match: |-

792 - match: |-

798 # function assignment |

794 # function assignment |

799 (=\s*(

795 (=\s*(

800 ((async\s+)?(

796 ((async\s+)?(

@@ -803,10 +799,10 @@ contexts:

803 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

799 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

804 )) |

800 )) |

805 ((async\s*)?(

801 ((async\s*)?(

806− ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

802+ ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

807 # sure shot arrow functions even if => is on new line

803 # sure shot arrow functions even if => is on new line

808 (

804 (

809− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

805+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

810 [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

806 [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

811 (

807 (

812 ([)]\s*:) | # ():

808 ([)]\s*:) | # ():

@@ -816,9 +812,9 @@ contexts:

816

812

817 # arrow function possible to detect only with => on same line

813 # arrow function possible to detect only with => on same line

818 (

814 (

819− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

815+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

820− $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\) # parameters

816+ $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()]|(\(([^\($]|($[^\($]*\)))*\)))*)?\) # parameters

821− (\s*:\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

817+ (\s*:\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

822 \s*=> # arrow operator

818 \s*=> # arrow operator

823 )

819 )

824 ))

820 ))

@@ -836,18 +832,18 @@ contexts:

836 ))

832 ))

837 )) |

833 )) |

838 (:\s*(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))Function(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))) |

834 (:\s*(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))Function(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))) |

839− (:\s*((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))) |

835+ (:\s*((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))) |

840− (:\s*(=>|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(

836+ (:\s*(=>|($([^\($]|($[^\($]*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(

841 ((async\s+)?(

837 ((async\s+)?(

842 (function\s*[(<*]) |

838 (function\s*[(<*]) |

843 (function\s+) |

839 (function\s+) |

844 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

840 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

845 )) |

841 )) |

846 ((async\s*)?(

842 ((async\s*)?(

847− ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

843+ ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

848 # sure shot arrow functions even if => is on new line

844 # sure shot arrow functions even if => is on new line

849 (

845 (

850− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

846+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

851 [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

847 [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

852 (

848 (

853 ([)]\s*:) | # ():

849 ([)]\s*:) | # ():

@@ -857,9 +853,9 @@ contexts:

857

853

858 # arrow function possible to detect only with => on same line

854 # arrow function possible to detect only with => on same line

859 (

855 (

860− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

856+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

861− $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\) # parameters

857+ $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()]|(\(([^\($]|($[^\($]*\)))*\)))*)?\) # parameters

862− (\s*:\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

858+ (\s*:\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

863 \s*=> # arrow operator

859 \s*=> # arrow operator

864 )

860 )

865 ))

861 ))

@@ -870,7 +866,7 @@ contexts:

870 3: entity.name.function.ts variable.language.this.ts

866 3: entity.name.function.ts variable.language.this.ts

871 4: entity.name.function.ts

867 4: entity.name.function.ts

872 5: keyword.operator.optional.ts

868 5: keyword.operator.optional.ts

874 captures:

870 captures:

875 1: storage.modifier.ts

871 1: storage.modifier.ts

876 2: keyword.operator.rest.ts

872 2: keyword.operator.rest.ts

@@ -920,7 +916,7 @@ contexts:

920 captures:

916 captures:

921 1: keyword.control.as.ts

917 1: keyword.control.as.ts

922 push:

918 push:

923− - match: '(?=^|[;),}\]:?\-\+\>]|\|\||\&\&|\!\=\=|$|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(as)\s+)|(\s+\<))'

919+ - match: '(?=$|^|[;,:})\]]|\|\||\&\&|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(as)\s+)|(\s+\<))'

924 pop: true

920 pop: true

925 - include: type

921 - include: type

926 - match: \.\.\.

922 - match: \.\.\.

@@ -935,11 +931,6 @@ contexts:

935 scope: keyword.operator.comparison.ts

931 scope: keyword.operator.comparison.ts

936 - match: <=|>=|<>|<|>

932 - match: <=|>=|<>|<|>

937 scope: keyword.operator.relational.ts

933 scope: keyword.operator.relational.ts

938− - match: '(?<=[_$[:alnum:]])(\!)\s*(?:(/=)|(?:(/)(?![/*])))'

939− captures:

940− 1: keyword.operator.logical.ts

941− 2: keyword.operator.assignment.compound.ts

942− 3: keyword.operator.arithmetic.ts

943 - match: \!|&&|\|\||\?\?

934 - match: \!|&&|\|\||\?\?

944 scope: keyword.operator.logical.ts

935 scope: keyword.operator.logical.ts

945 - match: \&|~|\^|\|

936 - match: \&|~|\^|\|

@@ -952,18 +943,16 @@ contexts:

952 scope: keyword.operator.increment.ts

943 scope: keyword.operator.increment.ts

953 - match: '%|\*|/|-|\+'

944 - match: '%|\*|/|-|\+'

954 scope: keyword.operator.arithmetic.ts

945 scope: keyword.operator.arithmetic.ts

955− - match: '(?<=[_$[:alnum:])\]])\s*(?=(\/\*([^\*]|(\*[^\/]))*\*\/\s*)+(?:(/=)|(?:(/)(?![/*]))))'

946+ - match: '(?<=[_$[:alnum:])\]])\s*(?=(\/\*([^\*]|(\*[^\/]))*\*\/\s*)+(/)(?![/*]))'

956 push:

947 push:

957− - match: '(?:(/=)|(?:(/)(?!\*([^\*]|(\*[^\/]))*\*\/)))'

948+ - match: '(/)(?!\*([^\*]|(\*[^\/]))*\*\/)'

958 captures:

949 captures:

959− 1: keyword.operator.assignment.compound.ts

950+ 1: keyword.operator.arithmetic.ts

960− 2: keyword.operator.arithmetic.ts

961 pop: true

951 pop: true

962 - include: comment

952 - include: comment

963− - match: '(?<=[_$[:alnum:])\]])\s*(?:(/=)|(?:(/)(?![/*])))'

953+ - match: '(?<=[_$[:alnum:])\]])\s*(/)(?![/*])'

964 captures:

954 captures:

965− 1: keyword.operator.assignment.compound.ts

955+ 1: keyword.operator.arithmetic.ts

966− 2: keyword.operator.arithmetic.ts

967 expressionPunctuations:

956 expressionPunctuations:

968 - include: punctuation-comma

957 - include: punctuation-comma

969 - include: punctuation-accessor

958 - include: punctuation-accessor

@@ -996,7 +985,7 @@ contexts:

996 (?:\b[0-9][0-9_]*(\.)(n)?\B)| # 1.

985 (?:\b[0-9][0-9_]*(\.)(n)?\B)| # 1.

997 (?:\B(\.)[0-9][0-9_]*(n)?\b)| # .1

986 (?:\B(\.)[0-9][0-9_]*(n)?\b)| # .1

998 (?:\b[0-9][0-9_]*(n)?\b(?!\.)) # 1

987 (?:\b[0-9][0-9_]*(n)?\b(?!\.)) # 1

999− )(?!\$))|(\#?[_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(?:(?:(\?)|(\!))\s*)?(=|:|;|,|\}|$))

988+ )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(?:(?:(\?)|(\!))\s*)?(=|:|;|,|\}|$))

1000 captures:

989 captures:

1001 1: storage.modifier.ts

990 1: storage.modifier.ts

1002 push:

991 push:

@@ -1011,7 +1000,7 @@ contexts:

1011 (?:\b[0-9][0-9_]*(\.)(n)?\B)| # 1.

1000 (?:\b[0-9][0-9_]*(\.)(n)?\B)| # 1.

1012 (?:\B(\.)[0-9][0-9_]*(n)?\b)| # .1

1001 (?:\B(\.)[0-9][0-9_]*(n)?\b)| # .1

1013 (?:\b[0-9][0-9_]*(n)?\b(?!\.)) # 1

1002 (?:\b[0-9][0-9_]*(n)?\b(?!\.)) # 1

1014− )(?!\$))|(\#?[_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(?:(?:(\?)|(\!))\s*)?(=|:|;|,|$))))|(?<=\})

1003+ )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(?:(?:(\?)|(\!))\s*)?(=|:|;|,|$))))|(?<=\})

1015 pop: true

1004 pop: true

1016 - include: variable-initializer

1005 - include: variable-initializer

1017 - include: type-annotation

1006 - include: type-annotation

@@ -1020,7 +1009,7 @@ contexts:

1020 - include: numeric-literal

1009 - include: numeric-literal

1021 - include: comment

1010 - include: comment

1022 - match: |-

1011 - match: |-

1023− (?x)(\#?[_$[:alpha:]][_$[:alnum:]]*)(?:(\?)|(\!))?(?=\s*\s*

1012+ (?x)([_$[:alpha:]][_$[:alnum:]]*)(?:(\?)|(\!))?(?=\s*\s*

1024 # function assignment |

1013 # function assignment |

1025 (=\s*(

1014 (=\s*(

1026 ((async\s+)?(

1015 ((async\s+)?(

@@ -1029,10 +1018,10 @@ contexts:

1029 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

1018 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

1030 )) |

1019 )) |

1031 ((async\s*)?(

1020 ((async\s*)?(

1032− ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

1021+ ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

1033 # sure shot arrow functions even if => is on new line

1022 # sure shot arrow functions even if => is on new line

1034 (

1023 (

1035− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

1024+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

1036 [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

1025 [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

1037 (

1026 (

1038 ([)]\s*:) | # ():

1027 ([)]\s*:) | # ():

@@ -1042,9 +1031,9 @@ contexts:

1042

1031

1043 # arrow function possible to detect only with => on same line

1032 # arrow function possible to detect only with => on same line

1044 (

1033 (

1045− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

1034+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

1046− $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\) # parameters

1035+ $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()]|(\(([^\($]|($[^\($]*\)))*\)))*)?\) # parameters

1047− (\s*:\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

1036+ (\s*:\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

1048 \s*=> # arrow operator

1037 \s*=> # arrow operator

1049 )

1038 )

1050 ))

1039 ))

@@ -1062,18 +1051,18 @@ contexts:

1062 ))

1051 ))

1063 )) |

1052 )) |

1064 (:\s*(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))Function(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))) |

1053 (:\s*(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))Function(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))) |

1065− (:\s*((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))) |

1054+ (:\s*((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))) |

1066− (:\s*(=>|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(

1055+ (:\s*(=>|($([^\($]|($[^\($]*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(

1067 ((async\s+)?(

1056 ((async\s+)?(

1068 (function\s*[(<*]) |

1057 (function\s*[(<*]) |

1069 (function\s+) |

1058 (function\s+) |

1070 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

1059 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

1071 )) |

1060 )) |

1072 ((async\s*)?(

1061 ((async\s*)?(

1073− ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

1062+ ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

1074 # sure shot arrow functions even if => is on new line

1063 # sure shot arrow functions even if => is on new line

1075 (

1064 (

1076− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

1065+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

1077 [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

1066 [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

1078 (

1067 (

1079 ([)]\s*:) | # ():

1068 ([)]\s*:) | # ():

@@ -1083,9 +1072,9 @@ contexts:

1083

1072

1084 # arrow function possible to detect only with => on same line

1073 # arrow function possible to detect only with => on same line

1085 (

1074 (

1086− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

1075+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

1087− $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\) # parameters

1076+ $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()]|(\(([^\($]|($[^\($]*\)))*\)))*)?\) # parameters

1088− (\s*:\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

1077+ (\s*:\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

1089 \s*=> # arrow operator

1078 \s*=> # arrow operator

1090 )

1079 )

1091 ))

1080 ))

@@ -1094,7 +1083,7 @@ contexts:

1094 1: meta.definition.property.ts entity.name.function.ts

1083 1: meta.definition.property.ts entity.name.function.ts

1095 2: keyword.operator.optional.ts

1084 2: keyword.operator.optional.ts

1096 3: keyword.operator.definiteassignment.ts

1085 3: keyword.operator.definiteassignment.ts

1097− - match: '\#?[_$[:alpha:]][_$[:alnum:]]*'

1086+ - match: "[_$[:alpha:]][_$[:alnum:]]*"

1098 scope: meta.definition.property.ts variable.object.property.ts

1087 scope: meta.definition.property.ts variable.object.property.ts

1099 - match: \?

1088 - match: \?

1100 scope: keyword.operator.optional.ts

1089 scope: keyword.operator.optional.ts

@@ -1126,47 +1115,29 @@ contexts:

1126 - include: type-parameters

1115 - include: type-parameters

1127 - include: function-parameters

1116 - include: function-parameters

1128 - include: return-type

1117 - include: return-type

1129− - include: type-function-return-type

1130 - include: decl-block

1118 - include: decl-block

1131 - match: \*

1119 - match: \*

1132 scope: keyword.generator.asterisk.ts

1120 scope: keyword.generator.asterisk.ts

1133 function-call:

1121 function-call:

1134− - match: '(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\)]))\s*(?:(\?\.\s*)|(\!))?((<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)?\())'

1122+ - match: '(?=(((([_$[:alpha:]][_$[:alnum:]]*\s*\??\.\s*)*|(\??\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*))|(?<=[\)]))\s*(?:(\?\.\s*)|(\!))?(<\s*(((keyof|infer|typeof)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''[^\'']*\'')|(\"[^\"]*\")|(\`[^\`]*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($[^\($]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''[^\'']*\'')|(\"[^\"]*\")|(\`[^\`]*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>$]|(\(([^\($]|($[^\($]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''[^\'']*\'')|(\"[^\"]*\")|(\`[^\`]*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($[^\($]*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)?\()'

1135 push:

1123 push:

1136− - match: '(?<=\))(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\)]))\s*(?:(\?\.\s*)|(\!))?((<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)?\())'

1124+ - match: '(?<=\))(?!(((([_$[:alpha:]][_$[:alnum:]]*\s*\??\.\s*)*|(\??\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*))|(?<=[\)]))\s*(?:(\?\.\s*)|(\!))?(<\s*(((keyof|infer|typeof)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''[^\'']*\'')|(\"[^\"]*\")|(\`[^\`]*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($[^\($]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''[^\'']*\'')|(\"[^\"]*\")|(\`[^\`]*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>$]|(\(([^\($]|($[^\($]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''[^\'']*\'')|(\"[^\"]*\")|(\`[^\`]*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($[^\($]*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)?\()'

1137 pop: true

1125 pop: true

1138− - match: '(?=(([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))'

1126+ - match: '(?=(([_$[:alpha:]][_$[:alnum:]]*\s*\??\.\s*)*|(\??\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*))'

1139 push:

1127 push:

1140 - meta_scope: meta.function-call.ts

1128 - meta_scope: meta.function-call.ts

1141− - match: '(?=\s*(?:(\?\.\s*)|(\!))?((<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)?\())'

1129+ - match: '(?=\s*(?:(\?\.\s*)|(\!))?(<\s*(((keyof|infer|typeof)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''[^\'']*\'')|(\"[^\"]*\")|(\`[^\`]*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($[^\($]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''[^\'']*\'')|(\"[^\"]*\")|(\`[^\`]*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>$]|(\(([^\($]|($[^\($]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''[^\'']*\'')|(\"[^\"]*\")|(\`[^\`]*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($[^\($]*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)?\()'

1142 pop: true

1130 pop: true

1143− - include: function-call-target

1131+ - include: support-function-call-identifiers

1132+ - match: "([_$[:alpha:]][_$[:alnum:]]*)"

1133+ scope: entity.name.function.ts

1144 - include: comment

1134 - include: comment

1145− - include: function-call-optionals

1135+ - match: \?\.

1136+ scope: meta.function-call.ts punctuation.accessor.optional.ts

1137+ - match: \!

1138+ scope: meta.function-call.ts keyword.operator.definiteassignment.ts

1146 - include: type-arguments

1139 - include: type-arguments

1147 - include: paren-expression

1140 - include: paren-expression

1148− - match: '(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\)]))(<\s*[\{\[\(]\s*$))'

1149− push:

1150− - match: '(?<=\>)(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\)]))(<\s*[\{\[\(]\s*$))'

1151− pop: true

1152− - match: '(?=(([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))'

1153− push:

1154− - meta_scope: meta.function-call.ts

1155− - match: '(?=(<\s*[\{\[\(]\s*$))'

1156− pop: true

1157− - include: function-call-target

1158− - include: comment

1159− - include: function-call-optionals

1160− - include: type-arguments

1161− function-call-optionals:

1162− - match: \?\.

1163− scope: meta.function-call.ts punctuation.accessor.optional.ts

1164− - match: \!

1165− scope: meta.function-call.ts keyword.operator.definiteassignment.ts

1166− function-call-target:

1167− - include: support-function-call-identifiers

1168− - match: '(\#?[_$[:alpha:]][_$[:alnum:]]*)'

1169− scope: entity.name.function.ts

1170 function-declaration:

1141 function-declaration:

1171 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?(?:(async)\s+)?(function\b)(?:\s*(\*))?(?:(?:\s+|(?<=\*))([_$[:alpha:]][_$[:alnum:]]*))?\s*'

1142 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?(?:(async)\s+)?(function\b)(?:\s*(\*))?(?:(?:\s+|(?<=\*))([_$[:alpha:]][_$[:alnum:]]*))?\s*'

1172 captures:

1143 captures:

@@ -1178,7 +1149,7 @@ contexts:

1178 6: meta.definition.function.ts entity.name.function.ts

1149 6: meta.definition.function.ts entity.name.function.ts

1179 push:

1150 push:

1180 - meta_scope: meta.function.ts

1151 - meta_scope: meta.function.ts

1181− - match: '(?=;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))|(?<=\})'

1152+ - match: '(?=;|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))|(?<=\})'

1182 pop: true

1153 pop: true

1183 - include: function-name

1154 - include: function-name

1184 - include: function-body

1155 - include: function-body

@@ -1230,10 +1201,10 @@ contexts:

1230 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

1201 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

1231 )) |

1202 )) |

1232 ((async\s*)?(

1203 ((async\s*)?(

1233− ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

1204+ ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

1234 # sure shot arrow functions even if => is on new line

1205 # sure shot arrow functions even if => is on new line

1235 (

1206 (

1236− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

1207+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

1237 [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

1208 [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

1238 (

1209 (

1239 ([)]\s*:) | # ():

1210 ([)]\s*:) | # ():

@@ -1243,9 +1214,9 @@ contexts:

1243

1214

1244 # arrow function possible to detect only with => on same line

1215 # arrow function possible to detect only with => on same line

1245 (

1216 (

1246− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

1217+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

1247− $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\) # parameters

1218+ $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()]|(\(([^\($]|($[^\($]*\)))*\)))*)?\) # parameters

1248− (\s*:\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

1219+ (\s*:\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

1249 \s*=> # arrow operator

1220 \s*=> # arrow operator

1250 )

1221 )

1251 ))

1222 ))

@@ -1254,12 +1225,12 @@ contexts:

1254 1: punctuation.accessor.ts

1225 1: punctuation.accessor.ts

1255 2: punctuation.accessor.optional.ts

1226 2: punctuation.accessor.optional.ts

1256 3: entity.name.function.ts

1227 3: entity.name.function.ts

1257− - match: '(?:(\.)|(\?\.(?!\s*[[:digit:]])))\s*(\#?[[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])'

1228+ - match: '(?:(\.)|(\?\.(?!\s*[[:digit:]])))\s*([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])'

1258 captures:

1229 captures:

1259 1: punctuation.accessor.ts

1230 1: punctuation.accessor.ts

1260 2: punctuation.accessor.optional.ts

1231 2: punctuation.accessor.optional.ts

1261 3: variable.other.constant.property.ts

1232 3: variable.other.constant.property.ts

1262− - match: '(?:(\.)|(\?\.(?!\s*[[:digit:]])))\s*(\#?[_$[:alpha:]][_$[:alnum:]]*)'

1233+ - match: '(?:(\.)|(\?\.(?!\s*[[:digit:]])))\s*([_$[:alpha:]][_$[:alnum:]]*)'

1263 captures:

1234 captures:

1264 1: punctuation.accessor.ts

1235 1: punctuation.accessor.ts

1265 2: punctuation.accessor.optional.ts

1236 2: punctuation.accessor.optional.ts

@@ -1269,7 +1240,7 @@ contexts:

1269 - match: "[_$[:alpha:]][_$[:alnum:]]*"

1240 - match: "[_$[:alpha:]][_$[:alnum:]]*"

1270 scope: variable.other.readwrite.ts

1241 scope: variable.other.readwrite.ts

1271 if-statement:

1242 if-statement:

1272− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?=\bif\s*($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))\s*(?!\{))'

1243+ - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?=\bif\s*($([^\($]|($[^\($]*\)))*\))\s*(?!\{))'

1273 push:

1244 push:

1274 - match: '(?=;|$|\})'

1245 - match: '(?=;|$|\})'

1275 pop: true

1246 pop: true

@@ -1284,12 +1255,12 @@ contexts:

1284 0: meta.brace.round.ts

1255 0: meta.brace.round.ts

1285 pop: true

1256 pop: true

1286 - include: expression

1257 - include: expression

1287− - match: '(?<=\))\s*\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/([dgimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))'

1258+ - match: '(?<=\))\s*\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)+\])+\/[gimsuy]*(?!\s*[a-zA-Z0-9_$]))'

1288 captures:

1259 captures:

1289 0: punctuation.definition.string.begin.ts

1260 0: punctuation.definition.string.begin.ts

1290 push:

1261 push:

1291 - meta_scope: string.regexp.ts

1262 - meta_scope: string.regexp.ts

1292− - match: "(/)([dgimsuy]*)"

1263+ - match: "(/)([gimsuy]*)"

1293 captures:

1264 captures:

1294 1: punctuation.definition.string.end.ts

1265 1: punctuation.definition.string.end.ts

1295 2: keyword.other.ts

1266 2: keyword.other.ts

@@ -1297,12 +1268,11 @@ contexts:

1297 - include: regexp

1268 - include: regexp

1298 - include: statements

1269 - include: statements

1299 import-declaration:

1270 import-declaration:

1300− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(import)(?:\s+(type)(?!\s+from))?(?!\s*[:\(])(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

1271+ - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(import)(?!\s*[:\(])(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

1301 captures:

1272 captures:

1302 1: keyword.control.export.ts

1273 1: keyword.control.export.ts

1303 2: storage.modifier.ts

1274 2: storage.modifier.ts

1304 3: keyword.control.import.ts

1275 3: keyword.control.import.ts

1305− 4: keyword.control.type.ts

1306 push:

1276 push:

1307 - meta_scope: meta.import.ts

1277 - meta_scope: meta.import.ts

1308 - match: '(?<!^import|[^\._$[:alnum:]]import)(?=;|$|^)'

1278 - match: '(?<!^import|[^\._$[:alnum:]]import)(?=;|$|^)'

@@ -1319,16 +1289,15 @@ contexts:

1319 - include: import-export-declaration

1289 - include: import-export-declaration

1320 - include: import-export-declaration

1290 - include: import-export-declaration

1321 import-equals-declaration:

1291 import-equals-declaration:

1322− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(import)(?:\s+(type))?\s+([_$[:alpha:]][_$[:alnum:]]*)\s*(=)\s*(require)\s*(\()'

1292+ - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(import)\s+([_$[:alpha:]][_$[:alnum:]]*)\s*(=)\s*(require)\s*(\()'

1323 captures:

1293 captures:

1324 1: keyword.control.export.ts

1294 1: keyword.control.export.ts

1325 2: storage.modifier.ts

1295 2: storage.modifier.ts

1326 3: keyword.control.import.ts

1296 3: keyword.control.import.ts

1327− 4: keyword.control.type.ts

1328− 5: variable.other.readwrite.alias.ts

1297+ 4: variable.other.readwrite.alias.ts

1329− 6: keyword.operator.assignment.ts

1298+ 5: keyword.operator.assignment.ts

1330− 7: keyword.control.require.ts

1299+ 6: keyword.control.require.ts

1331− 8: meta.brace.round.ts

1300+ 7: meta.brace.round.ts

1332 push:

1301 push:

1333 - meta_scope: meta.import-equals.external.ts

1302 - meta_scope: meta.import-equals.external.ts

1334 - match: \)

1303 - match: \)

@@ -1337,14 +1306,13 @@ contexts:

1337 pop: true

1306 pop: true

1338 - include: comment

1307 - include: comment

1339 - include: string

1308 - include: string

1340− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(import)(?:\s+(type))?\s+([_$[:alpha:]][_$[:alnum:]]*)\s*(=)\s*(?!require\b)'

1309+ - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(import)\s+([_$[:alpha:]][_$[:alnum:]]*)\s*(=)\s*(?!require\b)'

1341 captures:

1310 captures:

1342 1: keyword.control.export.ts

1311 1: keyword.control.export.ts

1343 2: storage.modifier.ts

1312 2: storage.modifier.ts

1344 3: keyword.control.import.ts

1313 3: keyword.control.import.ts

1345− 4: keyword.control.type.ts

1346− 5: variable.other.readwrite.alias.ts

1314+ 4: variable.other.readwrite.alias.ts

1347− 6: keyword.operator.assignment.ts

1315+ 5: keyword.operator.assignment.ts

1348 push:

1316 push:

1349 - meta_scope: meta.import-equals.internal.ts

1317 - meta_scope: meta.import-equals.internal.ts

1350 - match: (?=;|$|^)

1318 - match: (?=;|$|^)

@@ -1423,9 +1391,6 @@ contexts:

1423 2: keyword.operator.type.modifier.ts

1391 2: keyword.operator.type.modifier.ts

1424 3: keyword.operator.optional.ts

1392 3: keyword.operator.optional.ts

1425 pop: true

1393 pop: true

1426− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(as)\s+'

1427− captures:

1428− 1: keyword.control.as.ts

1429 - include: type

1394 - include: type

1430 inline-tags:

1395 inline-tags:

1431 - match: '(\[)[^\]]+(\])(?={@(?:link|linkcode|linkplain|tutorial))'

1396 - match: '(\[)[^\]]+(\])(?={@(?:link|linkcode|linkplain|tutorial))'

@@ -1457,7 +1422,7 @@ contexts:

1457 captures:

1422 captures:

1458 1: keyword.operator.expression.instanceof.ts

1423 1: keyword.operator.expression.instanceof.ts

1459 push:

1424 push:

1460− - match: '(?<=\))|(?=[;),}\]:?\-\+\>]|\|\||\&\&|\!\=\=|$|(([\&\~\^\|]\s*)?[_$[:alpha:]][_$[:alnum:]]*\s+instanceof(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))function((\s+[_$[:alpha:]][_$[:alnum:]]*)|(\s*[\(]))))'

1425+ - match: '(?<=\))|(?=[;),}\]:?]|\|\||\&\&|$|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))function((\s+[_$[:alpha:]][_$[:alnum:]]*)|(\s*[\(]))))'

1461 pop: true

1426 pop: true

1462 - include: type

1427 - include: type

1463 interface-declaration:

1428 interface-declaration:

@@ -1516,27 +1481,25 @@ contexts:

1516 - include: this-literal

1481 - include: this-literal

1517 - include: super-literal

1482 - include: super-literal

1518 method-declaration:

1483 method-declaration:

1519− - match: '(?x)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:\b(override)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?\s*\b(constructor)\b(?!:)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

1484+ - match: '(?x)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?\s*\b(constructor)\b(?!:)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

1520 captures:

1485 captures:

1521 1: storage.modifier.ts

1486 1: storage.modifier.ts

1522 2: storage.modifier.ts

1487 2: storage.modifier.ts

1523− 3: storage.modifier.ts

1488+ 3: storage.modifier.async.ts

1524− 4: storage.modifier.async.ts

1525− 5: storage.type.ts

1489+ 4: storage.type.ts

1526 push:

1490 push:

1527 - meta_scope: meta.method.declaration.ts

1491 - meta_scope: meta.method.declaration.ts

1528 - match: '(?=\}|;|,|$)|(?<=\})'

1492 - match: '(?=\}|;|,|$)|(?<=\})'

1529 pop: true

1493 pop: true

1530 - include: method-declaration-name

1494 - include: method-declaration-name

1531 - include: function-body

1495 - include: function-body

1532− - match: '(?x)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:\b(override)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:(?:\s*\b(new)\b(?!:)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))|(?:(\*)\s*)?)(?=\s*((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?[\(])'

1496+ - match: '(?x)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:(?:\s*\b(new)\b(?!:)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))|(?:(\*)\s*)?)(?=\s*((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?[\(])'

1533 captures:

1497 captures:

1534 1: storage.modifier.ts

1498 1: storage.modifier.ts

1535 2: storage.modifier.ts

1499 2: storage.modifier.ts

1536− 3: storage.modifier.ts

1500+ 3: storage.modifier.async.ts

1537− 4: storage.modifier.async.ts

1538− 5: keyword.operator.new.ts

1501+ 4: keyword.operator.new.ts

1539− 6: keyword.generator.asterisk.ts

1502+ 5: keyword.generator.asterisk.ts

1540 push:

1503 push:

1541 - meta_scope: meta.method.declaration.ts

1504 - meta_scope: meta.method.declaration.ts

1542 - match: '(?=\}|;|,|$)|(?<=\})'

1505 - match: '(?=\}|;|,|$)|(?<=\})'

@@ -1544,7 +1507,7 @@ contexts:

1544 - include: method-declaration-name

1507 - include: method-declaration-name

1545 - include: function-body

1508 - include: function-body

1546 - match: |-

1509 - match: |-

1547− (?x)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:\b(override)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=\s*(((\b(?<!\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:b|B)[01][01_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:o|O)?[0-7][0-7_]*(n)?\b(?!\$))|((?<!\$)(?:

1510+ (?x)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=\s*(((\b(?<!\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:b|B)[01][01_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:o|O)?[0-7][0-7_]*(n)?\b(?!\$))|((?<!\$)(?:

1548 (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.1E+3

1511 (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.1E+3

1549 (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.E+3

1512 (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.E+3

1550 (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # .1E+3

1513 (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # .1E+3

@@ -1553,14 +1516,13 @@ contexts:

1553 (?:\b[0-9][0-9_]*(\.)(n)?\B)| # 1.

1516 (?:\b[0-9][0-9_]*(\.)(n)?\B)| # 1.

1554 (?:\B(\.)[0-9][0-9_]*(n)?\b)| # .1

1517 (?:\B(\.)[0-9][0-9_]*(n)?\b)| # .1

1555 (?:\b[0-9][0-9_]*(n)?\b(?!\.)) # 1

1518 (?:\b[0-9][0-9_]*(n)?\b(?!\.)) # 1

1556− )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?[\(])

1519+ )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?[\(])

1557 captures:

1520 captures:

1558 1: storage.modifier.ts

1521 1: storage.modifier.ts

1559 2: storage.modifier.ts

1522 2: storage.modifier.ts

1560− 3: storage.modifier.ts

1523+ 3: storage.modifier.async.ts

1561− 4: storage.modifier.async.ts

1562− 5: storage.type.property.ts

1524+ 4: storage.type.property.ts

1563− 6: keyword.generator.asterisk.ts

1525+ 5: keyword.generator.asterisk.ts

1564 push:

1526 push:

1565 - meta_scope: meta.method.declaration.ts

1527 - meta_scope: meta.method.declaration.ts

1566 - match: '(?=\}|;|,|$)|(?<=\})'

1528 - match: '(?=\}|;|,|$)|(?<=\})'

@@ -1597,7 +1559,7 @@ contexts:

1597 3: storage.type.namespace.ts

1559 3: storage.type.namespace.ts

1598 push:

1560 push:

1599 - meta_scope: meta.namespace.declaration.ts

1561 - meta_scope: meta.namespace.declaration.ts

1600− - match: '(?<=\})|(?=;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'

1562+ - match: '(?<=\})|(?=;|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'

1601 pop: true

1563 pop: true

1602 - include: comment

1564 - include: comment

1603 - include: string

1565 - include: string

@@ -1611,9 +1573,11 @@ contexts:

1611 1: keyword.operator.new.ts

1573 1: keyword.operator.new.ts

1612 push:

1574 push:

1613 - meta_scope: new.expr.ts

1575 - meta_scope: new.expr.ts

1614− - match: '(?<=\))|(?=[;),}\]:?\-\+\>]|\|\||\&\&|\!\=\=|$|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))new(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))function((\s+[_$[:alpha:]][_$[:alnum:]]*)|(\s*[\(]))))'

1576+ - match: '(?<=\))|(?=[;),}\]:\-\+]|\|\||\&\&|$|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))new(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))function((\s+[_$[:alpha:]][_$[:alnum:]]*)|(\s*[\(]))))'

1615 pop: true

1577 pop: true

1616− - include: expression

1578+ - include: paren-expression

1579+ - include: class-declaration

1580+ - include: type

1617 null-literal:

1581 null-literal:

1618 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))null(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

1582 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))null(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

1619 scope: constant.language.null.ts

1583 scope: constant.language.null.ts

@@ -1756,9 +1720,9 @@ contexts:

1756 scope: support.class.ts

1720 scope: support.class.ts

1757 - match: |-

1721 - match: |-

1758 (?x)(?:(\.)|(\?\.(?!\s*[[:digit:]])))\s*(?:

1722 (?x)(?:(\.)|(\?\.(?!\s*[[:digit:]])))\s*(?:

1759− (\#?[[:upper:]][_$[:digit:][:upper:]]*) |

1723+ ([[:upper:]][_$[:digit:][:upper:]]*) |

1760− (\#?[_$[:alpha:]][_$[:alnum:]]*)

1724+ ([_$[:alpha:]][_$[:alnum:]]*)

1761− )(?=\s*\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*)

1725+ )(?=\s*\??\.\s*[_$[:alpha:]][_$[:alnum:]]*)

1762 captures:

1726 captures:

1763 1: punctuation.accessor.ts

1727 1: punctuation.accessor.ts

1764 2: punctuation.accessor.optional.ts

1728 2: punctuation.accessor.optional.ts

@@ -1768,7 +1732,7 @@ contexts:

1768 (?x)(?:

1732 (?x)(?:

1769 ([[:upper:]][_$[:digit:][:upper:]]*) |

1733 ([[:upper:]][_$[:digit:][:upper:]]*) |

1770 ([_$[:alpha:]][_$[:alnum:]]*)

1734 ([_$[:alpha:]][_$[:alnum:]]*)

1771− )(?=\s*\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*)

1735+ )(?=\s*\??\.\s*[_$[:alpha:]][_$[:alnum:]]*)

1772 captures:

1736 captures:

1773 1: variable.other.constant.object.ts

1737 1: variable.other.constant.object.ts

1774 2: variable.other.object.ts

1738 2: variable.other.object.ts

@@ -1794,7 +1758,7 @@ contexts:

1794 (?:\b[0-9][0-9_]*(\.)(n)?\B)| # 1.

1758 (?:\b[0-9][0-9_]*(\.)(n)?\B)| # 1.

1795 (?:\B(\.)[0-9][0-9_]*(n)?\b)| # .1

1759 (?:\B(\.)[0-9][0-9_]*(n)?\b)| # .1

1796 (?:\b[0-9][0-9_]*(n)?\b(?!\.)) # 1

1760 (?:\b[0-9][0-9_]*(n)?\b(?!\.)) # 1

1797− )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?[\(])

1761+ )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?[\(])

1798 captures:

1762 captures:

1799 1: storage.modifier.async.ts

1763 1: storage.modifier.async.ts

1800 2: storage.type.property.ts

1764 2: storage.type.property.ts

@@ -1815,7 +1779,7 @@ contexts:

1815 (?:\b[0-9][0-9_]*(\.)(n)?\B)| # 1.

1779 (?:\b[0-9][0-9_]*(\.)(n)?\B)| # 1.

1816 (?:\B(\.)[0-9][0-9_]*(n)?\b)| # .1

1780 (?:\B(\.)[0-9][0-9_]*(n)?\b)| # .1

1817 (?:\b[0-9][0-9_]*(n)?\b(?!\.)) # 1

1781 (?:\b[0-9][0-9_]*(n)?\b(?!\.)) # 1

1818− )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?[\(])

1782+ )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?[\(])

1819 captures:

1783 captures:

1820 1: storage.modifier.async.ts

1784 1: storage.modifier.async.ts

1821 2: storage.type.property.ts

1785 2: storage.type.property.ts

@@ -1877,10 +1841,10 @@ contexts:

1877 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

1841 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

1878 )) |

1842 )) |

1879 ((async\s*)?(

1843 ((async\s*)?(

1880− ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

1844+ ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

1881 # sure shot arrow functions even if => is on new line

1845 # sure shot arrow functions even if => is on new line

1882 (

1846 (

1883− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

1847+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

1884 [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

1848 [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

1885 (

1849 (

1886 ([)]\s*:) | # ():

1850 ([)]\s*:) | # ():

@@ -1890,9 +1854,9 @@ contexts:

1890

1854

1891 # arrow function possible to detect only with => on same line

1855 # arrow function possible to detect only with => on same line

1892 (

1856 (

1893− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

1857+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

1894− $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\) # parameters

1858+ $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()]|(\(([^\($]|($[^\($]*\)))*\)))*)?\) # parameters

1895− (\s*:\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

1859+ (\s*:\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

1896 \s*=> # arrow operator

1860 \s*=> # arrow operator

1897 )

1861 )

1898 ))

1862 ))

@@ -1927,7 +1891,7 @@ contexts:

1927 1: keyword.control.as.ts

1891 1: keyword.control.as.ts

1928 push:

1892 push:

1929 - meta_scope: meta.object.member.ts

1893 - meta_scope: meta.object.member.ts

1930− - match: '(?=[;),}\]:?\-\+\>]|\|\||\&\&|\!\=\=|$|^|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(as)\s+))'

1894+ - match: '(?=$|^|[,}]|\|\||\&\&|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(as)\s+))'

1931 pop: true

1895 pop: true

1932 - include: type

1896 - include: type

1933 - match: '(?=[_$[:alpha:]][_$[:alnum:]]*\s*=)'

1897 - match: '(?=[_$[:alpha:]][_$[:alnum:]]*\s*=)'

@@ -1943,7 +1907,7 @@ contexts:

1943 - meta_scope: meta.object.member.ts

1907 - meta_scope: meta.object.member.ts

1944 - match: '(?=,|\})'

1908 - match: '(?=,|\})'

1945 pop: true

1909 pop: true

1946− - match: '(?<=:)\s*(async)?(?=\s*(<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)$\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))'

1910+ - match: '(?<=:)\s*(async)?(?=\s*(<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)$\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))'

1947 captures:

1911 captures:

1948 1: storage.modifier.async.ts

1912 1: storage.modifier.async.ts

1949 push:

1913 push:

@@ -1959,7 +1923,7 @@ contexts:

1959 0: meta.brace.round.ts

1923 0: meta.brace.round.ts

1960 pop: true

1924 pop: true

1961 - include: expression-inside-possibly-arrow-parens

1925 - include: expression-inside-possibly-arrow-parens

1962− - match: '(?<=:)\s*(async)?\s*($)(?=\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))'

1926+ - match: '(?<=:)\s*(async)?\s*($)(?=\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))'

1963 captures:

1927 captures:

1964 1: storage.modifier.async.ts

1928 1: storage.modifier.async.ts

1965 2: meta.brace.round.ts

1929 2: meta.brace.round.ts

@@ -1969,22 +1933,6 @@ contexts:

1969 0: meta.brace.round.ts

1933 0: meta.brace.round.ts

1970 pop: true

1934 pop: true

1971 - include: expression-inside-possibly-arrow-parens

1935 - include: expression-inside-possibly-arrow-parens

1972− - match: (?<=:)\s*(async)?\s*(?=\<\s*$)

1973− captures:

1974− 1: storage.modifier.async.ts

1975− push:

1976− - match: (?<=\>)

1977− pop: true

1978− - include: type-parameters

1979− - match: '(?<=\>)\s*($)(?=\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))'

1980− captures:

1981− 1: meta.brace.round.ts

1982− push:

1983− - match: \)

1984− captures:

1985− 0: meta.brace.round.ts

1986− pop: true

1987− - include: expression-inside-possibly-arrow-parens

1988 - include: possibly-arrow-return-type

1936 - include: possibly-arrow-return-type

1989 - include: expression

1937 - include: expression

1990 - include: punctuation-comma

1938 - include: punctuation-comma

@@ -2010,11 +1958,11 @@ contexts:

2010 - include: destructuring-parameter-rest

1958 - include: destructuring-parameter-rest

2011 - include: variable-initializer

1959 - include: variable-initializer

2012 parameter-name:

1960 parameter-name:

2014 captures:

1962 captures:

2015 1: storage.modifier.ts

1963 1: storage.modifier.ts

2016 - match: |-

1964 - match: |-

2018 # function assignment |

1966 # function assignment |

2019 (=\s*(

1967 (=\s*(

2020 ((async\s+)?(

1968 ((async\s+)?(

@@ -2023,10 +1971,10 @@ contexts:

2023 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

1971 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

2024 )) |

1972 )) |

2025 ((async\s*)?(

1973 ((async\s*)?(

2026− ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

1974+ ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

2027 # sure shot arrow functions even if => is on new line

1975 # sure shot arrow functions even if => is on new line

2028 (

1976 (

2029− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

1977+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

2030 [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

1978 [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

2031 (

1979 (

2032 ([)]\s*:) | # ():

1980 ([)]\s*:) | # ():

@@ -2036,9 +1984,9 @@ contexts:

2036

1984

2037 # arrow function possible to detect only with => on same line

1985 # arrow function possible to detect only with => on same line

2038 (

1986 (

2039− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

1987+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

2040− $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\) # parameters

1988+ $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()]|(\(([^\($]|($[^\($]*\)))*\)))*)?\) # parameters

2041− (\s*:\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

1989+ (\s*:\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

2042 \s*=> # arrow operator

1990 \s*=> # arrow operator

2043 )

1991 )

2044 ))

1992 ))

@@ -2056,18 +2004,18 @@ contexts:

2056 ))

2004 ))

2057 )) |

2005 )) |

2058 (:\s*(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))Function(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))) |

2006 (:\s*(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))Function(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))) |

2059− (:\s*((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))) |

2007+ (:\s*((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))) |

2060− (:\s*(=>|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(

2008+ (:\s*(=>|($([^\($]|($[^\($]*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(

2061 ((async\s+)?(

2009 ((async\s+)?(

2062 (function\s*[(<*]) |

2010 (function\s*[(<*]) |

2063 (function\s+) |

2011 (function\s+) |

2064 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

2012 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

2065 )) |

2013 )) |

2066 ((async\s*)?(

2014 ((async\s*)?(

2067− ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

2015+ ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

2068 # sure shot arrow functions even if => is on new line

2016 # sure shot arrow functions even if => is on new line

2069 (

2017 (

2070− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

2018+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

2071 [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

2019 [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

2072 (

2020 (

2073 ([)]\s*:) | # ():

2021 ([)]\s*:) | # ():

@@ -2077,9 +2025,9 @@ contexts:

2077

2025

2078 # arrow function possible to detect only with => on same line

2026 # arrow function possible to detect only with => on same line

2079 (

2027 (

2080− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

2028+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

2081− $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\) # parameters

2029+ $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()]|(\(([^\($]|($[^\($]*\)))*\)))*)?\) # parameters

2082− (\s*:\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

2030+ (\s*:\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

2083 \s*=> # arrow operator

2031 \s*=> # arrow operator

2084 )

2032 )

2085 ))

2033 ))

@@ -2090,7 +2038,7 @@ contexts:

2090 3: entity.name.function.ts variable.language.this.ts

2038 3: entity.name.function.ts variable.language.this.ts

2091 4: entity.name.function.ts

2039 4: entity.name.function.ts

2092 5: keyword.operator.optional.ts

2040 5: keyword.operator.optional.ts

2094 captures:

2042 captures:

2095 1: storage.modifier.ts

2043 1: storage.modifier.ts

2096 2: keyword.operator.rest.ts

2044 2: keyword.operator.rest.ts

@@ -2150,14 +2098,14 @@ contexts:

2150 pop: true

2098 pop: true

2151 - include: expression

2099 - include: expression

2152 paren-expression-possibly-arrow:

2100 paren-expression-possibly-arrow:

2153− - match: '(?<=[(=,])\s*(async)?(?=\s*((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?$\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))'

2101+ - match: '(?<=[(=,])\s*(async)?(?=\s*((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?$\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))'

2154 captures:

2102 captures:

2155 1: storage.modifier.async.ts

2103 1: storage.modifier.async.ts

2156 push:

2104 push:

2157 - match: (?<=\))

2105 - match: (?<=\))

2158 pop: true

2106 pop: true

2159 - include: paren-expression-possibly-arrow-with-typeparameters

2107 - include: paren-expression-possibly-arrow-with-typeparameters

2160− - match: '(?<=[(=,]|=>|^return|[^\._$[:alnum:]]return)\s*(async)?(?=\s*((((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?\()|(<))\s*$)'

2108+ - match: '(?<=[(=,]|=>|^return|[^\._$[:alnum:]]return)\s*(async)?(?=\s*((((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?\()|(<))\s*$)'

2161 captures:

2109 captures:

2162 1: storage.modifier.async.ts

2110 1: storage.modifier.async.ts

2163 push:

2111 push:

@@ -2177,7 +2125,7 @@ contexts:

2177 pop: true

2125 pop: true

2178 - include: expression-inside-possibly-arrow-parens

2126 - include: expression-inside-possibly-arrow-parens

2179 possibly-arrow-return-type:

2127 possibly-arrow-return-type:

2180− - match: '(?<=\)|^)\s*(:)(?=\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*=>)'

2128+ - match: '(?<=\)|^)\s*(:)(?=\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*=>)'

2181 captures:

2129 captures:

2182 1: meta.arrow.ts meta.return.type.arrow.ts keyword.operator.type.annotation.ts

2130 1: meta.arrow.ts meta.return.type.arrow.ts keyword.operator.type.annotation.ts

2183 push:

2131 push:

@@ -2224,23 +2172,23 @@ contexts:

2224 pop: true

2172 pop: true

2225 - include: string-character-escape

2173 - include: string-character-escape

2226 regex:

2174 regex:

2227− - match: '(?<!\+\+|--|})(?<=[=(:,\[?+!]|^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case|=>|&&|\|\||\*\/)\s*(\/)(?![\/*])(?=(?:[^\/\\\[$)]|\\.|\[([^\]\\]|\\.)+\]|\(([^$\\]|\\.)+\))+\/([dgimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))'

2175+ - match: '(?<!\+\+|--|})(?<=[=(:,\[?+!]|^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case|=>|&&|\|\||\*\/)\s*(\/)(?![\/*])(?=(?:[^\/\\\[$)]|\\.|\[([^\]\\]|\\.)+\]|\(([^$\\]|\\.)+\))+\/[gimsuy]*(?!\s*[a-zA-Z0-9_$]))'

2228 captures:

2176 captures:

2229 1: punctuation.definition.string.begin.ts

2177 1: punctuation.definition.string.begin.ts

2230 push:

2178 push:

2231 - meta_scope: string.regexp.ts

2179 - meta_scope: string.regexp.ts

2232− - match: "(/)([dgimsuy]*)"

2180+ - match: "(/)([gimsuy]*)"

2233 captures:

2181 captures:

2234 1: punctuation.definition.string.end.ts

2182 1: punctuation.definition.string.end.ts

2235 2: keyword.other.ts

2183 2: keyword.other.ts

2236 pop: true

2184 pop: true

2237 - include: regexp

2185 - include: regexp

2238− - match: '((?<![_$[:alnum:])\]]|\+\+|--|}|\*\/)|((?<=^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case))\s*)\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/([dgimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))'

2186+ - match: '((?<![_$[:alnum:])\]]|\+\+|--|}|\*\/)|((?<=^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case))\s*)\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)+\])+\/[gimsuy]*(?!\s*[a-zA-Z0-9_$]))'

2239 captures:

2187 captures:

2240 0: punctuation.definition.string.begin.ts

2188 0: punctuation.definition.string.begin.ts

2241 push:

2189 push:

2242 - meta_scope: string.regexp.ts

2190 - meta_scope: string.regexp.ts

2243− - match: "(/)([dgimsuy]*)"

2191+ - match: "(/)([gimsuy]*)"

2244 captures:

2192 captures:

2245 1: punctuation.definition.string.end.ts

2193 1: punctuation.definition.string.end.ts

2246 2: keyword.other.ts

2194 2: keyword.other.ts

@@ -2340,11 +2288,6 @@ contexts:

2340 - include: type-object

2288 - include: type-object

2341 - include: type-predicate-operator

2289 - include: type-predicate-operator

2342 - include: type

2290 - include: type

2343− shebang:

2344− - match: \A(#!).*(?=$)

2345− scope: comment.line.shebang.ts

2346− captures:

2347− 1: punctuation.definition.comment.ts

2348 single-line-comment-consuming-line-ending:

2291 single-line-comment-consuming-line-ending:

2349 - match: '(^[ \t]+)?((//)(?:\s*((@)internal)(?=\s|$))?)'

2292 - match: '(^[ \t]+)?((//)(?:\s*((@)internal)(?=\s|$))?)'

2350 captures:

2293 captures:

@@ -2358,6 +2301,8 @@ contexts:

2358 - match: (?=^)

2301 - match: (?=^)

2359 pop: true

2302 pop: true

2360 statements:

2303 statements:

2304+ - include: string

2305+ - include: comment

2361 - include: declaration

2306 - include: declaration

2362 - include: control-statement

2307 - include: control-statement

2363 - include: after-operator-block-as-object-literal

2308 - include: after-operator-block-as-object-literal

@@ -2365,8 +2310,6 @@ contexts:

2365 - include: label

2310 - include: label

2366 - include: expression

2311 - include: expression

2367 - include: punctuation-semicolon

2312 - include: punctuation-semicolon

2368− - include: string

2369− - include: comment

2370 string:

2313 string:

2371 - include: qstring-single

2314 - include: qstring-single

2372 - include: qstring-double

2315 - include: qstring-double

@@ -2443,7 +2386,7 @@ contexts:

2443 4: support.variable.property.target.ts

2386 4: support.variable.property.target.ts

2444 - match: |-

2387 - match: |-

2445 (?x) (?:(\.)|(\?\.(?!\s*[[:digit:]]))) \s* (?:

2388 (?x) (?:(\.)|(\?\.(?!\s*[[:digit:]]))) \s* (?:

2446− (?:(constructor|length|prototype|__proto__)\b(?!\$|\s*(<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?\())

2389+ (?:(constructor|length|prototype|__proto__)\b(?!\$|\s*(<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?\())

2447 |

2390 |

2449 captures:

2392 captures:

@@ -2549,7 +2492,7 @@ contexts:

2552− |vAlign|value|valueType|vendor|vendorSub|version|visibility|vspace|whiteSpace|width|X[MS]LDocument|zIndex))\b(?!\$|\s*(<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?\()

2495+ |vAlign|value|valueType|vendor|vendorSub|version|visibility|vspace|whiteSpace|width|X[MS]LDocument|zIndex))\b(?!\$|\s*(<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?\()

2553 captures:

2496 captures:

2554 1: punctuation.accessor.ts

2497 1: punctuation.accessor.ts

2555 2: punctuation.accessor.optional.ts

2498 2: punctuation.accessor.optional.ts

@@ -2716,34 +2659,20 @@ contexts:

2716 0: case-clause.expr.ts punctuation.definition.section.case-statement.ts

2659 0: case-clause.expr.ts punctuation.definition.section.case-statement.ts

2717 - include: statements

2660 - include: statements

2718 template:

2661 template:

2719− - include: template-call

2662+ - match: '(?=(([_$[:alpha:]][_$[:alnum:]]*\s*\??\.\s*)*|(\??\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(<\s*(((keyof|infer|typeof)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''[^\'']*\'')|(\"[^\"]*\")|(\`[^\`]*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($[^\($]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''[^\'']*\'')|(\"[^\"]*\")|(\`[^\`]*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>$]|(\(([^\($]|($[^\($]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''[^\'']*\'')|(\"[^\"]*\")|(\`[^\`]*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($[^\($]*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)?`)'

2720− - match: "([_$[:alpha:]][_$[:alnum:]]*)?(`)"

2721− captures:

2722− 1: entity.name.function.tagged-template.ts

2723− 2: punctuation.definition.string.template.begin.ts

2724− push:

2725− - meta_scope: string.template.ts

2726− - match: "`"

2727− captures:

2728− 0: punctuation.definition.string.template.end.ts

2729− pop: true

2730− - include: template-substitution-element

2731− - include: string-character-escape

2732− template-call:

2733− - match: '(?=(([_$[:alpha:]][_$[:alnum:]]*\s*\??\.\s*)*|(\??\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)?`)'

2734 push:

2663 push:

2735 - meta_scope: string.template.ts

2664 - meta_scope: string.template.ts

2736 - match: (?=`)

2665 - match: (?=`)

2737 pop: true

2666 pop: true

2738 - match: '(?=(([_$[:alpha:]][_$[:alnum:]]*\s*\??\.\s*)*|(\??\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*))'

2667 - match: '(?=(([_$[:alpha:]][_$[:alnum:]]*\s*\??\.\s*)*|(\??\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*))'

2739 push:

2668 push:

2740− - match: '(?=(<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)?`)'

2669+ - match: '(?=(<\s*(((keyof|infer|typeof)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''[^\'']*\'')|(\"[^\"]*\")|(\`[^\`]*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($[^\($]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''[^\'']*\'')|(\"[^\"]*\")|(\`[^\`]*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>$]|(\(([^\($]|($[^\($]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''[^\'']*\'')|(\"[^\"]*\")|(\`[^\`]*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($[^\($]*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)?`)'

2741 pop: true

2670 pop: true

2742 - include: support-function-call-identifiers

2671 - include: support-function-call-identifiers

2743 - match: "([_$[:alpha:]][_$[:alnum:]]*)"

2672 - match: "([_$[:alpha:]][_$[:alnum:]]*)"

2744 scope: entity.name.function.tagged-template.ts

2673 scope: entity.name.function.tagged-template.ts

2745 - include: type-arguments

2674 - include: type-arguments

2746− - match: '([_$[:alpha:]][_$[:alnum:]]*)?\s*(?=(<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)`)'

2675+ - match: '([_$[:alpha:]][_$[:alnum:]]*)\s*(?=(<\s*(((keyof|infer|typeof)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''[^\'']*\'')|(\"[^\"]*\")|(\`[^\`]*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($[^\($]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''[^\'']*\'')|(\"[^\"]*\")|(\`[^\`]*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>$]|(\(([^\($]|($[^\($]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''[^\'']*\'')|(\"[^\"]*\")|(\`[^\`]*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($[^\($]*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)`)'

2747 captures:

2676 captures:

2748 1: entity.name.function.tagged-template.ts

2677 1: entity.name.function.tagged-template.ts

2749 push:

2678 push:

@@ -2751,20 +2680,6 @@ contexts:

2751 - match: (?=`)

2680 - match: (?=`)

2752 pop: true

2681 pop: true

2753 - include: type-arguments

2682 - include: type-arguments

2754− template-substitution-element:

2755− - match: '\$\{'

2756− captures:

2757− 0: punctuation.definition.template-expression.begin.ts

2758− push:

2759− - meta_scope: meta.template.expression.ts

2760− - meta_content_scope: meta.embedded.line.ts

2761− - match: '\}'

2762− captures:

2763− 0: punctuation.definition.template-expression.end.ts

2764− pop: true

2765− - include: expression

2766− template-type:

2767− - include: template-call

2768 - match: "([_$[:alpha:]][_$[:alnum:]]*)?(`)"

2683 - match: "([_$[:alpha:]][_$[:alnum:]]*)?(`)"

2769 captures:

2684 captures:

2770 1: entity.name.function.tagged-template.ts

2685 1: entity.name.function.tagged-template.ts

@@ -2775,9 +2690,9 @@ contexts:

2775 captures:

2690 captures:

2776 0: punctuation.definition.string.template.end.ts

2691 0: punctuation.definition.string.template.end.ts

2777 pop: true

2692 pop: true

2778− - include: template-type-substitution-element

2693+ - include: template-substitution-element

2779 - include: string-character-escape

2694 - include: string-character-escape

2780− template-type-substitution-element:

2695+ template-substitution-element:

2781 - match: '\$\{'

2696 - match: '\$\{'

2782 captures:

2697 captures:

2783 0: punctuation.definition.template-expression.begin.ts

2698 0: punctuation.definition.template-expression.begin.ts

@@ -2788,7 +2703,7 @@ contexts:

2788 captures:

2703 captures:

2789 0: punctuation.definition.template-expression.end.ts

2704 0: punctuation.definition.template-expression.end.ts

2790 pop: true

2705 pop: true

2791− - include: type

2706+ - include: expression

2792 ternary-expression:

2707 ternary-expression:

2793 - match: '(?!\?\.\s*[^[:digit:]])(\?)(?!\?)'

2708 - match: '(?!\?\.\s*[^[:digit:]])(\?)(?!\?)'

2794 captures:

2709 captures:

@@ -2804,7 +2719,7 @@ contexts:

2804 scope: variable.language.this.ts

2719 scope: variable.language.this.ts

2805 type:

2720 type:

2806 - include: comment

2721 - include: comment

2807− - include: type-string

2722+ - include: string

2808 - include: numeric-literal

2723 - include: numeric-literal

2809 - include: type-primitive

2724 - include: type-primitive

2810 - include: type-builtin-literals

2725 - include: type-builtin-literals

@@ -2829,23 +2744,15 @@ contexts:

2829 4: entity.name.type.alias.ts

2744 4: entity.name.type.alias.ts

2830 push:

2745 push:

2831 - meta_scope: meta.type.declaration.ts

2746 - meta_scope: meta.type.declaration.ts

2832− - match: '(?=\}|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'

2747+ - match: '(?=\}|;|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'

2833 pop: true

2748 pop: true

2834 - include: comment

2749 - include: comment

2835 - include: type-parameters

2750 - include: type-parameters

2836− - match: '(=)\s*(intrinsic)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

2837− captures:

2838− 1: keyword.operator.assignment.ts

2839− 2: keyword.control.intrinsic.ts

2840− push:

2841− - match: '(?=\}|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'

2842− pop: true

2843− - include: type

2844 - match: (=)\s*

2751 - match: (=)\s*

2845 captures:

2752 captures:

2846 1: keyword.operator.assignment.ts

2753 1: keyword.operator.assignment.ts

2847 push:

2754 push:

2848− - match: '(?=\}|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'

2755+ - match: '(?=\}|;|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'

2849 pop: true

2756 pop: true

2850 - include: type

2757 - include: type

2851 type-annotation:

2758 type-annotation:

@@ -2903,19 +2810,17 @@ contexts:

2903 - include: type

2810 - include: type

2904 - include: type

2811 - include: type

2905 type-fn-type-parameters:

2812 type-fn-type-parameters:

2906− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(abstract)\s+)?(new)\b(?=\s*\<)'

2813+ - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(new)\b(?=\s*\<)'

2907 captures:

2814 captures:

2908− 1: meta.type.constructor.ts storage.modifier.ts

2815+ 1: meta.type.constructor.ts keyword.control.new.ts

2909− 2: meta.type.constructor.ts keyword.control.new.ts

2910 push:

2816 push:

2911 - match: (?<=>)

2817 - match: (?<=>)

2912 pop: true

2818 pop: true

2913 - include: comment

2819 - include: comment

2914 - include: type-parameters

2820 - include: type-parameters

2915− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(abstract)\s+)?(new)\b\s*(?=\()'

2821+ - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(new)\b\s*(?=\()'

2916 captures:

2822 captures:

2917− 1: storage.modifier.ts

2823+ 1: keyword.control.new.ts

2918− 2: keyword.control.new.ts

2919 push:

2824 push:

2920 - meta_scope: meta.type.constructor.ts

2825 - meta_scope: meta.type.constructor.ts

2921 - match: (?<=\))

2826 - match: (?<=\))

@@ -3086,7 +2991,7 @@ contexts:

3086 ))

2991 ))

3087 )) |

2992 )) |

3088 (:\s*(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))Function(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))) |

2993 (:\s*(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))Function(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))) |

3089− (:\s*((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))))

2994+ (:\s*((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))))

3090 captures:

2995 captures:

3091 1: storage.modifier.ts

2996 1: storage.modifier.ts

3092 2: keyword.operator.rest.ts

2997 2: keyword.operator.rest.ts

@@ -3123,10 +3028,6 @@ contexts:

3123 type-primitive:

3028 type-primitive:

3125 scope: support.type.primitive.ts

3030 scope: support.type.primitive.ts

3126− type-string:

3127− - include: qstring-single

3128− - include: qstring-double

3129− - include: template-type

3130 type-tuple:

3031 type-tuple:

3131 - match: '\['

3032 - match: '\['

3132 captures:

3033 captures:

@@ -3137,23 +3038,11 @@ contexts:

3137 captures:

3038 captures:

3138 0: meta.brace.square.ts

3039 0: meta.brace.square.ts

3139 pop: true

3040 pop: true

3140− - match: \.\.\.

3141− scope: keyword.operator.rest.ts

3142− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))([_$[:alpha:]][_$[:alnum:]]*)\s*(\?)?\s*(:)'

3143− captures:

3144− 1: entity.name.label.ts

3145− 2: keyword.operator.optional.ts

3146− 3: punctuation.separator.label.ts

3147 - include: type

3041 - include: type

3148 - include: punctuation-comma

3042 - include: punctuation-comma

3149 typeof-operator:

3043 typeof-operator:

3150 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))typeof(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

3044 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))typeof(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

3151− captures:

3045+ scope: keyword.operator.expression.typeof.ts

3152− 0: keyword.operator.expression.typeof.ts

3153− push:

3154− - match: '(?=[,);}\]=>:&|{\?]|$|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'

3155− pop: true

3156− - include: expression

3157 undefined-literal:

3046 undefined-literal:

3158 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))undefined(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

3047 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))undefined(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

3159 scope: constant.language.undefined.ts

3048 scope: constant.language.undefined.ts

@@ -3161,7 +3050,7 @@ contexts:

3161 - match: '(?=(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(var|let)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))'

3050 - match: '(?=(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(var|let)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))'

3162 push:

3051 push:

3163 - meta_scope: meta.var.expr.ts

3052 - meta_scope: meta.var.expr.ts

3164− - match: '(?!(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(var|let)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))((?=;|}|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(of|in)\s+)|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))|((?<!^let|[^\._$[:alnum:]]let|^var|[^\._$[:alnum:]]var)(?=\s*$)))'

3053+ - match: '(?!(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(var|let)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))((?=;|}|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(of|in)\s+)|^\s*$|;|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))|((?<!^let|[^\._$[:alnum:]]let|^var|[^\._$[:alnum:]]var)(?=\s*$)))'

3165 pop: true

3054 pop: true

3166 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(var|let)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))\s*'

3055 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(var|let)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))\s*'

3167 captures:

3056 captures:

@@ -3194,7 +3083,7 @@ contexts:

3194 3: storage.type.ts

3083 3: storage.type.ts

3195 push:

3084 push:

3196 - meta_scope: meta.var.expr.ts

3085 - meta_scope: meta.var.expr.ts

3197− - match: '(?!(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(const(?!\s+enum\b))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))((?=;|}|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(of|in)\s+)|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))|((?<!^const|[^\._$[:alnum:]]const)(?=\s*$)))'

3086+ - match: '(?!(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(const(?!\s+enum\b))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))((?=;|}|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(of|in)\s+)|^\s*$|;|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))|((?<!^const|[^\._$[:alnum:]]const)(?=\s*$)))'

3198 pop: true

3087 pop: true

3199 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(const(?!\s+enum\b))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))\s*'

3088 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(const(?!\s+enum\b))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))\s*'

3200 captures:

3089 captures:

@@ -3231,10 +3120,10 @@ contexts:

3231 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

3120 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

3232 )) |

3121 )) |

3233 ((async\s*)?(

3122 ((async\s*)?(

3234− ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

3123+ ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

3235 # sure shot arrow functions even if => is on new line

3124 # sure shot arrow functions even if => is on new line

3236 (

3125 (

3237− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

3126+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

3238 [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

3127 [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

3239 (

3128 (

3240 ([)]\s*:) | # ():

3129 ([)]\s*:) | # ():

@@ -3244,9 +3133,9 @@ contexts:

3244

3133

3245 # arrow function possible to detect only with => on same line

3134 # arrow function possible to detect only with => on same line

3246 (

3135 (

3247− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

3136+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

3248− $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\) # parameters

3137+ $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()]|(\(([^\($]|($[^\($]*\)))*\)))*)?\) # parameters

3249− (\s*:\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

3138+ (\s*:\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

3250 \s*=> # arrow operator

3139 \s*=> # arrow operator

3251 )

3140 )

3252 ))

3141 ))

@@ -3264,18 +3153,18 @@ contexts:

3264 ))

3153 ))

3265 )) |

3154 )) |

3266 (:\s*(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))Function(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))) |

3155 (:\s*(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))Function(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))) |

3267− (:\s*((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))) |

3156+ (:\s*((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))) |

3268− (:\s*(=>|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(

3157+ (:\s*(=>|($([^\($]|($[^\($]*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(

3269 ((async\s+)?(

3158 ((async\s+)?(

3270 (function\s*[(<*]) |

3159 (function\s*[(<*]) |

3271 (function\s+) |

3160 (function\s+) |

3272 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

3161 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

3273 )) |

3162 )) |

3274 ((async\s*)?(

3163 ((async\s*)?(

3275− ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

3164+ ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

3276 # sure shot arrow functions even if => is on new line

3165 # sure shot arrow functions even if => is on new line

3277 (

3166 (

3278− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

3167+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

3279 [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

3168 [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

3280 (

3169 (

3281 ([)]\s*:) | # ():

3170 ([)]\s*:) | # ():

@@ -3285,9 +3174,9 @@ contexts:

3285

3174

3286 # arrow function possible to detect only with => on same line

3175 # arrow function possible to detect only with => on same line

3287 (

3176 (

3288− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

3177+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

3289− $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\) # parameters

3178+ $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()]|(\(([^\($]|($[^\($]*\)))*\)))*)?\) # parameters

3290− (\s*:\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

3179+ (\s*:\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

3291 \s*=> # arrow operator

3180 \s*=> # arrow operator

3292 )

3181 )

3293 ))

3182 ))

@@ -3318,10 +3207,10 @@ contexts:

3318 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

3207 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

3319 )) |

3208 )) |

3320 ((async\s*)?(

3209 ((async\s*)?(

3321− ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

3210+ ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

3322 # sure shot arrow functions even if => is on new line

3211 # sure shot arrow functions even if => is on new line

3323 (

3212 (

3324− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

3213+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

3325 [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

3214 [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

3326 (

3215 (

3327 ([)]\s*:) | # ():

3216 ([)]\s*:) | # ():

@@ -3331,9 +3220,9 @@ contexts:

3331

3220

3332 # arrow function possible to detect only with => on same line

3221 # arrow function possible to detect only with => on same line

3333 (

3222 (

3334− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

3223+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

3335− $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\) # parameters

3224+ $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()]|(\(([^\($]|($[^\($]*\)))*\)))*)?\) # parameters

3336− (\s*:\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

3225+ (\s*:\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

3337 \s*=> # arrow operator

3226 \s*=> # arrow operator

3338 )

3227 )

3339 ))

3228 ))

@@ -3351,18 +3240,18 @@ contexts:

3351 ))

3240 ))

3352 )) |

3241 )) |

3353 (:\s*(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))Function(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))) |

3242 (:\s*(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))Function(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))) |

3354− (:\s*((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))) |

3243+ (:\s*((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))) |

3355− (:\s*(=>|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(

3244+ (:\s*(=>|($([^\($]|($[^\($]*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(

3356 ((async\s+)?(

3245 ((async\s+)?(

3357 (function\s*[(<*]) |

3246 (function\s*[(<*]) |

3358 (function\s+) |

3247 (function\s+) |

3359 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

3248 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

3360 )) |

3249 )) |

3361 ((async\s*)?(

3250 ((async\s*)?(

3362− ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

3251+ ((<\s*$)|((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?[$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{[^\{\}]*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[[^\[\]]*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

3363 # sure shot arrow functions even if => is on new line

3252 # sure shot arrow functions even if => is on new line

3364 (

3253 (

3365− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

3254+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

3366 [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

3255 [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

3367 (

3256 (

3368 ([)]\s*:) | # ():

3257 ([)]\s*:) | # ():

@@ -3372,9 +3261,9 @@ contexts:

3372

3261

3373 # arrow function possible to detect only with => on same line

3262 # arrow function possible to detect only with => on same line

3374 (

3263 (

3375− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

3264+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

3376− $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\) # parameters

3265+ $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()]|(\(([^\($]|($[^\($]*\)))*\)))*)?\) # parameters

3377− (\s*:\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

3266+ (\s*:\s*([^<>\{\}]|\<([^<>]|\<[^<>]+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

3378 \s*=> # arrow operator

3267 \s*=> # arrow operator

3379 )

3268 )

3380 ))

3269 ))

assets/syntaxes/02_Extra/TypsecriptReact.sublime-syntax → assets/syntaxes/TypsecriptReact.sublime-syntaxrenamed+477−896

@@ -9,7 +9,10 @@ contexts:

9 main:

10 - include: directives

11 - include: statements

12− - include: shebang

12+ - match: \A(#!).*(?=$)

13+ scope: comment.line.shebang.ts

14+ captures:

15+ 1: punctuation.definition.comment.ts

13 comment:

16 comment:

14 - match: /\*\*(?!/)

17 - match: /\*\*(?!/)

15 captures:

18 captures:

@@ -41,10 +44,10 @@ contexts:

41 5: punctuation.decorator.internaldeclaration.tsx

44 5: punctuation.decorator.internaldeclaration.tsx

42 push:

45 push:

43 - meta_content_scope: comment.line.double-slash.tsx

46 - meta_content_scope: comment.line.double-slash.tsx

44− - match: (?=$)

47+ - match: (?=^)

45 pop: true

48 pop: true

46 access-modifier:

49 access-modifier:

48 scope: storage.modifier.tsx

51 scope: storage.modifier.tsx

49 after-operator-block-as-object-literal:

52 after-operator-block-as-object-literal:

50 - match: '(?<!\+\+|--)(?<=[:=(,\[?+!>]|^await|[^\._$[:alnum:]]await|^return|[^\._$[:alnum:]]return|^yield|[^\._$[:alnum:]]yield|^throw|[^\._$[:alnum:]]throw|^in|[^\._$[:alnum:]]in|^of|[^\._$[:alnum:]]of|^typeof|[^\._$[:alnum:]]typeof|&&|\|\||\*)\s*(\{)'

53 - match: '(?<!\+\+|--)(?<=[:=(,\[?+!>]|^await|[^\._$[:alnum:]]await|^return|[^\._$[:alnum:]]return|^yield|[^\._$[:alnum:]]yield|^throw|[^\._$[:alnum:]]throw|^in|[^\._$[:alnum:]]in|^of|[^\._$[:alnum:]]of|^typeof|[^\._$[:alnum:]]typeof|&&|\|\||\*)\s*(\{)'

@@ -106,8 +109,8 @@ contexts:

106 (?=

109 (?=

107 # sure shot arrow functions even if => is on new line

110 # sure shot arrow functions even if => is on new line

108 (

111 (

109− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

112+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*>\s*)?

110− [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

113+ [(]\s*

111 (

114 (

112 ([)]\s*:) | # ():

115 ([)]\s*:) | # ():

113 ((\.\.\.\s*)?[_$[:alpha:]][_$[:alnum:]]*\s*:) # [(]param: | [(]...param:

116 ((\.\.\.\s*)?[_$[:alpha:]][_$[:alnum:]]*\s*:) # [(]param: | [(]...param:

@@ -118,9 +121,9 @@ contexts:

118 ) |

121 ) |

119 # arrow function possible to detect only with => on same line

122 # arrow function possible to detect only with => on same line

120 (

123 (

121− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

124+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*>\s*)? # typeparameters

122− $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\) # parameters

125+ $\s*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()]|(\(([^\($]|($[^\($]*\)))*\)))*)?\) # parameters

123− (\s*:\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

126+ (\s*:\s*([^<>]|\<[^<>]+\>|$[^\($]+\))+)? # return type

124 \s*=> # arrow operator

127 \s*=> # arrow operator

125 )

128 )

126 )

129 )

@@ -135,15 +138,13 @@ contexts:

135 - include: type-parameters

138 - include: type-parameters

136 - include: function-parameters

139 - include: function-parameters

137 - include: arrow-return-type

140 - include: arrow-return-type

138− - include: possibly-arrow-return-type

139 - match: "=>"

141 - match: "=>"

140 captures:

142 captures:

141 0: storage.type.function.arrow.tsx

143 0: storage.type.function.arrow.tsx

142 push:

144 push:

143 - meta_scope: meta.arrow.tsx

145 - meta_scope: meta.arrow.tsx

144− - match: '((?<=\}|\S)(?<!=>)|((?!\{)(?=\S)))(?!\/[\/\*])'

146+ - match: '(?<=\}|\S)(?<!=>)|((?!\{)(?=\S))'

145 pop: true

147 pop: true

146− - include: single-line-comment-consuming-line-ending

147 - include: decl-block

148 - include: decl-block

148 - include: expression

149 - include: expression

149 arrow-return-type:

150 arrow-return-type:

@@ -169,8 +170,6 @@ contexts:

169 binding-element:

170 binding-element:

170 - include: comment

171 - include: comment

171 - include: string

172 - include: string

172− - include: numeric-literal

173− - include: regex

174 - include: object-binding-pattern

173 - include: object-binding-pattern

175 - include: array-binding-pattern

174 - include: array-binding-pattern

176 - include: destructuring-variable-rest

175 - include: destructuring-variable-rest

@@ -178,8 +177,6 @@ contexts:

178 binding-element-const:

177 binding-element-const:

179 - include: comment

178 - include: comment

180 - include: string

179 - include: string

181− - include: numeric-literal

182− - include: regex

183 - include: object-binding-pattern-const

180 - include: object-binding-pattern-const

184 - include: array-binding-pattern-const

181 - include: array-binding-pattern-const

185 - include: destructuring-variable-rest-const

182 - include: destructuring-variable-rest-const

@@ -203,12 +200,11 @@ contexts:

203 cast:

200 cast:

204 - include: jsx

201 - include: jsx

205 class-declaration:

202 class-declaration:

206− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(?:(abstract)\s+)?\b(class)\b(?=\s+|/[/*])'

203+ - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(export)\s+)?\b(?:(abstract)\s+)?\b(class)\b(?=\s+|/[/*])'

207 captures:

204 captures:

208 1: keyword.control.export.tsx

205 1: keyword.control.export.tsx

209 2: storage.modifier.tsx

206 2: storage.modifier.tsx

210− 3: storage.modifier.tsx

207+ 3: storage.type.class.tsx

211− 4: storage.type.class.tsx

212 push:

208 push:

213 - meta_scope: meta.class.tsx

209 - meta_scope: meta.class.tsx

214 - match: '(?<=\})'

210 - match: '(?<=\})'

@@ -223,10 +219,9 @@ contexts:

223 - include: type-parameters

219 - include: type-parameters

224 - include: class-or-interface-body

220 - include: class-or-interface-body

225 class-expression:

221 class-expression:

226− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(abstract)\s+)?(class)\b(?=\s+|[<{]|\/[\/*])'

222+ - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(class)\b(?=\s+|[<{]|\/[\/*])'

227 captures:

223 captures:

228− 1: storage.modifier.tsx

224+ 1: storage.type.class.tsx

229− 2: storage.type.class.tsx

230 push:

225 push:

231 - meta_scope: meta.class.tsx

226 - meta_scope: meta.class.tsx

232 - match: '(?<=\})'

227 - match: '(?<=\})'

@@ -243,11 +238,6 @@ contexts:

243 pop: true

238 pop: true

244 - include: comment

239 - include: comment

245 - include: decorator

240 - include: decorator

246− - match: (?<=:)\s*

247− push:

248− - match: '(?=\s|[;),}\]:\-\+]|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'

249− pop: true

250− - include: expression

251 - include: method-declaration

241 - include: method-declaration

252 - include: indexer-declaration

242 - include: indexer-declaration

253 - include: field-declaration

243 - include: field-declaration

@@ -294,15 +284,9 @@ contexts:

295 scope: keyword.control.loop.tsx

285 scope: keyword.control.loop.tsx

296 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(return)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

286 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(return)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

297− captures:

287+ scope: keyword.control.flow.tsx

298− 0: keyword.control.flow.tsx

299− push:

300− - match: '(?=[;}]|$|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'

301− pop: true

302− - include: expression

303 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(case|default|switch)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

288 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(case|default|switch)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

304 scope: keyword.control.switch.tsx

289 scope: keyword.control.switch.tsx

305− - include: if-statement

306 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(else|if)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

290 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(else|if)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

307 scope: keyword.control.conditional.tsx

291 scope: keyword.control.conditional.tsx

308 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(with)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

292 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(with)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

@@ -311,6 +295,8 @@ contexts:

311 scope: keyword.control.tsx

295 scope: keyword.control.tsx

312 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(debugger)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

296 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(debugger)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

313 scope: keyword.other.debugger.tsx

297 scope: keyword.other.debugger.tsx

298+ - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(declare)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

299+ scope: storage.modifier.tsx

314 decl-block:

300 decl-block:

315 - match: '\{'

301 - match: '\{'

316 captures:

302 captures:

@@ -334,8 +320,6 @@ contexts:

334 - include: import-equals-declaration

320 - include: import-equals-declaration

335 - include: import-declaration

321 - include: import-declaration

336 - include: export-declaration

322 - include: export-declaration

337− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(declare|export)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

338− scope: storage.modifier.tsx

339 decorator:

323 decorator:

340 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))\@'

324 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))\@'

341 captures:

325 captures:

@@ -349,7 +333,7 @@ contexts:

349 - match: '(?<!=|:|^of|[^\._$[:alnum:]]of|^in|[^\._$[:alnum:]]in)\s*(?=\{)'

333 - match: '(?<!=|:|^of|[^\._$[:alnum:]]of|^in|[^\._$[:alnum:]]in)\s*(?=\{)'

350 push:

334 push:

351 - meta_scope: meta.object-binding-pattern-variable.tsx

335 - meta_scope: meta.object-binding-pattern-variable.tsx

352− - match: '(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(of|in)\s+))'

336+ - match: '(?=$|^|[;,=}]|(\s+(of|in)\s+))'

353 pop: true

337 pop: true

354 - include: object-binding-pattern-const

338 - include: object-binding-pattern-const

355 - include: type-annotation

339 - include: type-annotation

@@ -357,16 +341,15 @@ contexts:

357 - match: '(?<!=|:|^of|[^\._$[:alnum:]]of|^in|[^\._$[:alnum:]]in)\s*(?=\[)'

341 - match: '(?<!=|:|^of|[^\._$[:alnum:]]of|^in|[^\._$[:alnum:]]in)\s*(?=\[)'

358 push:

342 push:

359 - meta_scope: meta.array-binding-pattern-variable.tsx

343 - meta_scope: meta.array-binding-pattern-variable.tsx

360− - match: '(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(of|in)\s+))'

344+ - match: '(?=$|^|[;,=}]|(\s+(of|in)\s+))'

361 pop: true

345 pop: true

362 - include: array-binding-pattern-const

346 - include: array-binding-pattern-const

363 - include: type-annotation

347 - include: type-annotation

364 - include: comment

348 - include: comment

365 destructuring-parameter:

349 destructuring-parameter:

366− - match: '(?<!=|:)\s*(?:(\.\.\.)\s*)?(\{)'

350+ - match: '(?<!=|:)\s*(\{)'

367 captures:

351 captures:

368− 1: keyword.operator.rest.tsx

352+ 1: punctuation.definition.binding-pattern.object.tsx

369− 2: punctuation.definition.binding-pattern.object.tsx

370 push:

353 push:

371 - meta_scope: meta.parameter.object-binding-pattern.tsx

354 - meta_scope: meta.parameter.object-binding-pattern.tsx

372 - match: '\}'

355 - match: '\}'

@@ -374,10 +357,9 @@ contexts:

374 0: punctuation.definition.binding-pattern.object.tsx

357 0: punctuation.definition.binding-pattern.object.tsx

375 pop: true

358 pop: true

376 - include: parameter-object-binding-element

359 - include: parameter-object-binding-element

377− - match: '(?<!=|:)\s*(?:(\.\.\.)\s*)?(\[)'

360+ - match: '(?<!=|:)\s*(\[)'

378 captures:

361 captures:

379− 1: keyword.operator.rest.tsx

362+ 1: punctuation.definition.binding-pattern.array.tsx

380− 2: punctuation.definition.binding-pattern.array.tsx

381 push:

363 push:

382 - meta_scope: meta.paramter.array-binding-pattern.tsx

364 - meta_scope: meta.paramter.array-binding-pattern.tsx

383 - match: '\]'

365 - match: '\]'

@@ -395,7 +377,7 @@ contexts:

395 - match: '(?<!=|:|^of|[^\._$[:alnum:]]of|^in|[^\._$[:alnum:]]in)\s*(?=\{)'

377 - match: '(?<!=|:|^of|[^\._$[:alnum:]]of|^in|[^\._$[:alnum:]]in)\s*(?=\{)'

396 push:

378 push:

397 - meta_scope: meta.object-binding-pattern-variable.tsx

379 - meta_scope: meta.object-binding-pattern-variable.tsx

398− - match: '(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(of|in)\s+))'

380+ - match: '(?=$|^|[;,=}]|(\s+(of|in)\s+))'

399 pop: true

381 pop: true

400 - include: object-binding-pattern

382 - include: object-binding-pattern

401 - include: type-annotation

383 - include: type-annotation

@@ -403,7 +385,7 @@ contexts:

403 - match: '(?<!=|:|^of|[^\._$[:alnum:]]of|^in|[^\._$[:alnum:]]in)\s*(?=\[)'

385 - match: '(?<!=|:|^of|[^\._$[:alnum:]]of|^in|[^\._$[:alnum:]]in)\s*(?=\[)'

404 push:

386 push:

405 - meta_scope: meta.array-binding-pattern-variable.tsx

387 - meta_scope: meta.array-binding-pattern-variable.tsx

406− - match: '(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(of|in)\s+))'

388+ - match: '(?=$|^|[;,=}]|(\s+(of|in)\s+))'

407 pop: true

389 pop: true

408 - include: array-binding-pattern

390 - include: array-binding-pattern

409 - include: type-annotation

391 - include: type-annotation

@@ -419,12 +401,12 @@ contexts:

419 1: keyword.operator.rest.tsx

401 1: keyword.operator.rest.tsx

420 2: meta.definition.variable.tsx variable.other.constant.tsx

402 2: meta.definition.variable.tsx variable.other.constant.tsx

421 directives:

403 directives:

422− - match: '^(///)\s*(?=<(reference|amd-dependency|amd-module)(\s+(path|types|no-default-lib|lib|name)\s*=\s*((\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)))+\s*/>\s*$)'

404+ - match: '^(///)\s*(?=<(reference|amd-dependency|amd-module)(\s+(path|types|no-default-lib|lib|name)\s*=\s*((\''([^\''\\]|\\\''|\\)*\'')|(\"([^\"\\]|\\\"|\\)*\")))+\s*/>\s*$)'

423 captures:

405 captures:

424 1: punctuation.definition.comment.tsx

406 1: punctuation.definition.comment.tsx

425 push:

407 push:

426 - meta_scope: comment.line.triple-slash.directive.tsx

408 - meta_scope: comment.line.triple-slash.directive.tsx

427− - match: (?=$)

409+ - match: (?=^)

428 pop: true

410 pop: true

429 - match: (<)(reference|amd-dependency|amd-module)

411 - match: (<)(reference|amd-dependency|amd-module)

430 captures:

412 captures:

@@ -686,18 +668,13 @@ contexts:

686 captures:

668 captures:

687 1: punctuation.definition.block.tag.jsdoc

669 1: punctuation.definition.block.tag.jsdoc

688 - include: inline-tags

670 - include: inline-tags

689− - match: '((@)(?:[_$[:alpha:]][_$[:alnum:]]*))(?=\s+)'

690− captures:

691− 1: storage.type.class.jsdoc

692− 2: punctuation.definition.block.tag.jsdoc

693 enum-declaration:

671 enum-declaration:

694− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?(?:\b(const)\s+)?\b(enum)\s+([_$[:alpha:]][_$[:alnum:]]*)'

672+ - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:\b(const)\s+)?\b(enum)\s+([_$[:alpha:]][_$[:alnum:]]*)'

695 captures:

673 captures:

696 1: keyword.control.export.tsx

674 1: keyword.control.export.tsx

697 2: storage.modifier.tsx

675 2: storage.modifier.tsx

698− 3: storage.modifier.tsx

676+ 3: storage.type.enum.tsx

699− 4: storage.type.enum.tsx

677+ 4: entity.name.type.enum.tsx

700− 5: entity.name.type.enum.tsx

701 push:

678 push:

702 - meta_scope: meta.enum.declaration.tsx

679 - meta_scope: meta.enum.declaration.tsx

703 - match: '(?<=\})'

680 - match: '(?<=\})'

@@ -720,7 +697,7 @@ contexts:

720 pop: true

697 pop: true

721 - include: comment

698 - include: comment

722 - include: variable-initializer

699 - include: variable-initializer

723− - match: '(?=((\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\])))'

700+ - match: '(?=((\''([^\''\\]|\\\''|\\)*\'')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\])))'

724 push:

701 push:

725 - match: '(?=,|\}|$)'

702 - match: '(?=,|\}|$)'

726 pop: true

703 pop: true

@@ -736,25 +713,22 @@ contexts:

736 2: keyword.control.as.tsx

713 2: keyword.control.as.tsx

737 3: storage.type.namespace.tsx

714 3: storage.type.namespace.tsx

738 4: entity.name.type.module.tsx

715 4: entity.name.type.module.tsx

739− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(export)(?:\s+(type))?(?:(?:\s*(=))|(?:\s+(default)(?=\s+)))'

716+ - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(export)(?:(?:\s*(=))|(?:\s+(default)(?=\s+)))'

740 captures:

717 captures:

741 1: keyword.control.export.tsx

718 1: keyword.control.export.tsx

742− 2: keyword.control.type.tsx

719+ 2: keyword.operator.assignment.tsx

743− 3: keyword.operator.assignment.tsx

720+ 3: keyword.control.default.tsx

744− 4: keyword.control.default.tsx

745 push:

721 push:

746 - meta_scope: meta.export.default.tsx

722 - meta_scope: meta.export.default.tsx

748 pop: true

724 pop: true

749− - include: interface-declaration

750 - include: expression

725 - include: expression

751− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(export)(?:\s+(type))?\b(?!(\$)|(\s*:))((?=\s*[\{*])|((?=\s*[_$[:alpha:]][_$[:alnum:]]*(\s|,))(?!\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b)))'

726+ - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(export)(?!\s*:)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

752 captures:

727 captures:

753− 1: keyword.control.export.tsx

728+ 0: keyword.control.export.tsx

754− 2: keyword.control.type.tsx

755 push:

729 push:

756 - meta_scope: meta.export.tsx

730 - meta_scope: meta.export.tsx

758 pop: true

732 pop: true

759 - include: import-export-declaration

733 - include: import-export-declaration

760 expression:

734 expression:

@@ -763,105 +737,7 @@ contexts:

763 - include: expressionPunctuations

737 - include: expressionPunctuations

764 expression-inside-possibly-arrow-parens:

738 expression-inside-possibly-arrow-parens:

765 - include: expressionWithoutIdentifiers

739 - include: expressionWithoutIdentifiers

766− - include: comment

740+ - include: function-parameters-body

767− - include: string

768− - include: decorator

769− - include: destructuring-parameter

771− captures:

772− 1: storage.modifier.tsx

773− - match: |-

775− # function assignment |

776− (=\s*(

777− ((async\s+)?(

778− (function\s*[(<*]) |

779− (function\s+) |

780− ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

781− )) |

782− ((async\s*)?(

783− ((<\s*$)|([$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

784− # sure shot arrow functions even if => is on new line

785− (

786− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

787− [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

788− (

789− ([)]\s*:) | # ():

790− ((\.\.\.\s*)?[_$[:alpha:]][_$[:alnum:]]*\s*:) # [(]param: | [(]...param:

791− )

792− ) |

793− (

794− [<]\s*[_$[:alpha:]][_$[:alnum:]]*\s+extends\s*[^=>] # < typeparam extends

795− ) |

796− # arrow function possible to detect only with => on same line

797− (

798− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

799− $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\) # parameters

800− (\s*:\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

801− \s*=> # arrow operator

802− )

803− ))

804− )) |

806− (:\s*(

807− (<) |

808− ([(]\s*(

809− ([)]) |

810− (\.\.\.) |

811− ([_$[:alnum:]]+\s*(

812− ([:,?=])|

813− ([)]\s*=>)

814− ))

815− ))

816− )) |

817− (:\s*(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))Function(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))) |

818− (:\s*((<\s*$)|([$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))) |

819− (:\s*(=>|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(

820− ((async\s+)?(

821− (function\s*[(<*]) |

822− (function\s+) |

823− ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

824− )) |

825− ((async\s*)?(

826− ((<\s*$)|([$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

827− # sure shot arrow functions even if => is on new line

828− (

829− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

830− [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

831− (

832− ([)]\s*:) | # ():

833− ((\.\.\.\s*)?[_$[:alpha:]][_$[:alnum:]]*\s*:) # [(]param: | [(]...param:

834− )

835− ) |

836− (

837− [<]\s*[_$[:alpha:]][_$[:alnum:]]*\s+extends\s*[^=>] # < typeparam extends

838− ) |

839− # arrow function possible to detect only with => on same line

840− (

841− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

842− $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\) # parameters

843− (\s*:\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

844− \s*=> # arrow operator

845− )

846− ))

847− )))

848− captures:

849− 1: storage.modifier.tsx

850− 2: keyword.operator.rest.tsx

851− 3: entity.name.function.tsx variable.language.this.tsx

852− 4: entity.name.function.tsx

853− 5: keyword.operator.optional.tsx

855− captures:

856− 1: storage.modifier.tsx

857− 2: keyword.operator.rest.tsx

858− 3: variable.parameter.tsx variable.language.this.tsx

859− 4: variable.parameter.tsx

860− 5: keyword.operator.optional.tsx

861− - include: type-annotation

862− - include: variable-initializer

863− - match: ","

864− scope: punctuation.separator.parameter.tsx

865 - include: identifiers

741 - include: identifiers

866 - include: expressionPunctuations

742 - include: expressionPunctuations

867 expression-operators:

743 expression-operators:

@@ -893,15 +769,11 @@ contexts:

893 - include: typeof-operator

769 - include: typeof-operator

894 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))void(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

770 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))void(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

895 scope: keyword.operator.expression.void.tsx

771 scope: keyword.operator.expression.void.tsx

896− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(as)\s+(const)(?=\s*($|[;,:})\]]))'

897− captures:

898− 1: keyword.control.as.tsx

899− 2: storage.modifier.tsx

900 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(as)\s+'

772 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(as)\s+'

901 captures:

773 captures:

902 1: keyword.control.as.tsx

774 1: keyword.control.as.tsx

903 push:

775 push:

904− - match: '(?=^|[;),}\]:?\-\+\>]|\|\||\&\&|\!\=\=|$|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(as)\s+)|(\s+\<))'

776+ - match: '(?=$|^|[;,:})\]]|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(as)\s+))'

905 pop: true

777 pop: true

906 - include: type

778 - include: type

907 - match: \.\.\.

779 - match: \.\.\.

@@ -916,12 +788,7 @@ contexts:

916 scope: keyword.operator.comparison.tsx

788 scope: keyword.operator.comparison.tsx

917 - match: <=|>=|<>|<|>

789 - match: <=|>=|<>|<|>

918 scope: keyword.operator.relational.tsx

790 scope: keyword.operator.relational.tsx

919− - match: '(?<=[_$[:alnum:]])(\!)\s*(?:(/=)|(?:(/)(?![/*])))'

791+ - match: \!|&&|\|\|

920− captures:

921− 1: keyword.operator.logical.tsx

922− 2: keyword.operator.assignment.compound.tsx

923− 3: keyword.operator.arithmetic.tsx

924− - match: \!|&&|\|\||\?\?

925 scope: keyword.operator.logical.tsx

792 scope: keyword.operator.logical.tsx

926 - match: \&|~|\^|\|

793 - match: \&|~|\^|\|

927 scope: keyword.operator.bitwise.tsx

794 scope: keyword.operator.bitwise.tsx

@@ -933,18 +800,9 @@ contexts:

933 scope: keyword.operator.increment.tsx

800 scope: keyword.operator.increment.tsx

934 - match: '%|\*|/|-|\+'

801 - match: '%|\*|/|-|\+'

935 scope: keyword.operator.arithmetic.tsx

802 scope: keyword.operator.arithmetic.tsx

936− - match: '(?<=[_$[:alnum:])\]])\s*(?=(\/\*([^\*]|(\*[^\/]))*\*\/\s*)+(?:(/=)|(?:(/)(?![/*]))))'

803+ - match: '(?<=[_$[:alnum:])\]])\s*(/)(?![/*])'

937− push:

938− - match: '(?:(/=)|(?:(/)(?!\*([^\*]|(\*[^\/]))*\*\/)))'

939− captures:

940− 1: keyword.operator.assignment.compound.tsx

941− 2: keyword.operator.arithmetic.tsx

942− pop: true

943− - include: comment

944− - match: '(?<=[_$[:alnum:])\]])\s*(?:(/=)|(?:(/)(?![/*])))'

945 captures:

804 captures:

946− 1: keyword.operator.assignment.compound.tsx

805+ 1: keyword.operator.arithmetic.tsx

947− 2: keyword.operator.arithmetic.tsx

948 expressionPunctuations:

806 expressionPunctuations:

949 - include: punctuation-comma

807 - include: punctuation-comma

950 - include: punctuation-accessor

808 - include: punctuation-accessor

@@ -952,6 +810,7 @@ contexts:

952 - include: jsx

810 - include: jsx

953 - include: string

811 - include: string

954 - include: regex

812 - include: regex

813+ - include: template

955 - include: comment

814 - include: comment

956 - include: function-expression

815 - include: function-expression

957 - include: class-expression

816 - include: class-expression

@@ -969,123 +828,143 @@ contexts:

969 - include: paren-expression

828 - include: paren-expression

970 field-declaration:

829 field-declaration:

971 - match: |-

830 - match: |-

972− (?x)(?<!\()(?:(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(readonly)\s+)?(?=\s*((\b(?<!\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:b|B)[01][01_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:o|O)?[0-7][0-7_]*(n)?\b(?!\$))|((?<!\$)(?:

831+ (?x)(?<!\()(?:(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(readonly)\s+)?(?=\s*((\b(?<!\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\b(?!\$))|(\b(?<!\$)0(b|B)[01][01_]*\b(?!\$))|(\b(?<!\$)0(o|O)?[0-7][0-7_]*\b(?!\$))|((?<!\$)(?:

973− (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.1E+3

832+ (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1.1E+3

974− (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.E+3

833+ (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*\b)| # 1.E+3

975− (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # .1E+3

834+ (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # .1E+3

976− (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1E+3

835+ (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1E+3

977− (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*(n)?\b)| # 1.1

836+ (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*\b)| # 1.1

978− (?:\b[0-9][0-9_]*(\.)(n)?\B)| # 1.

837+ (?:\b[0-9][0-9_]*(\.)\B)| # 1.

979− (?:\B(\.)[0-9][0-9_]*(n)?\b)| # .1

838+ (?:\B(\.)[0-9][0-9_]*\b)| # .1

980− (?:\b[0-9][0-9_]*(n)?\b(?!\.)) # 1

839+ (?:\b[0-9][0-9_]*\b(?!\.)) # 1

981− )(?!\$))|(\#?[_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(?:(?:(\?)|(\!))\s*)?(=|:|;|,|\}|$))

840+ )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\?\s*)?(=|:))

982 captures:

841 captures:

983 1: storage.modifier.tsx

842 1: storage.modifier.tsx

984 push:

843 push:

985 - meta_scope: meta.field.declaration.tsx

844 - meta_scope: meta.field.declaration.tsx

986 - match: |-

845 - match: |-

987− (?x)(?=\}|;|,|$|(^(?!\s*((\b(?<!\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:b|B)[01][01_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:o|O)?[0-7][0-7_]*(n)?\b(?!\$))|((?<!\$)(?:

846+ (?x)(?=\}|;|,|$|(^(?!\s*((\b(?<!\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\b(?!\$))|(\b(?<!\$)0(b|B)[01][01_]*\b(?!\$))|(\b(?<!\$)0(o|O)?[0-7][0-7_]*\b(?!\$))|((?<!\$)(?:

988− (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.1E+3

847+ (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1.1E+3

989− (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.E+3

848+ (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*\b)| # 1.E+3

990− (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # .1E+3

849+ (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # .1E+3

991− (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1E+3

850+ (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1E+3

992− (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*(n)?\b)| # 1.1

851+ (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*\b)| # 1.1

993− (?:\b[0-9][0-9_]*(\.)(n)?\B)| # 1.

852+ (?:\b[0-9][0-9_]*(\.)\B)| # 1.

994− (?:\B(\.)[0-9][0-9_]*(n)?\b)| # .1

853+ (?:\B(\.)[0-9][0-9_]*\b)| # .1

995− (?:\b[0-9][0-9_]*(n)?\b(?!\.)) # 1

854+ (?:\b[0-9][0-9_]*\b(?!\.)) # 1

996− )(?!\$))|(\#?[_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(?:(?:(\?)|(\!))\s*)?(=|:|;|,|$))))|(?<=\})

855+ )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\?\s*)?(=|:))))|(?<=\})

997 pop: true

856 pop: true

998 - include: variable-initializer

857 - include: variable-initializer

999− - include: type-annotation

1000− - include: string

1001− - include: array-literal

1002− - include: numeric-literal

1003− - include: comment

1004 - match: |-

858 - match: |-

1005− (?x)(\#?[_$[:alpha:]][_$[:alnum:]]*)(?:(\?)|(\!))?(?=\s*\s*

859+ (?x)(?=((\b(?<!\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\b(?!\$))|(\b(?<!\$)0(b|B)[01][01_]*\b(?!\$))|(\b(?<!\$)0(o|O)?[0-7][0-7_]*\b(?!\$))|((?<!\$)(?:

1006− # function assignment |

860+ (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1.1E+3

1007− (=\s*(

861+ (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*\b)| # 1.E+3

1008− ((async\s+)?(

862+ (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # .1E+3

1009− (function\s*[(<*]) |

863+ (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1E+3

1010− (function\s+) |

864+ (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*\b)| # 1.1

1011− ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

865+ (?:\b[0-9][0-9_]*(\.)\B)| # 1.

1012− )) |

866+ (?:\B(\.)[0-9][0-9_]*\b)| # .1

1013− ((async\s*)?(

867+ (?:\b[0-9][0-9_]*\b(?!\.)) # 1

1014− ((<\s*$)|([$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

868+ )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\?\s*)?(=|:))

1015− # sure shot arrow functions even if => is on new line

869+ push:

1016− (

870+ - match: |-

1017− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

871+ (?x)(?=[};,=]|$|(^(?!\s*((\b(?<!\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\b(?!\$))|(\b(?<!\$)0(b|B)[01][01_]*\b(?!\$))|(\b(?<!\$)0(o|O)?[0-7][0-7_]*\b(?!\$))|((?<!\$)(?:

1018− [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

872+ (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1.1E+3

1019− (

873+ (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*\b)| # 1.E+3

1020− ([)]\s*:) | # ():

874+ (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # .1E+3

1021− ((\.\.\.\s*)?[_$[:alpha:]][_$[:alnum:]]*\s*:) # [(]param: | [(]...param:

875+ (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1E+3

1022− )

876+ (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*\b)| # 1.1

1023− ) |

877+ (?:\b[0-9][0-9_]*(\.)\B)| # 1.

1024− (

878+ (?:\B(\.)[0-9][0-9_]*\b)| # .1

1025− [<]\s*[_$[:alpha:]][_$[:alnum:]]*\s+extends\s*[^=>] # < typeparam extends

879+ (?:\b[0-9][0-9_]*\b(?!\.)) # 1

1026− ) |

880+ )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\?\s*)?(=|:))))|(?<=\})

1027− # arrow function possible to detect only with => on same line

881+ pop: true

1028− (

882+ - include: type-annotation

1029− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

883+ - include: string

1030− $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\) # parameters

884+ - include: array-literal

1031− (\s*:\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

885+ - include: numeric-literal

1032− \s*=> # arrow operator

886+ - include: comment

1033− )

887+ - match: |-

1034− ))

888+ (?x)([_$[:alpha:]][_$[:alnum:]]*)(\?)?(?=(\?\s*)?\s*

1035− )) |

889+ # function assignment |

890+ (=\s*(

1037− (:\s*(

891+ ((async\s+)?(

1038− (<) |

892+ (function\s*[(<*]) |

1039− ([(]\s*(

893+ (function\s+) |

1040− ([)]) |

894+ ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

1041− (\.\.\.) |

895+ )) |

1042− ([_$[:alnum:]]+\s*(

896+ ((async\s*)?(

1043− ([:,?=])|

897+ ((<\s*$)|([\(]\s*([\{\[]\s*)?$)) |

1044− ([)]\s*=>)

898+ # sure shot arrow functions even if => is on new line

1045− ))

899+ (

1046− ))

900+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*>\s*)?

1047− )) |

901+ [(]\s*

1048− (:\s*(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))Function(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))) |

902+ (

1049− (:\s*((<\s*$)|([$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))) |

903+ ([)]\s*:) | # ():

1050− (:\s*(=>|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(

904+ ((\.\.\.\s*)?[_$[:alpha:]][_$[:alnum:]]*\s*:) # [(]param: | [(]...param:

1051− ((async\s+)?(

905+ )

1052− (function\s*[(<*]) |

906+ ) |

1053− (function\s+) |

907+ (

1054− ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

908+ [<]\s*[_$[:alpha:]][_$[:alnum:]]*\s+extends\s*[^=>] # < typeparam extends

1055− )) |

909+ ) |

1056− ((async\s*)?(

910+ # arrow function possible to detect only with => on same line

1057− ((<\s*$)|([$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

911+ (

1058− # sure shot arrow functions even if => is on new line

912+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*>\s*)? # typeparameters

1059− (

913+ $\s*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()]|(\(([^\($]|($[^\($]*\)))*\)))*)?\) # parameters

1060− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

914+ (\s*:\s*([^<>]|\<[^<>]+\>|$[^\($]+\))+)? # return type

1061− [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

915+ \s*=> # arrow operator

1062− (

916+ )

1063− ([)]\s*:) | # ():

917+ ))

1064− ((\.\.\.\s*)?[_$[:alpha:]][_$[:alnum:]]*\s*:) # [(]param: | [(]...param:

918+ )) |

1065− )

1066− ) |

920+ (:\s*(

1067− (

921+ (<) |

1068− [<]\s*[_$[:alpha:]][_$[:alnum:]]*\s+extends\s*[^=>] # < typeparam extends

922+ ([(]\s*(

1069− ) |

923+ ([)]) |

1070− # arrow function possible to detect only with => on same line

924+ (\.\.\.) |

1071− (

925+ ([_$[:alnum:]]+\s*(

1072− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

926+ ([:,?=])|

1073− $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\) # parameters

927+ ([)]\s*=>)

1074− (\s*:\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

928+ ))

1075− \s*=> # arrow operator

929+ ))

1076− )

930+ )) |

1077− ))

931+ (:\s*((<\s*$)|([\(]\s*([\{\[]\s*)?$))) |

1078− )))

932+ (:\s*(=>|($([^\($]|($[^\($]*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(

1079− captures:

933+ ((async\s+)?(

1080− 1: meta.definition.property.tsx entity.name.function.tsx

934+ (function\s*[(<*]) |

1081− 2: keyword.operator.optional.tsx

935+ (function\s+) |

1082− 3: keyword.operator.definiteassignment.tsx

936+ ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

1083− - match: '\#?[_$[:alpha:]][_$[:alnum:]]*'

937+ )) |

1084− scope: meta.definition.property.tsx variable.object.property.tsx

938+ ((async\s*)?(

1085− - match: \?

939+ ((<\s*$)|([\(]\s*([\{\[]\s*)?$)) |

1086− scope: keyword.operator.optional.tsx

940+ # sure shot arrow functions even if => is on new line

1087− - match: \!

941+ (

1088− scope: keyword.operator.definiteassignment.tsx

942+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*>\s*)?

943+ [(]\s*

944+ (

945+ ([)]\s*:) | # ():

946+ ((\.\.\.\s*)?[_$[:alpha:]][_$[:alnum:]]*\s*:) # [(]param: | [(]...param:

947+ )

948+ ) |

949+ (

950+ [<]\s*[_$[:alpha:]][_$[:alnum:]]*\s+extends\s*[^=>] # < typeparam extends

951+ ) |

952+ # arrow function possible to detect only with => on same line

953+ (

954+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*>\s*)? # typeparameters

955+ $\s*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()]|(\(([^\($]|($[^\($]*\)))*\)))*)?\) # parameters

956+ (\s*:\s*([^<>]|\<[^<>]+\>|$[^\($]+\))+)? # return type

957+ \s*=> # arrow operator

958+ )

959+ ))

960+ )))

961+ captures:

962+ 1: meta.definition.property.tsx entity.name.function.tsx

963+ 2: keyword.operator.optional.tsx

964+ - match: "[_$[:alpha:]][_$[:alnum:]]*"

965+ scope: meta.definition.property.tsx variable.object.property.tsx

966+ - match: \?

967+ scope: keyword.operator.optional.tsx

1089 for-loop:

968 for-loop:

1090 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))for(?=((\s+|(\s*\/\*([^\*]|(\*[^\/]))*\*\/\s*))await)?\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)?(\())'

969 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))for(?=((\s+|(\s*\/\*([^\*]|(\*[^\/]))*\*\/\s*))await)?\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)?(\())'

1091 captures:

970 captures:

@@ -1112,59 +991,43 @@ contexts:

1112 - include: type-parameters

991 - include: type-parameters

1113 - include: function-parameters

992 - include: function-parameters

1114 - include: return-type

993 - include: return-type

1115− - include: type-function-return-type

1116 - include: decl-block

994 - include: decl-block

1117 - match: \*

995 - match: \*

1118 scope: keyword.generator.asterisk.tsx

996 scope: keyword.generator.asterisk.tsx

1119 function-call:

997 function-call:

1120− - match: '(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\)]))\s*(?:(\?\.\s*)|(\!))?((<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)?\())'

998+ - match: '(?=(([_$[:alpha:]][_$[:alnum:]]*\s*\??\.\s*)*|(\??\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\s*(\?\.\s*)?(<\s*(((keyof|infer)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''[^\'']*\'')|(\"[^\"]*\")|(\`[^\`]*\`))(?=\s*([\<\>\,\.\[=]|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($[^\($]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''[^\'']*\'')|(\"[^\"]*\")|(\`[^\`]*\`))(?=\s*([\<\>\,\.\[=]|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($[^\($]*\)))*\))|(?<==)\>)*(?!=)\>)*(?!=)>\s*)?\()'

1121 push:

999 push:

1122− - match: '(?<=\))(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\)]))\s*(?:(\?\.\s*)|(\!))?((<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)?\())'

1000+ - match: '(?<=\))(?!(([_$[:alpha:]][_$[:alnum:]]*\s*\??\.\s*)*|(\??\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\s*(\?\.\s*)?(<\s*(((keyof|infer)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''[^\'']*\'')|(\"[^\"]*\")|(\`[^\`]*\`))(?=\s*([\<\>\,\.\[=]|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($[^\($]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''[^\'']*\'')|(\"[^\"]*\")|(\`[^\`]*\`))(?=\s*([\<\>\,\.\[=]|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($[^\($]*\)))*\))|(?<==)\>)*(?!=)\>)*(?!=)>\s*)?\()'

1123 pop: true

1001 pop: true

1124− - match: '(?=(([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))'

1002+ - match: '(?=(([_$[:alpha:]][_$[:alnum:]]*\s*\??\.\s*)*|(\??\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*))'

1125 push:

1003 push:

1126 - meta_scope: meta.function-call.tsx

1004 - meta_scope: meta.function-call.tsx

1127− - match: '(?=\s*(?:(\?\.\s*)|(\!))?((<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)?\())'

1005+ - match: '(?=\s*(\?\.\s*)?(<\s*(((keyof|infer)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''[^\'']*\'')|(\"[^\"]*\")|(\`[^\`]*\`))(?=\s*([\<\>\,\.\[=]|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($[^\($]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''[^\'']*\'')|(\"[^\"]*\")|(\`[^\`]*\`))(?=\s*([\<\>\,\.\[=]|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($[^\($]*\)))*\))|(?<==)\>)*(?!=)\>)*(?!=)>\s*)?\()'

1128 pop: true

1006 pop: true

1129− - include: function-call-target

1007+ - include: literal

1008+ - include: support-objects

1009+ - include: object-identifiers

1010+ - include: punctuation-accessor

1011+ - match: '(?:(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))import(?=\s*[\(]\s*[\"\''\`]))'

1012+ scope: keyword.operator.expression.import.tsx

1013+ - match: "([_$[:alpha:]][_$[:alnum:]]*)"

1014+ scope: entity.name.function.tsx

1130 - include: comment

1015 - include: comment

1131− - include: function-call-optionals

1016+ - match: \?\.

1017+ scope: meta.function-call.tsx punctuation.accessor.optional.tsx

1132 - include: type-arguments

1018 - include: type-arguments

1133 - include: paren-expression

1019 - include: paren-expression

1134− - match: '(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\)]))(<\s*[\{\[\(]\s*$))'

1135− push:

1136− - match: '(?<=\>)(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))|(?<=[\)]))(<\s*[\{\[\(]\s*$))'

1137− pop: true

1138− - match: '(?=(([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))'

1139− push:

1140− - meta_scope: meta.function-call.tsx

1141− - match: '(?=(<\s*[\{\[\(]\s*$))'

1142− pop: true

1143− - include: function-call-target

1144− - include: comment

1145− - include: function-call-optionals

1146− - include: type-arguments

1147− function-call-optionals:

1148− - match: \?\.

1149− scope: meta.function-call.tsx punctuation.accessor.optional.tsx

1150− - match: \!

1151− scope: meta.function-call.tsx keyword.operator.definiteassignment.tsx

1152− function-call-target:

1153− - include: support-function-call-identifiers

1154− - match: '(\#?[_$[:alpha:]][_$[:alnum:]]*)'

1155− scope: entity.name.function.tsx

1156 function-declaration:

1020 function-declaration:

1157− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?(?:(async)\s+)?(function\b)(?:\s*(\*))?(?:(?:\s+|(?<=\*))([_$[:alpha:]][_$[:alnum:]]*))?\s*'

1021+ - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(export)\s+)?(?:(async)\s+)?(function\b)(?:\s*(\*))?(?:(?:\s+|(?<=\*))([_$[:alpha:]][_$[:alnum:]]*))?\s*'

1158 captures:

1022 captures:

1159 1: keyword.control.export.tsx

1023 1: keyword.control.export.tsx

1160− 2: storage.modifier.tsx

1024+ 2: storage.modifier.async.tsx

1161− 3: storage.modifier.async.tsx

1025+ 3: storage.type.function.tsx

1162− 4: storage.type.function.tsx

1026+ 4: keyword.generator.asterisk.tsx

1163− 5: keyword.generator.asterisk.tsx

1027+ 5: meta.definition.function.tsx entity.name.function.tsx

1164− 6: meta.definition.function.tsx entity.name.function.tsx

1165 push:

1028 push:

1166 - meta_scope: meta.function.tsx

1029 - meta_scope: meta.function.tsx

1167− - match: '(?=;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))|(?<=\})'

1030+ - match: '(?=$|^|;)|(?<=\})'

1168 pop: true

1031 pop: true

1169 - include: function-name

1032 - include: function-name

1170 - include: function-body

1033 - include: function-body

@@ -1177,10 +1040,9 @@ contexts:

1177 4: meta.definition.function.tsx entity.name.function.tsx

1040 4: meta.definition.function.tsx entity.name.function.tsx

1178 push:

1041 push:

1179 - meta_scope: meta.function.expression.tsx

1042 - meta_scope: meta.function.expression.tsx

1180− - match: '(?=;)|(?<=\})'

1043+ - match: '(?<=\})'

1181 pop: true

1044 pop: true

1182 - include: function-name

1045 - include: function-name

1183− - include: single-line-comment-consuming-line-ending

1184 - include: function-body

1046 - include: function-body

1185 function-name:

1047 function-name:

1186 - match: "[_$[:alpha:]][_$[:alnum:]]*"

1048 - match: "[_$[:alpha:]][_$[:alnum:]]*"

@@ -1198,11 +1060,10 @@ contexts:

1198 - include: function-parameters-body

1060 - include: function-parameters-body

1199 function-parameters-body:

1061 function-parameters-body:

1200 - include: comment

1062 - include: comment

1201− - include: string

1202 - include: decorator

1063 - include: decorator

1203 - include: destructuring-parameter

1064 - include: destructuring-parameter

1204 - include: parameter-name

1065 - include: parameter-name

1205− - include: parameter-type-annotation

1066+ - include: type-annotation

1206 - include: variable-initializer

1067 - include: variable-initializer

1207 - match: ","

1068 - match: ","

1208 scope: punctuation.separator.parameter.tsx

1069 scope: punctuation.separator.parameter.tsx

@@ -1216,11 +1077,11 @@ contexts:

1216 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

1077 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

1217 )) |

1078 )) |

1218 ((async\s*)?(

1079 ((async\s*)?(

1219− ((<\s*$)|([$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

1080+ ((<\s*$)|([\(]\s*([\{\[]\s*)?$)) |

1220 # sure shot arrow functions even if => is on new line

1081 # sure shot arrow functions even if => is on new line

1221 (

1082 (

1222− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

1083+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*>\s*)?

1223− [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

1084+ [(]\s*

1224 (

1085 (

1225 ([)]\s*:) | # ():

1086 ([)]\s*:) | # ():

1226 ((\.\.\.\s*)?[_$[:alpha:]][_$[:alnum:]]*\s*:) # [(]param: | [(]...param:

1087 ((\.\.\.\s*)?[_$[:alpha:]][_$[:alnum:]]*\s*:) # [(]param: | [(]...param:

@@ -1231,9 +1092,9 @@ contexts:

1231 ) |

1092 ) |

1232 # arrow function possible to detect only with => on same line

1093 # arrow function possible to detect only with => on same line

1233 (

1094 (

1234− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

1095+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*>\s*)? # typeparameters

1235− $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\) # parameters

1096+ $\s*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()]|(\(([^\($]|($[^\($]*\)))*\)))*)?\) # parameters

1236− (\s*:\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

1097+ (\s*:\s*([^<>]|\<[^<>]+\>|$[^\($]+\))+)? # return type

1237 \s*=> # arrow operator

1098 \s*=> # arrow operator

1238 )

1099 )

1239 ))

1100 ))

@@ -1242,12 +1103,12 @@ contexts:

1242 1: punctuation.accessor.tsx

1103 1: punctuation.accessor.tsx

1243 2: punctuation.accessor.optional.tsx

1104 2: punctuation.accessor.optional.tsx

1244 3: entity.name.function.tsx

1105 3: entity.name.function.tsx

1245− - match: '(?:(\.)|(\?\.(?!\s*[[:digit:]])))\s*(\#?[[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])'

1106+ - match: '(?:(\.)|(\?\.(?!\s*[[:digit:]])))\s*([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])'

1246 captures:

1107 captures:

1247 1: punctuation.accessor.tsx

1108 1: punctuation.accessor.tsx

1248 2: punctuation.accessor.optional.tsx

1109 2: punctuation.accessor.optional.tsx

1249 3: variable.other.constant.property.tsx

1110 3: variable.other.constant.property.tsx

1250− - match: '(?:(\.)|(\?\.(?!\s*[[:digit:]])))\s*(\#?[_$[:alpha:]][_$[:alnum:]]*)'

1111+ - match: '(?:(\.)|(\?\.(?!\s*[[:digit:]])))\s*([_$[:alpha:]][_$[:alnum:]]*)'

1251 captures:

1112 captures:

1252 1: punctuation.accessor.tsx

1113 1: punctuation.accessor.tsx

1253 2: punctuation.accessor.optional.tsx

1114 2: punctuation.accessor.optional.tsx

@@ -1256,46 +1117,15 @@ contexts:

1256 scope: variable.other.constant.tsx

1117 scope: variable.other.constant.tsx

1257 - match: "[_$[:alpha:]][_$[:alnum:]]*"

1118 - match: "[_$[:alpha:]][_$[:alnum:]]*"

1258 scope: variable.other.readwrite.tsx

1119 scope: variable.other.readwrite.tsx

1259− if-statement:

1260− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?=\bif\s*($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))\s*(?!\{))'

1261− push:

1262− - match: '(?=;|$|\})'

1263− pop: true

1264− - include: comment

1265− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(if)\s*(\()'

1266− captures:

1267− 1: keyword.control.conditional.tsx

1268− 2: meta.brace.round.tsx

1269− push:

1270− - match: \)

1271− captures:

1272− 0: meta.brace.round.tsx

1273− pop: true

1274− - include: expression

1275− - match: '(?<=\))\s*\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/([dgimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))'

1276− captures:

1277− 0: punctuation.definition.string.begin.tsx

1278− push:

1279− - meta_scope: string.regexp.tsx

1280− - match: "(/)([dgimsuy]*)"

1281− captures:

1282− 1: punctuation.definition.string.end.tsx

1283− 2: keyword.other.tsx

1284− pop: true

1285− - include: regexp

1286− - include: statements

1287 import-declaration:

1120 import-declaration:

1288− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(import)(?:\s+(type)(?!\s+from))?(?!\s*[:\(])(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

1121+ - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?\b(import)(?!\s*[:\(])(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

1289 captures:

1122 captures:

1290 1: keyword.control.export.tsx

1123 1: keyword.control.export.tsx

1291− 2: storage.modifier.tsx

1124+ 2: keyword.control.import.tsx

1292− 3: keyword.control.import.tsx

1293− 4: keyword.control.type.tsx

1294 push:

1125 push:

1295 - meta_scope: meta.import.tsx

1126 - meta_scope: meta.import.tsx

1296 - match: '(?<!^import|[^\._$[:alnum:]]import)(?=;|$|^)'

1127 - match: '(?<!^import|[^\._$[:alnum:]]import)(?=;|$|^)'

1297 pop: true

1128 pop: true

1298− - include: single-line-comment-consuming-line-ending

1299 - include: comment

1129 - include: comment

1300 - include: string

1130 - include: string

1301 - match: '(?<=^import|[^\._$[:alnum:]]import)(?!\s*["''])'

1131 - match: '(?<=^import|[^\._$[:alnum:]]import)(?!\s*["''])'

@@ -1307,16 +1137,14 @@ contexts:

1307 - include: import-export-declaration

1137 - include: import-export-declaration

1308 - include: import-export-declaration

1138 - include: import-export-declaration

1309 import-equals-declaration:

1139 import-equals-declaration:

1310− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(import)(?:\s+(type))?\s+([_$[:alpha:]][_$[:alnum:]]*)\s*(=)\s*(require)\s*(\()'

1140+ - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?\b(import)\s+([_$[:alpha:]][_$[:alnum:]]*)\s*(=)\s*(require)\s*(\()'

1311 captures:

1141 captures:

1312 1: keyword.control.export.tsx

1142 1: keyword.control.export.tsx

1313− 2: storage.modifier.tsx

1143+ 2: keyword.control.import.tsx

1314− 3: keyword.control.import.tsx

1144+ 3: variable.other.readwrite.alias.tsx

1315− 4: keyword.control.type.tsx

1145+ 4: keyword.operator.assignment.tsx

1316− 5: variable.other.readwrite.alias.tsx

1146+ 5: keyword.control.require.tsx

1317− 6: keyword.operator.assignment.tsx

1147+ 6: meta.brace.round.tsx

1318− 7: keyword.control.require.tsx

1319− 8: meta.brace.round.tsx

1320 push:

1148 push:

1321 - meta_scope: meta.import-equals.external.tsx

1149 - meta_scope: meta.import-equals.external.tsx

1322 - match: \)

1150 - match: \)

@@ -1325,19 +1153,16 @@ contexts:

1325 pop: true

1153 pop: true

1326 - include: comment

1154 - include: comment

1327 - include: string

1155 - include: string

1328− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(import)(?:\s+(type))?\s+([_$[:alpha:]][_$[:alnum:]]*)\s*(=)\s*(?!require\b)'

1156+ - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?\b(import)\s+([_$[:alpha:]][_$[:alnum:]]*)\s*(=)\s*(?!require\b)'

1329 captures:

1157 captures:

1330 1: keyword.control.export.tsx

1158 1: keyword.control.export.tsx

1331− 2: storage.modifier.tsx

1159+ 2: keyword.control.import.tsx

1332− 3: keyword.control.import.tsx

1160+ 3: variable.other.readwrite.alias.tsx

1333− 4: keyword.control.type.tsx

1161+ 4: keyword.operator.assignment.tsx

1334− 5: variable.other.readwrite.alias.tsx

1335− 6: keyword.operator.assignment.tsx

1336 push:

1162 push:

1337 - meta_scope: meta.import-equals.internal.tsx

1163 - meta_scope: meta.import-equals.internal.tsx

1338 - match: (?=;|$|^)

1164 - match: (?=;|$|^)

1339 pop: true

1165 pop: true

1340− - include: single-line-comment-consuming-line-ending

1341 - include: comment

1166 - include: comment

1342 - match: '([_$[:alpha:]][_$[:alnum:]]*)\s*(?:(\.)|(\?\.(?!\s*[[:digit:]])))'

1167 - match: '([_$[:alpha:]][_$[:alnum:]]*)\s*(?:(\.)|(\?\.(?!\s*[[:digit:]])))'

1343 captures:

1168 captures:

@@ -1359,7 +1184,7 @@ contexts:

1359 - include: import-export-clause

1184 - include: import-export-clause

1360 import-export-clause:

1185 import-export-clause:

1361 - include: comment

1186 - include: comment

1363 captures:

1188 captures:

1364 1: keyword.control.default.tsx

1189 1: keyword.control.default.tsx

1365 2: constant.language.import-export-all.tsx

1190 2: constant.language.import-export-all.tsx

@@ -1411,9 +1236,6 @@ contexts:

1411 2: keyword.operator.type.modifier.tsx

1236 2: keyword.operator.type.modifier.tsx

1412 3: keyword.operator.optional.tsx

1237 3: keyword.operator.optional.tsx

1413 pop: true

1238 pop: true

1414− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(as)\s+'

1415− captures:

1416− 1: keyword.control.as.tsx

1417 - include: type

1239 - include: type

1418 inline-tags:

1240 inline-tags:

1419 - match: '(\[)[^\]]+(\])(?={@(?:link|linkcode|linkplain|tutorial))'

1241 - match: '(\[)[^\]]+(\])(?={@(?:link|linkcode|linkplain|tutorial))'

@@ -1445,16 +1267,15 @@ contexts:

1445 captures:

1267 captures:

1446 1: keyword.operator.expression.instanceof.tsx

1268 1: keyword.operator.expression.instanceof.tsx

1447 push:

1269 push:

1448− - match: '(?<=\))|(?=[;),}\]:?\-\+\>]|\|\||\&\&|\!\=\=|$|(([\&\~\^\|]\s*)?[_$[:alpha:]][_$[:alnum:]]*\s+instanceof(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))function((\s+[_$[:alpha:]][_$[:alnum:]]*)|(\s*[\(]))))'

1270+ - match: '(?<=\))|(?=[;),}\]:?]|\|\||\&\&|$|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))function((\s+[_$[:alpha:]][_$[:alnum:]]*)|(\s*[\(]))))'

1449 pop: true

1271 pop: true

1450 - include: type

1272 - include: type

1451 interface-declaration:

1273 interface-declaration:

1452− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(?:(abstract)\s+)?\b(interface)\b(?=\s+|/[/*])'

1274+ - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(export)\s+)?\b(?:(abstract)\s+)?\b(interface)\b(?=\s+|/[/*])'

1453 captures:

1275 captures:

1454 1: keyword.control.export.tsx

1276 1: keyword.control.export.tsx

1455 2: storage.modifier.tsx

1277 2: storage.modifier.tsx

1456− 3: storage.modifier.tsx

1278+ 3: storage.type.interface.tsx

1457− 4: storage.type.interface.tsx

1458 push:

1279 push:

1459 - meta_scope: meta.interface.tsx

1280 - meta_scope: meta.interface.tsx

1460 - match: '(?<=\})'

1281 - match: '(?<=\})'

@@ -1502,7 +1323,7 @@ contexts:

1502 captures:

1323 captures:

1503 0: punctuation.section.embedded.begin.tsx

1324 0: punctuation.section.embedded.begin.tsx

1504 push:

1325 push:

1505− - meta_content_scope: meta.embedded.expression.tsx

1326+ - meta_scope: meta.embedded.expression.tsx

1506 - match: '\}'

1327 - match: '\}'

1507 captures:

1328 captures:

1508 0: punctuation.section.embedded.end.tsx

1329 0: punctuation.section.embedded.end.tsx

@@ -1531,10 +1352,10 @@ contexts:

1531 pop: true

1352 pop: true

1532 - include: jsx-entities

1353 - include: jsx-entities

1533 jsx-tag:

1354 jsx-tag:

1534− - match: '(?=(<)\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\.|-))(?=((<\s*)|(\s+))(?!\?)|\/?>))'

1355+ - match: '(?=(<)\s*(?:([_$[:alpha:]][-$[:alnum:].]*)(?<!\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-$[:alnum:].]*))(?<!\.|-))(?=((<\s*)|(\s+))(?!\?)|\/?>))'

1535 push:

1356 push:

1536 - meta_scope: meta.tag.tsx

1357 - meta_scope: meta.tag.tsx

1537− - match: '(/>)|(?:(</)\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\.|-))?\s*(>))'

1358+ - match: '(/>)|(?:(</)\s*(?:([_$[:alpha:]][-$[:alnum:].]*)(?<!\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-$[:alnum:].]*))(?<!\.|-))?\s*(>))'

1538 captures:

1359 captures:

1539 1: punctuation.definition.tag.end.tsx

1360 1: punctuation.definition.tag.end.tsx

1540 2: punctuation.definition.tag.begin.tsx

1361 2: punctuation.definition.tag.begin.tsx

@@ -1544,7 +1365,7 @@ contexts:

1544 6: support.class.component.tsx

1365 6: support.class.component.tsx

1545 7: punctuation.definition.tag.end.tsx

1366 7: punctuation.definition.tag.end.tsx

1546 pop: true

1367 pop: true

1547− - match: '(<)\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\.|-))(?=((<\s*)|(\s+))(?!\?)|\/?>)'

1368+ - match: '(<)\s*(?:([_$[:alpha:]][-$[:alnum:].]*)(?<!\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-$[:alnum:].]*))(?<!\.|-))(?=((<\s*)|(\s+))(?!\?)|\/?>)'

1548 captures:

1369 captures:

1549 1: punctuation.definition.tag.begin.tsx

1370 1: punctuation.definition.tag.begin.tsx

1550 2: entity.name.tag.namespace.tsx

1371 2: entity.name.tag.namespace.tsx

@@ -1572,8 +1393,8 @@ contexts:

1572 - match: |-

1393 - match: |-

1573 (?x)

1394 (?x)

1574 \s*

1395 \s*

1575− (?:([_$[:alpha:]][-_$[:alnum:].]*)(:))?

1396+ (?:([_$[:alpha:]][-$[:alnum:].]*)(:))?

1576− ([_$[:alpha:]][-_$[:alnum:]]*)

1397+ ([_$[:alpha:]][-$[:alnum:]]*)

1577 (?=\s|=|/?>|/\*|//)

1398 (?=\s|=|/?>|/\*|//)

1578 captures:

1399 captures:

1579 1: entity.other.attribute-name.namespace.tsx

1400 1: entity.other.attribute-name.namespace.tsx

@@ -1598,15 +1419,15 @@ contexts:

1598 jsx-tag-in-expression:

1419 jsx-tag-in-expression:

1599 - match: |-

1420 - match: |-

1600 (?x)

1421 (?x)

1601− (?<!\+\+|--)(?<=[({\[,?=>:*]|&&|\|\||\?|\*\/|^await|[^\._$[:alnum:]]await|^return|[^\._$[:alnum:]]return|^default|[^\._$[:alnum:]]default|^yield|[^\._$[:alnum:]]yield|^)\s*

1422+ (?<!\+\+|--)(?<=[({\[,?=>:*]|&&|\|\||\?|^await|[^\._$[:alnum:]]await|^return|[^\._$[:alnum:]]return|^default|[^\._$[:alnum:]]default|^yield|[^\._$[:alnum:]]yield|^)\s*

1602 (?!<\s*[_$[:alpha:]][_$[:alnum:]]*((\s+extends\s+[^=>])|,)) # look ahead is not type parameter of arrow

1423 (?!<\s*[_$[:alpha:]][_$[:alnum:]]*((\s+extends\s+[^=>])|,)) # look ahead is not type parameter of arrow

1603− (?=(<)\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\.|-))(?=((<\s*)|(\s+))(?!\?)|\/?>))

1424+ (?=(<)\s*(?:([_$[:alpha:]][-$[:alnum:].]*)(?<!\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-$[:alnum:].]*))(?<!\.|-))(?=((<\s*)|(\s+))(?!\?)|\/?>))

1604 push:

1425 push:

1605− - match: '(?!(<)\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\.|-))(?=((<\s*)|(\s+))(?!\?)|\/?>))'

1426+ - match: '(?!(<)\s*(?:([_$[:alpha:]][-$[:alnum:].]*)(?<!\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-$[:alnum:].]*))(?<!\.|-))(?=((<\s*)|(\s+))(?!\?)|\/?>))'

1606 pop: true

1427 pop: true

1607 - include: jsx-tag

1428 - include: jsx-tag

1608 jsx-tag-without-attributes:

1429 jsx-tag-without-attributes:

1609− - match: '(<)\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\.|-))?\s*(>)'

1430+ - match: '(<)\s*(?:([_$[:alpha:]][-$[:alnum:].]*)(?<!\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-$[:alnum:].]*))(?<!\.|-))?\s*(>)'

1610 captures:

1431 captures:

1611 1: punctuation.definition.tag.begin.tsx

1432 1: punctuation.definition.tag.begin.tsx

1612 2: entity.name.tag.namespace.tsx

1433 2: entity.name.tag.namespace.tsx

@@ -1617,7 +1438,7 @@ contexts:

1617 push:

1438 push:

1618 - meta_scope: meta.tag.without-attributes.tsx

1439 - meta_scope: meta.tag.without-attributes.tsx

1619 - meta_content_scope: meta.jsx.children.tsx

1440 - meta_content_scope: meta.jsx.children.tsx

1620− - match: '(</)\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\.|-))?\s*(>)'

1441+ - match: '(</)\s*(?:([_$[:alpha:]][-$[:alnum:].]*)(?<!\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-$[:alnum:].]*))(?<!\.|-))?\s*(>)'

1621 captures:

1442 captures:

1622 1: punctuation.definition.tag.begin.tsx

1443 1: punctuation.definition.tag.begin.tsx

1623 2: entity.name.tag.namespace.tsx

1444 2: entity.name.tag.namespace.tsx

@@ -1628,9 +1449,9 @@ contexts:

1628 pop: true

1449 pop: true

1629 - include: jsx-children

1450 - include: jsx-children

1630 jsx-tag-without-attributes-in-expression:

1451 jsx-tag-without-attributes-in-expression:

1631− - match: '(?<!\+\+|--)(?<=[({\[,?=>:*]|&&|\|\||\?|\*\/|^await|[^\._$[:alnum:]]await|^return|[^\._$[:alnum:]]return|^default|[^\._$[:alnum:]]default|^yield|[^\._$[:alnum:]]yield|^)\s*(?=(<)\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\.|-))?\s*(>))'

1452+ - match: '(?<!\+\+|--)(?<=[({\[,?=>:*]|&&|\|\||\?|^await|[^\._$[:alnum:]]await|^return|[^\._$[:alnum:]]return|^default|[^\._$[:alnum:]]default|^yield|[^\._$[:alnum:]]yield|^)\s*(?=(<)\s*(?:([_$[:alpha:]][-$[:alnum:].]*)(?<!\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-$[:alnum:].]*))(?<!\.|-))?\s*(>))'

1632 push:

1453 push:

1633− - match: '(?!(<)\s*(?:([_$[:alpha:]][-_$[:alnum:].]*)(?<!\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-_$[:alnum:].]*))(?<!\.|-))?\s*(>))'

1454+ - match: '(?!(<)\s*(?:([_$[:alpha:]][-$[:alnum:].]*)(?<!\.|-)(:))?((?:[a-z][a-z0-9]*|([_$[:alpha:]][-$[:alnum:].]*))(?<!\.|-))?\s*(>))'

1634 pop: true

1455 pop: true

1635 - include: jsx-tag-without-attributes

1456 - include: jsx-tag-without-attributes

1636 label:

1457 label:

@@ -1656,27 +1477,25 @@ contexts:

1656 - include: this-literal

1477 - include: this-literal

1657 - include: super-literal

1478 - include: super-literal

1658 method-declaration:

1479 method-declaration:

1659− - match: '(?x)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:\b(override)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?\s*\b(constructor)\b(?!:)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

1480+ - match: '(?x)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?\s*\b(constructor)\b(?!:)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

1660 captures:

1481 captures:

1661 1: storage.modifier.tsx

1482 1: storage.modifier.tsx

1662 2: storage.modifier.tsx

1483 2: storage.modifier.tsx

1663− 3: storage.modifier.tsx

1484+ 3: storage.modifier.async.tsx

1664− 4: storage.modifier.async.tsx

1485+ 4: storage.type.tsx

1665− 5: storage.type.tsx

1666 push:

1486 push:

1667 - meta_scope: meta.method.declaration.tsx

1487 - meta_scope: meta.method.declaration.tsx

1668 - match: '(?=\}|;|,|$)|(?<=\})'

1488 - match: '(?=\}|;|,|$)|(?<=\})'

1669 pop: true

1489 pop: true

1670 - include: method-declaration-name

1490 - include: method-declaration-name

1671 - include: function-body

1491 - include: function-body

1672− - match: '(?x)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:\b(override)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:(?:\s*\b(new)\b(?!:)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))|(?:(\*)\s*)?)(?=\s*((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?[\(])'

1673 captures:

1493 captures:

1674 1: storage.modifier.tsx

1494 1: storage.modifier.tsx

1675 2: storage.modifier.tsx

1495 2: storage.modifier.tsx

1676− 3: storage.modifier.tsx

1496+ 3: storage.modifier.async.tsx

1677− 4: storage.modifier.async.tsx

1497+ 4: keyword.operator.new.tsx

1678− 5: keyword.operator.new.tsx

1498+ 5: keyword.generator.asterisk.tsx

1679− 6: keyword.generator.asterisk.tsx

1680 push:

1499 push:

1681 - meta_scope: meta.method.declaration.tsx

1500 - meta_scope: meta.method.declaration.tsx

1682 - match: '(?=\}|;|,|$)|(?<=\})'

1501 - match: '(?=\}|;|,|$)|(?<=\})'

@@ -1684,23 +1503,22 @@ contexts:

1684 - include: method-declaration-name

1503 - include: method-declaration-name

1685 - include: function-body

1504 - include: function-body

1686 - match: |-

1505 - match: |-

1687− (?x)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:\b(override)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=\s*(((\b(?<!\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:b|B)[01][01_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:o|O)?[0-7][0-7_]*(n)?\b(?!\$))|((?<!\$)(?:

1506+ (?x)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=\s*(((\b(?<!\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\b(?!\$))|(\b(?<!\$)0(b|B)[01][01_]*\b(?!\$))|(\b(?<!\$)0(o|O)?[0-7][0-7_]*\b(?!\$))|((?<!\$)(?:

1688− (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.1E+3

1507+ (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1.1E+3

1689− (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.E+3

1508+ (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*\b)| # 1.E+3

1690− (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # .1E+3

1509+ (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # .1E+3

1691− (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1E+3

1510+ (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1E+3

1692− (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*(n)?\b)| # 1.1

1511+ (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*\b)| # 1.1

1693− (?:\b[0-9][0-9_]*(\.)(n)?\B)| # 1.

1512+ (?:\b[0-9][0-9_]*(\.)\B)| # 1.

1694− (?:\B(\.)[0-9][0-9_]*(n)?\b)| # .1

1513+ (?:\B(\.)[0-9][0-9_]*\b)| # .1

1695− (?:\b[0-9][0-9_]*(n)?\b(?!\.)) # 1

1514+ (?:\b[0-9][0-9_]*\b(?!\.)) # 1

1696− )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?[\(])

1515+ )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*[\(\<])

1697 captures:

1516 captures:

1698 1: storage.modifier.tsx

1517 1: storage.modifier.tsx

1699 2: storage.modifier.tsx

1518 2: storage.modifier.tsx

1700− 3: storage.modifier.tsx

1519+ 3: storage.modifier.async.tsx

1701− 4: storage.modifier.async.tsx

1520+ 4: storage.type.property.tsx

1702− 5: storage.type.property.tsx

1521+ 5: keyword.generator.asterisk.tsx

1703− 6: keyword.generator.asterisk.tsx

1704 push:

1522 push:

1705 - meta_scope: meta.method.declaration.tsx

1523 - meta_scope: meta.method.declaration.tsx

1706 - match: '(?=\}|;|,|$)|(?<=\})'

1524 - match: '(?=\}|;|,|$)|(?<=\})'

@@ -1709,16 +1527,16 @@ contexts:

1709 - include: function-body

1527 - include: function-body

1710 method-declaration-name:

1528 method-declaration-name:

1711 - match: |-

1529 - match: |-

1712− (?x)(?=((\b(?<!\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:b|B)[01][01_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:o|O)?[0-7][0-7_]*(n)?\b(?!\$))|((?<!\$)(?:

1530+ (?x)(?=((\b(?<!\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\b(?!\$))|(\b(?<!\$)0(b|B)[01][01_]*\b(?!\$))|(\b(?<!\$)0(o|O)?[0-7][0-7_]*\b(?!\$))|((?<!\$)(?:

1713− (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.1E+3

1531+ (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1.1E+3

1714− (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.E+3

1532+ (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*\b)| # 1.E+3

1715− (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # .1E+3

1533+ (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # .1E+3

1716− (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1E+3

1534+ (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1E+3

1717− (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*(n)?\b)| # 1.1

1535+ (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*\b)| # 1.1

1718− (?:\b[0-9][0-9_]*(\.)(n)?\B)| # 1.

1536+ (?:\b[0-9][0-9_]*(\.)\B)| # 1.

1719− (?:\B(\.)[0-9][0-9_]*(n)?\b)| # .1

1537+ (?:\B(\.)[0-9][0-9_]*\b)| # .1

1720− (?:\b[0-9][0-9_]*(n)?\b(?!\.)) # 1

1538+ (?:\b[0-9][0-9_]*\b(?!\.)) # 1

1721− )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??)\s*[\(\<])

1539+ )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??)\s*[\(\<])

1722 push:

1540 push:

1723 - match: (?=\(|\<)

1541 - match: (?=\(|\<)

1724 pop: true

1542 pop: true

@@ -1730,14 +1548,13 @@ contexts:

1730 - match: \?

1548 - match: \?

1731 scope: keyword.operator.optional.tsx

1549 scope: keyword.operator.optional.tsx

1732 namespace-declaration:

1550 namespace-declaration:

1733− - match: '(?:(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(namespace|module)\s+(?=[_$[:alpha:]"''`]))'

1551+ - match: '(?:(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?\b(namespace|module)\s+(?=[_$[:alpha:]"''`]))'

1734 captures:

1552 captures:

1735 1: keyword.control.export.tsx

1553 1: keyword.control.export.tsx

1736− 2: storage.modifier.tsx

1554+ 2: storage.type.namespace.tsx

1737− 3: storage.type.namespace.tsx

1738 push:

1555 push:

1739 - meta_scope: meta.namespace.declaration.tsx

1556 - meta_scope: meta.namespace.declaration.tsx

1740− - match: '(?<=\})|(?=;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'

1557+ - match: '(?<=\})|(?=;|^\s*abstract\b|^\s*async\b|^\s*class\b|^\s*const\b|^\s*declare\b|^\s*enum\b|^\s*export\b|^\s*function\b|^\s*import\b|^\s*interface\b|^\s*let\b|^\s*module\b|^\s*namespace\b|^\s*return\b|^\s*type\b|^\s*var\b)'

1741 pop: true

1558 pop: true

1742 - include: comment

1559 - include: comment

1743 - include: string

1560 - include: string

@@ -1751,53 +1568,41 @@ contexts:

1751 1: keyword.operator.new.tsx

1568 1: keyword.operator.new.tsx

1752 push:

1569 push:

1753 - meta_scope: new.expr.tsx

1570 - meta_scope: new.expr.tsx

1754− - match: '(?<=\))|(?=[;),}\]:?\-\+\>]|\|\||\&\&|\!\=\=|$|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))new(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))function((\s+[_$[:alpha:]][_$[:alnum:]]*)|(\s*[\(]))))'

1571+ - match: '(?<=\))|(?=[;),}\]:]|\|\||\&\&|$|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))new(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))function((\s+[_$[:alpha:]][_$[:alnum:]]*)|(\s*[\(]))))'

1755 pop: true

1572 pop: true

1756− - include: expression

1573+ - include: paren-expression

1574+ - include: class-declaration

1575+ - include: type

1757 null-literal:

1576 null-literal:

1758 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))null(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

1577 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))null(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

1759 scope: constant.language.null.tsx

1578 scope: constant.language.null.tsx

1760 numeric-literal:

1579 numeric-literal:

1761− - match: '\b(?<!\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\b(?!\$)'

1580+ - match: '\b(?<!\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\b(?!\$)'

1762 scope: constant.numeric.hex.tsx

1581 scope: constant.numeric.hex.tsx

1763− captures:

1582+ - match: '\b(?<!\$)0(b|B)[01][01_]*\b(?!\$)'

1764− 1: storage.type.numeric.bigint.tsx

1765− - match: '\b(?<!\$)0(?:b|B)[01][01_]*(n)?\b(?!\$)'

1766 scope: constant.numeric.binary.tsx

1583 scope: constant.numeric.binary.tsx

1767− captures:

1584+ - match: '\b(?<!\$)0(o|O)?[0-7][0-7_]*\b(?!\$)'

1768− 1: storage.type.numeric.bigint.tsx

1769− - match: '\b(?<!\$)0(?:o|O)?[0-7][0-7_]*(n)?\b(?!\$)'

1770 scope: constant.numeric.octal.tsx

1585 scope: constant.numeric.octal.tsx

1771− captures:

1772− 1: storage.type.numeric.bigint.tsx

1773 - match: |-

1586 - match: |-

1774 (?x)

1587 (?x)

1775 (?<!\$)(?:

1588 (?<!\$)(?:

1776− (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.1E+3

1589+ (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1.1E+3

1777− (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.E+3

1590+ (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*\b)| # 1.E+3

1778− (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # .1E+3

1591+ (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # .1E+3

1779− (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1E+3

1592+ (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1E+3

1780− (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*(n)?\b)| # 1.1

1593+ (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*\b)| # 1.1

1781− (?:\b[0-9][0-9_]*(\.)(n)?\B)| # 1.

1594+ (?:\b[0-9][0-9_]*(\.)\B)| # 1.

1782− (?:\B(\.)[0-9][0-9_]*(n)?\b)| # .1

1595+ (?:\B(\.)[0-9][0-9_]*\b)| # .1

1783− (?:\b[0-9][0-9_]*(n)?\b(?!\.)) # 1

1596+ (?:\b[0-9][0-9_]*\b(?!\.)) # 1

1784 )(?!\$)

1597 )(?!\$)

1785 captures:

1598 captures:

1786 0: constant.numeric.decimal.tsx

1599 0: constant.numeric.decimal.tsx

1787 1: meta.delimiter.decimal.period.tsx

1600 1: meta.delimiter.decimal.period.tsx

1788− 2: storage.type.numeric.bigint.tsx

1601+ 2: meta.delimiter.decimal.period.tsx

1789 3: meta.delimiter.decimal.period.tsx

1602 3: meta.delimiter.decimal.period.tsx

1790− 4: storage.type.numeric.bigint.tsx

1603+ 4: meta.delimiter.decimal.period.tsx

1791 5: meta.delimiter.decimal.period.tsx

1604 5: meta.delimiter.decimal.period.tsx

1792− 6: storage.type.numeric.bigint.tsx

1605+ 6: meta.delimiter.decimal.period.tsx

1793− 7: storage.type.numeric.bigint.tsx

1794− 8: meta.delimiter.decimal.period.tsx

1795− 9: storage.type.numeric.bigint.tsx

1796− 10: meta.delimiter.decimal.period.tsx

1797− 11: storage.type.numeric.bigint.tsx

1798− 12: meta.delimiter.decimal.period.tsx

1799− 13: storage.type.numeric.bigint.tsx

1800− 14: storage.type.numeric.bigint.tsx

1801 numericConstant-literal:

1606 numericConstant-literal:

1802 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))NaN(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

1607 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))NaN(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

1803 scope: constant.language.nan.tsx

1608 scope: constant.language.nan.tsx

@@ -1806,16 +1611,16 @@ contexts:

1806 object-binding-element:

1611 object-binding-element:

1807 - include: comment

1612 - include: comment

1808 - match: |-

1613 - match: |-

1809− (?x)(?=((\b(?<!\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:b|B)[01][01_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:o|O)?[0-7][0-7_]*(n)?\b(?!\$))|((?<!\$)(?:

1614+ (?x)(?=((\b(?<!\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\b(?!\$))|(\b(?<!\$)0(b|B)[01][01_]*\b(?!\$))|(\b(?<!\$)0(o|O)?[0-7][0-7_]*\b(?!\$))|((?<!\$)(?:

1810− (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.1E+3

1615+ (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1.1E+3

1811− (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.E+3

1616+ (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*\b)| # 1.E+3

1812− (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # .1E+3

1617+ (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # .1E+3

1813− (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1E+3

1618+ (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1E+3

1814− (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*(n)?\b)| # 1.1

1619+ (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*\b)| # 1.1

1815− (?:\b[0-9][0-9_]*(\.)(n)?\B)| # 1.

1620+ (?:\b[0-9][0-9_]*(\.)\B)| # 1.

1816− (?:\B(\.)[0-9][0-9_]*(n)?\b)| # .1

1621+ (?:\B(\.)[0-9][0-9_]*\b)| # .1

1817− (?:\b[0-9][0-9_]*(n)?\b(?!\.)) # 1

1622+ (?:\b[0-9][0-9_]*\b(?!\.)) # 1

1818− )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))

1623+ )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))

1819 push:

1624 push:

1820 - match: '(?=,|\})'

1625 - match: '(?=,|\})'

1821 pop: true

1626 pop: true

@@ -1828,16 +1633,16 @@ contexts:

1828 object-binding-element-const:

1633 object-binding-element-const:

1829 - include: comment

1634 - include: comment

1830 - match: |-

1635 - match: |-

1831− (?x)(?=((\b(?<!\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:b|B)[01][01_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:o|O)?[0-7][0-7_]*(n)?\b(?!\$))|((?<!\$)(?:

1636+ (?x)(?=((\b(?<!\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\b(?!\$))|(\b(?<!\$)0(b|B)[01][01_]*\b(?!\$))|(\b(?<!\$)0(o|O)?[0-7][0-7_]*\b(?!\$))|((?<!\$)(?:

1832− (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.1E+3

1637+ (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1.1E+3

1833− (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.E+3

1638+ (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*\b)| # 1.E+3

1834− (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # .1E+3

1639+ (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # .1E+3

1835− (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1E+3

1640+ (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1E+3

1836− (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*(n)?\b)| # 1.1

1641+ (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*\b)| # 1.1

1837− (?:\b[0-9][0-9_]*(\.)(n)?\B)| # 1.

1642+ (?:\b[0-9][0-9_]*(\.)\B)| # 1.

1838− (?:\B(\.)[0-9][0-9_]*(n)?\b)| # .1

1643+ (?:\B(\.)[0-9][0-9_]*\b)| # .1

1839− (?:\b[0-9][0-9_]*(n)?\b(?!\.)) # 1

1644+ (?:\b[0-9][0-9_]*\b(?!\.)) # 1

1840− )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))

1645+ )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))

1841 push:

1646 push:

1842 - match: '(?=,|\})'

1647 - match: '(?=,|\})'

1843 pop: true

1648 pop: true

@@ -1849,16 +1654,16 @@ contexts:

1849 - include: punctuation-comma

1654 - include: punctuation-comma

1850 object-binding-element-propertyName:

1655 object-binding-element-propertyName:

1851 - match: |-

1656 - match: |-

1852− (?x)(?=((\b(?<!\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:b|B)[01][01_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:o|O)?[0-7][0-7_]*(n)?\b(?!\$))|((?<!\$)(?:

1657+ (?x)(?=((\b(?<!\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\b(?!\$))|(\b(?<!\$)0(b|B)[01][01_]*\b(?!\$))|(\b(?<!\$)0(o|O)?[0-7][0-7_]*\b(?!\$))|((?<!\$)(?:

1853− (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.1E+3

1658+ (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1.1E+3

1854− (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.E+3

1659+ (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*\b)| # 1.E+3

1855− (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # .1E+3

1660+ (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # .1E+3

1856− (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1E+3

1661+ (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1E+3

1857− (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*(n)?\b)| # 1.1

1662+ (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*\b)| # 1.1

1858− (?:\b[0-9][0-9_]*(\.)(n)?\B)| # 1.

1663+ (?:\b[0-9][0-9_]*(\.)\B)| # 1.

1859− (?:\B(\.)[0-9][0-9_]*(n)?\b)| # .1

1664+ (?:\B(\.)[0-9][0-9_]*\b)| # .1

1860− (?:\b[0-9][0-9_]*(n)?\b(?!\.)) # 1

1665+ (?:\b[0-9][0-9_]*\b(?!\.)) # 1

1861− )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))

1666+ )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))

1862 push:

1667 push:

1863 - match: (:)

1668 - match: (:)

1864 captures:

1669 captures:

@@ -1896,9 +1701,9 @@ contexts:

1896 scope: support.class.tsx

1701 scope: support.class.tsx

1897 - match: |-

1702 - match: |-

1898 (?x)(?:(\.)|(\?\.(?!\s*[[:digit:]])))\s*(?:

1703 (?x)(?:(\.)|(\?\.(?!\s*[[:digit:]])))\s*(?:

1899− (\#?[[:upper:]][_$[:digit:][:upper:]]*) |

1704+ ([[:upper:]][_$[:digit:][:upper:]]*) |

1900− (\#?[_$[:alpha:]][_$[:alnum:]]*)

1705+ ([_$[:alpha:]][_$[:alnum:]]*)

1901− )(?=\s*\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*)

1706+ )(?=\s*\??\.\s*[_$[:alpha:]][_$[:alnum:]]*)

1902 captures:

1707 captures:

1903 1: punctuation.accessor.tsx

1708 1: punctuation.accessor.tsx

1904 2: punctuation.accessor.optional.tsx

1709 2: punctuation.accessor.optional.tsx

@@ -1908,7 +1713,7 @@ contexts:

1908 (?x)(?:

1713 (?x)(?:

1909 ([[:upper:]][_$[:digit:][:upper:]]*) |

1714 ([[:upper:]][_$[:digit:][:upper:]]*) |

1910 ([_$[:alpha:]][_$[:alnum:]]*)

1715 ([_$[:alpha:]][_$[:alnum:]]*)

1911− )(?=\s*\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*)

1716+ )(?=\s*\??\.\s*[_$[:alpha:]][_$[:alnum:]]*)

1912 captures:

1717 captures:

1913 1: variable.other.constant.object.tsx

1718 1: variable.other.constant.object.tsx

1914 2: variable.other.object.tsx

1719 2: variable.other.object.tsx

@@ -1925,16 +1730,16 @@ contexts:

1925 - include: object-member

1730 - include: object-member

1926 object-literal-method-declaration:

1731 object-literal-method-declaration:

1927 - match: |-

1732 - match: |-

1928− (?x)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=\s*(((\b(?<!\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:b|B)[01][01_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:o|O)?[0-7][0-7_]*(n)?\b(?!\$))|((?<!\$)(?:

1733+ (?x)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=\s*(((\b(?<!\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\b(?!\$))|(\b(?<!\$)0(b|B)[01][01_]*\b(?!\$))|(\b(?<!\$)0(o|O)?[0-7][0-7_]*\b(?!\$))|((?<!\$)(?:

1929− (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.1E+3

1734+ (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1.1E+3

1930− (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.E+3

1735+ (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*\b)| # 1.E+3

1931− (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # .1E+3

1736+ (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # .1E+3

1932− (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1E+3

1737+ (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1E+3

1933− (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*(n)?\b)| # 1.1

1738+ (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*\b)| # 1.1

1934− (?:\b[0-9][0-9_]*(\.)(n)?\B)| # 1.

1739+ (?:\b[0-9][0-9_]*(\.)\B)| # 1.

1935− (?:\B(\.)[0-9][0-9_]*(n)?\b)| # .1

1740+ (?:\B(\.)[0-9][0-9_]*\b)| # .1

1936− (?:\b[0-9][0-9_]*(n)?\b(?!\.)) # 1

1741+ (?:\b[0-9][0-9_]*\b(?!\.)) # 1

1937− )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?[\(])

1742+ )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*[\(\<])

1938 captures:

1743 captures:

1939 1: storage.modifier.async.tsx

1744 1: storage.modifier.async.tsx

1940 2: storage.type.property.tsx

1745 2: storage.type.property.tsx

@@ -1946,16 +1751,16 @@ contexts:

1946 - include: method-declaration-name

1751 - include: method-declaration-name

1947 - include: function-body

1752 - include: function-body

1948 - match: |-

1753 - match: |-

1949− (?x)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=\s*(((\b(?<!\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:b|B)[01][01_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:o|O)?[0-7][0-7_]*(n)?\b(?!\$))|((?<!\$)(?:

1754+ (?x)(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=\s*(((\b(?<!\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\b(?!\$))|(\b(?<!\$)0(b|B)[01][01_]*\b(?!\$))|(\b(?<!\$)0(o|O)?[0-7][0-7_]*\b(?!\$))|((?<!\$)(?:

1950− (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.1E+3

1755+ (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1.1E+3

1951− (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.E+3

1756+ (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*\b)| # 1.E+3

1952− (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # .1E+3

1757+ (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # .1E+3

1953− (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1E+3

1758+ (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1E+3

1954− (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*(n)?\b)| # 1.1

1759+ (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*\b)| # 1.1

1955− (?:\b[0-9][0-9_]*(\.)(n)?\B)| # 1.

1760+ (?:\b[0-9][0-9_]*(\.)\B)| # 1.

1956− (?:\B(\.)[0-9][0-9_]*(n)?\b)| # .1

1761+ (?:\B(\.)[0-9][0-9_]*\b)| # .1

1957− (?:\b[0-9][0-9_]*(n)?\b(?!\.)) # 1

1762+ (?:\b[0-9][0-9_]*\b(?!\.)) # 1

1958− )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?[\(])

1763+ )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*[\(\<])

1959 captures:

1764 captures:

1960 1: storage.modifier.async.tsx

1765 1: storage.modifier.async.tsx

1961 2: storage.type.property.tsx

1766 2: storage.type.property.tsx

@@ -1972,56 +1777,37 @@ contexts:

1972 - meta_scope: meta.object.member.tsx meta.object-literal.key.tsx

1777 - meta_scope: meta.object.member.tsx meta.object-literal.key.tsx

1973 - match: '(?=:)|((?<=[\]])(?=\s*[\(\<]))'

1778 - match: '(?=:)|((?<=[\]])(?=\s*[\(\<]))'

1974 pop: true

1779 pop: true

1975− - include: comment

1976 - include: array-literal

1780 - include: array-literal

1977− - match: '(?=[\''\"\`])'

1781+ - match: '(?=[\''\"])'

1978 push:

1782 push:

1979 - meta_scope: meta.object.member.tsx meta.object-literal.key.tsx

1783 - meta_scope: meta.object.member.tsx meta.object-literal.key.tsx

1980− - match: '(?=:)|((?<=[\''\"\`])(?=((\s*[\(\<,}])|(\s+(as)\s+))))'

1784+ - match: '(?=:)|((?<=[\''\"])(?=\s*[\(\<]))'

1981 pop: true

1785 pop: true

1982− - include: comment

1983 - include: string

1786 - include: string

1984− - match: |-

1787+ - match: '(?<=[\]\''\"])(?=\s*[\(\<])'

1985− (?x)(?=(\b(?<!\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:b|B)[01][01_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:o|O)?[0-7][0-7_]*(n)?\b(?!\$))|((?<!\$)(?:

1986− (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.1E+3

1987− (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.E+3

1988− (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # .1E+3

1989− (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1E+3

1990− (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*(n)?\b)| # 1.1

1991− (?:\b[0-9][0-9_]*(\.)(n)?\B)| # 1.

1992− (?:\B(\.)[0-9][0-9_]*(n)?\b)| # .1

1993− (?:\b[0-9][0-9_]*(n)?\b(?!\.)) # 1

1994− )(?!\$)))

1995− push:

1996− - meta_scope: meta.object.member.tsx meta.object-literal.key.tsx

1997− - match: '(?=:)|(?=\s*([\(\<,}])|(\s+as\s+))'

1998− pop: true

1999− - include: comment

2000− - include: numeric-literal

2001− - match: '(?<=[\]\''\"\`])(?=\s*[\(\<])'

2002 push:

1788 push:

2003 - meta_scope: meta.method.declaration.tsx

1789 - meta_scope: meta.method.declaration.tsx

2004 - match: '(?=\}|;|,)|(?<=\})'

1790 - match: '(?=\}|;|,)|(?<=\})'

2005 pop: true

1791 pop: true

2006 - include: function-body

1792 - include: function-body

2007− - match: '(?![_$[:alpha:]])([[:digit:]]+)\s*(?=(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*:)'

1793+ - match: '(?![_$[:alpha:]])([[:digit:]]+)\s*(?=:)'

2008 scope: meta.object.member.tsx

1794 scope: meta.object.member.tsx

2009 captures:

1795 captures:

2010 0: meta.object-literal.key.tsx

1796 0: meta.object-literal.key.tsx

2011 1: constant.numeric.decimal.tsx

1797 1: constant.numeric.decimal.tsx

2012 - match: |-

1798 - match: |-

2013− (?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\s*(?=(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*:(\s*\/\*([^\*]|(\*[^\/]))*\*\/)*\s*(

1799+ (?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\s*(?=:\s*(

2014 ((async\s+)?(

1800 ((async\s+)?(

2015 (function\s*[(<*]) |

1801 (function\s*[(<*]) |

2016 (function\s+) |

1802 (function\s+) |

2017 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

1803 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

2018 )) |

1804 )) |

2019 ((async\s*)?(

1805 ((async\s*)?(

2020− ((<\s*$)|([$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

1806+ ((<\s*$)|([\(]\s*([\{\[]\s*)?$)) |

2021 # sure shot arrow functions even if => is on new line

1807 # sure shot arrow functions even if => is on new line

2022 (

1808 (

2023− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

1809+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*>\s*)?

2024− [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

1810+ [(]\s*

2025 (

1811 (

2026 ([)]\s*:) | # ():

1812 ([)]\s*:) | # ():

2027 ((\.\.\.\s*)?[_$[:alpha:]][_$[:alnum:]]*\s*:) # [(]param: | [(]...param:

1813 ((\.\.\.\s*)?[_$[:alpha:]][_$[:alnum:]]*\s*:) # [(]param: | [(]...param:

@@ -2032,9 +1818,9 @@ contexts:

2032 ) |

1818 ) |

2033 # arrow function possible to detect only with => on same line

1819 # arrow function possible to detect only with => on same line

2034 (

1820 (

2035− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

1821+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*>\s*)? # typeparameters

2036− $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\) # parameters

1822+ $\s*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()]|(\(([^\($]|($[^\($]*\)))*\)))*)?\) # parameters

2037− (\s*:\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

1823+ (\s*:\s*([^<>]|\<[^<>]+\>|$[^\($]+\))+)? # return type

2038 \s*=> # arrow operator

1824 \s*=> # arrow operator

2039 )

1825 )

2040 ))

1826 ))

@@ -2043,7 +1829,7 @@ contexts:

2043 captures:

1829 captures:

2044 0: meta.object-literal.key.tsx

1830 0: meta.object-literal.key.tsx

2045 1: entity.name.function.tsx

1831 1: entity.name.function.tsx

2046− - match: '(?:[_$[:alpha:]][_$[:alnum:]]*)\s*(?=(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*:)'

1832+ - match: '(?:[_$[:alpha:]][_$[:alnum:]]*)\s*(?=:)'

2047 scope: meta.object.member.tsx

1833 scope: meta.object.member.tsx

2048 captures:

1834 captures:

2049 0: meta.object-literal.key.tsx

1835 0: meta.object-literal.key.tsx

@@ -2055,27 +1841,14 @@ contexts:

2055 - match: '(?=,|\})'

1841 - match: '(?=,|\})'

2056 pop: true

1842 pop: true

2057 - include: expression

1843 - include: expression

2058− - match: '([_$[:alpha:]][_$[:alnum:]]*)\s*(?=,|\}|$|\/\/|\/\*)'

1844+ - match: '([_$[:alpha:]][_$[:alnum:]]*)\s*(?=,|\}|$)'

2059 scope: meta.object.member.tsx

1845 scope: meta.object.member.tsx

2060 captures:

1846 captures:

2061 1: variable.other.readwrite.tsx

1847 1: variable.other.readwrite.tsx

2062− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(as)\s+(const)(?=\s*([,}]|$))'

2063− scope: meta.object.member.tsx

2064− captures:

2065− 1: keyword.control.as.tsx

2066− 2: storage.modifier.tsx

2067− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(as)\s+'

2068− captures:

2069− 1: keyword.control.as.tsx

2070− push:

2071− - meta_scope: meta.object.member.tsx

2072− - match: '(?=[;),}\]:?\-\+\>]|\|\||\&\&|\!\=\=|$|^|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(as)\s+))'

2073− pop: true

2074− - include: type

2075 - match: '(?=[_$[:alpha:]][_$[:alnum:]]*\s*=)'

1848 - match: '(?=[_$[:alpha:]][_$[:alnum:]]*\s*=)'

2076 push:

1849 push:

2077 - meta_scope: meta.object.member.tsx

1850 - meta_scope: meta.object.member.tsx

2078− - match: '(?=,|\}|$|\/\/|\/\*)'

1851+ - match: '(?=,|\}|$)'

2079 pop: true

1852 pop: true

2080 - include: expression

1853 - include: expression

2081 - match: ":"

1854 - match: ":"

@@ -2085,7 +1858,7 @@ contexts:

2085 - meta_scope: meta.object.member.tsx

1858 - meta_scope: meta.object.member.tsx

2086 - match: '(?=,|\})'

1859 - match: '(?=,|\})'

2087 pop: true

1860 pop: true

2088− - match: '(?<=:)\s*(async)?(?=\s*(<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)$\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))'

1861+ - match: '(?<=:)\s*(async)?(?=\s*(<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*>\s*)\(\s*([\{\[]\s*)?$)'

2089 captures:

1862 captures:

2090 1: storage.modifier.async.tsx

1863 1: storage.modifier.async.tsx

2091 push:

1864 push:

@@ -2101,7 +1874,7 @@ contexts:

2101 0: meta.brace.round.tsx

1874 0: meta.brace.round.tsx

2102 pop: true

1875 pop: true

2103 - include: expression-inside-possibly-arrow-parens

1876 - include: expression-inside-possibly-arrow-parens

2104− - match: '(?<=:)\s*(async)?\s*($)(?=\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))'

1877+ - match: '(?<=:)\s*(async)?\s*(\()(?=\s*([\{\[]\s*)?$)'

2105 captures:

1878 captures:

2106 1: storage.modifier.async.tsx

1879 1: storage.modifier.async.tsx

2107 2: meta.brace.round.tsx

1880 2: meta.brace.round.tsx

@@ -2111,23 +1884,6 @@ contexts:

2111 0: meta.brace.round.tsx

1884 0: meta.brace.round.tsx

2112 pop: true

1885 pop: true

2113 - include: expression-inside-possibly-arrow-parens

1886 - include: expression-inside-possibly-arrow-parens

2114− - match: (?<=:)\s*(async)?\s*(?=\<\s*$)

2115− captures:

2116− 1: storage.modifier.async.tsx

2117− push:

2118− - match: (?<=\>)

2119− pop: true

2120− - include: type-parameters

2121− - match: '(?<=\>)\s*($)(?=\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))'

2122− captures:

2123− 1: meta.brace.round.tsx

2124− push:

2125− - match: \)

2126− captures:

2127− 0: meta.brace.round.tsx

2128− pop: true

2129− - include: expression-inside-possibly-arrow-parens

2130− - include: possibly-arrow-return-type

2131 - include: expression

1887 - include: expression

2132 - include: punctuation-comma

1888 - include: punctuation-comma

2133 parameter-array-binding-pattern:

1889 parameter-array-binding-pattern:

@@ -2145,18 +1901,16 @@ contexts:

2145 parameter-binding-element:

1901 parameter-binding-element:

2146 - include: comment

1902 - include: comment

2147 - include: string

1903 - include: string

2148− - include: numeric-literal

2149− - include: regex

2150 - include: parameter-object-binding-pattern

1904 - include: parameter-object-binding-pattern

2151 - include: parameter-array-binding-pattern

1905 - include: parameter-array-binding-pattern

2152 - include: destructuring-parameter-rest

1906 - include: destructuring-parameter-rest

2153 - include: variable-initializer

1907 - include: variable-initializer

2154 parameter-name:

1908 parameter-name:

2156 captures:

1910 captures:

2157 1: storage.modifier.tsx

1911 1: storage.modifier.tsx

2158 - match: |-

1912 - match: |-

2160 # function assignment |

1914 # function assignment |

2161 (=\s*(

1915 (=\s*(

2162 ((async\s+)?(

1916 ((async\s+)?(

@@ -2165,11 +1919,11 @@ contexts:

2165 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

1919 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

2166 )) |

1920 )) |

2167 ((async\s*)?(

1921 ((async\s*)?(

2168− ((<\s*$)|([$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

1922+ ((<\s*$)|([\(]\s*([\{\[]\s*)?$)) |

2169 # sure shot arrow functions even if => is on new line

1923 # sure shot arrow functions even if => is on new line

2170 (

1924 (

2171− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

1925+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*>\s*)?

2172− [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

1926+ [(]\s*

2173 (

1927 (

2174 ([)]\s*:) | # ():

1928 ([)]\s*:) | # ():

2175 ((\.\.\.\s*)?[_$[:alpha:]][_$[:alnum:]]*\s*:) # [(]param: | [(]...param:

1929 ((\.\.\.\s*)?[_$[:alpha:]][_$[:alnum:]]*\s*:) # [(]param: | [(]...param:

@@ -2180,9 +1934,9 @@ contexts:

2180 ) |

1934 ) |

2181 # arrow function possible to detect only with => on same line

1935 # arrow function possible to detect only with => on same line

2182 (

1936 (

2183− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

1937+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*>\s*)? # typeparameters

2184− $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\) # parameters

1938+ $\s*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()]|(\(([^\($]|($[^\($]*\)))*\)))*)?\) # parameters

2185− (\s*:\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

1939+ (\s*:\s*([^<>]|\<[^<>]+\>|$[^\($]+\))+)? # return type

2186 \s*=> # arrow operator

1940 \s*=> # arrow operator

2187 )

1941 )

2188 ))

1942 ))

@@ -2199,20 +1953,19 @@ contexts:

2199 ))

1953 ))

2200 ))

1954 ))

2201 )) |

1955 )) |

2202− (:\s*(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))Function(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))) |

1956+ (:\s*((<\s*$)|([\(]\s*([\{\[]\s*)?$))) |

2203− (:\s*((<\s*$)|([$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))) |

1957+ (:\s*(=>|($([^\($]|($[^\($]*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(

2204− (:\s*(=>|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(

2205 ((async\s+)?(

1958 ((async\s+)?(

2206 (function\s*[(<*]) |

1959 (function\s*[(<*]) |

2207 (function\s+) |

1960 (function\s+) |

2208 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

1961 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

2209 )) |

1962 )) |

2210 ((async\s*)?(

1963 ((async\s*)?(

2211− ((<\s*$)|([$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

1964+ ((<\s*$)|([\(]\s*([\{\[]\s*)?$)) |

2212 # sure shot arrow functions even if => is on new line

1965 # sure shot arrow functions even if => is on new line

2213 (

1966 (

2214− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

1967+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*>\s*)?

2215− [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

1968+ [(]\s*

2216 (

1969 (

2217 ([)]\s*:) | # ():

1970 ([)]\s*:) | # ():

2218 ((\.\.\.\s*)?[_$[:alpha:]][_$[:alnum:]]*\s*:) # [(]param: | [(]...param:

1971 ((\.\.\.\s*)?[_$[:alpha:]][_$[:alnum:]]*\s*:) # [(]param: | [(]...param:

@@ -2223,9 +1976,9 @@ contexts:

2223 ) |

1976 ) |

2224 # arrow function possible to detect only with => on same line

1977 # arrow function possible to detect only with => on same line

2225 (

1978 (

2226− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

1979+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*>\s*)? # typeparameters

2227− $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\) # parameters

1980+ $\s*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()]|(\(([^\($]|($[^\($]*\)))*\)))*)?\) # parameters

2228− (\s*:\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

1981+ (\s*:\s*([^<>]|\<[^<>]+\>|$[^\($]+\))+)? # return type

2229 \s*=> # arrow operator

1982 \s*=> # arrow operator

2230 )

1983 )

2231 ))

1984 ))

@@ -2236,7 +1989,7 @@ contexts:

2236 3: entity.name.function.tsx variable.language.this.tsx

1989 3: entity.name.function.tsx variable.language.this.tsx

2237 4: entity.name.function.tsx

1990 4: entity.name.function.tsx

2238 5: keyword.operator.optional.tsx

1991 5: keyword.operator.optional.tsx

2240 captures:

1993 captures:

2241 1: storage.modifier.tsx

1994 1: storage.modifier.tsx

2242 2: keyword.operator.rest.tsx

1995 2: keyword.operator.rest.tsx

@@ -2246,16 +1999,16 @@ contexts:

2246 parameter-object-binding-element:

1999 parameter-object-binding-element:

2247 - include: comment

2000 - include: comment

2248 - match: |-

2001 - match: |-

2249− (?x)(?=((\b(?<!\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:b|B)[01][01_]*(n)?\b(?!\$))|(\b(?<!\$)0(?:o|O)?[0-7][0-7_]*(n)?\b(?!\$))|((?<!\$)(?:

2002+ (?x)(?=((\b(?<!\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\b(?!\$))|(\b(?<!\$)0(b|B)[01][01_]*\b(?!\$))|(\b(?<!\$)0(o|O)?[0-7][0-7_]*\b(?!\$))|((?<!\$)(?:

2250− (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.1E+3

2003+ (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1.1E+3

2251− (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.E+3

2004+ (?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*\b)| # 1.E+3

2252− (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # .1E+3

2005+ (?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # .1E+3

2253− (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1E+3

2006+ (?:\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*\b)| # 1E+3

2254− (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*(n)?\b)| # 1.1

2007+ (?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*\b)| # 1.1

2255− (?:\b[0-9][0-9_]*(\.)(n)?\B)| # 1.

2008+ (?:\b[0-9][0-9_]*(\.)\B)| # 1.

2256− (?:\B(\.)[0-9][0-9_]*(n)?\b)| # .1

2009+ (?:\B(\.)[0-9][0-9_]*\b)| # .1

2257− (?:\b[0-9][0-9_]*(n)?\b(?!\.)) # 1

2010+ (?:\b[0-9][0-9_]*\b(?!\.)) # 1

2258− )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))

2011+ )(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))

2259 push:

2012 push:

2260 - match: '(?=,|\})'

2013 - match: '(?=,|\})'

2261 pop: true

2014 pop: true

@@ -2276,15 +2029,6 @@ contexts:

2276 0: punctuation.definition.binding-pattern.object.tsx

2029 0: punctuation.definition.binding-pattern.object.tsx

2277 pop: true

2030 pop: true

2278 - include: parameter-object-binding-element

2031 - include: parameter-object-binding-element

2279− parameter-type-annotation:

2280− - match: (:)

2281− captures:

2282− 1: keyword.operator.type.annotation.tsx

2283− push:

2284− - meta_scope: meta.type.annotation.tsx

2285− - match: "(?=[,)])|(?==[^>])"

2286− pop: true

2287− - include: type

2288 paren-expression:

2032 paren-expression:

2289 - match: \(

2033 - match: \(

2290 captures:

2034 captures:

@@ -2296,14 +2040,14 @@ contexts:

2296 pop: true

2040 pop: true

2297 - include: expression

2041 - include: expression

2298 paren-expression-possibly-arrow:

2042 paren-expression-possibly-arrow:

2299− - match: '(?<=[(=,])\s*(async)?(?=\s*((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?$\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))'

2043+ - match: '(?<=[(=,])\s*(async)?(?=\s*((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*>\s*))?\(\s*[\{\[]\s*$)'

2300 captures:

2044 captures:

2301 1: storage.modifier.async.tsx

2045 1: storage.modifier.async.tsx

2302 push:

2046 push:

2303 - match: (?<=\))

2047 - match: (?<=\))

2304 pop: true

2048 pop: true

2305 - include: paren-expression-possibly-arrow-with-typeparameters

2049 - include: paren-expression-possibly-arrow-with-typeparameters

2306− - match: '(?<=[(=,]|=>|^return|[^\._$[:alnum:]]return)\s*(async)?(?=\s*((((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*))?\()|(<))\s*$)'

2050+ - match: '(?<=[(=,]|=>)\s*(async)?(?=\s*((((<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*>\s*))?\()|(<))\s*$)'

2307 captures:

2051 captures:

2308 1: storage.modifier.async.tsx

2052 1: storage.modifier.async.tsx

2309 push:

2053 push:

@@ -2323,7 +2067,7 @@ contexts:

2323 pop: true

2067 pop: true

2324 - include: expression-inside-possibly-arrow-parens

2068 - include: expression-inside-possibly-arrow-parens

2325 possibly-arrow-return-type:

2069 possibly-arrow-return-type:

2326− - match: '(?<=\)|^)\s*(:)(?=\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*=>)'

2070+ - match: '(?<=\))\s*(:)(?=\s*([^<>]|\<[^<>]+\>|$[^\($]+\))+\s*=>)'

2327 captures:

2071 captures:

2328 1: meta.arrow.tsx meta.return.type.arrow.tsx keyword.operator.type.annotation.tsx

2072 1: meta.arrow.tsx meta.return.type.arrow.tsx keyword.operator.type.annotation.tsx

2329 push:

2073 push:

@@ -2370,23 +2114,23 @@ contexts:

2370 pop: true

2114 pop: true

2371 - include: string-character-escape

2115 - include: string-character-escape

2372 regex:

2116 regex:

2373− - match: '(?<!\+\+|--|})(?<=[=(:,\[?+!]|^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case|=>|&&|\|\||\*\/)\s*(\/)(?![\/*])(?=(?:[^\/\\\[$)]|\\.|\[([^\]\\]|\\.)+\]|\(([^$\\]|\\.)+\))+\/([dgimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))'

2117+ - match: '(?<!\+\+|--|})(?<=[=(:,\[?+!]|^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case|=>|&&|\|\||\*\/)\s*(\/)(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)+\])+\/[gimsuy]*(?!\s*[a-zA-Z0-9_$]))'

2374 captures:

2118 captures:

2375 1: punctuation.definition.string.begin.tsx

2119 1: punctuation.definition.string.begin.tsx

2376 push:

2120 push:

2377 - meta_scope: string.regexp.tsx

2121 - meta_scope: string.regexp.tsx

2378− - match: "(/)([dgimsuy]*)"

2122+ - match: "(/)([gimsuy]*)"

2379 captures:

2123 captures:

2380 1: punctuation.definition.string.end.tsx

2124 1: punctuation.definition.string.end.tsx

2381 2: keyword.other.tsx

2125 2: keyword.other.tsx

2382 pop: true

2126 pop: true

2383 - include: regexp

2127 - include: regexp

2384− - match: '((?<![_$[:alnum:])\]]|\+\+|--|}|\*\/)|((?<=^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case))\s*)\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/([dgimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))'

2128+ - match: '(?<![_$[:alnum:])\]]|\+\+|--|})\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)+\])+\/[gimsuy]*(?!\s*[a-zA-Z0-9_$]))'

2385 captures:

2129 captures:

2386 0: punctuation.definition.string.begin.tsx

2130 0: punctuation.definition.string.begin.tsx

2387 push:

2131 push:

2388 - meta_scope: string.regexp.tsx

2132 - meta_scope: string.regexp.tsx

2389− - match: "(/)([dgimsuy]*)"

2133+ - match: "(/)([gimsuy]*)"

2390 captures:

2134 captures:

2391 1: punctuation.definition.string.end.tsx

2135 1: punctuation.definition.string.end.tsx

2392 2: keyword.other.tsx

2136 2: keyword.other.tsx

@@ -2486,24 +2230,10 @@ contexts:

2486 - include: type-object

2230 - include: type-object

2487 - include: type-predicate-operator

2231 - include: type-predicate-operator

2488 - include: type

2232 - include: type

2489− shebang:

2490− - match: \A(#!).*(?=$)

2491− scope: comment.line.shebang.tsx

2492− captures:

2493− 1: punctuation.definition.comment.tsx

2494− single-line-comment-consuming-line-ending:

2495− - match: '(^[ \t]+)?((//)(?:\s*((@)internal)(?=\s|$))?)'

2496− captures:

2497− 1: punctuation.whitespace.comment.leading.tsx

2498− 2: comment.line.double-slash.tsx

2499− 3: punctuation.definition.comment.tsx

2500− 4: storage.type.internaldeclaration.tsx

2501− 5: punctuation.decorator.internaldeclaration.tsx

2502− push:

2503− - meta_content_scope: comment.line.double-slash.tsx

2504− - match: (?=^)

2505− pop: true

2506 statements:

2233 statements:

2234+ - include: string

2235+ - include: template

2236+ - include: comment

2507 - include: declaration

2237 - include: declaration

2508 - include: control-statement

2238 - include: control-statement

2509 - include: after-operator-block-as-object-literal

2239 - include: after-operator-block-as-object-literal

@@ -2511,31 +2241,21 @@ contexts:

2511 - include: label

2241 - include: label

2512 - include: expression

2242 - include: expression

2513 - include: punctuation-semicolon

2243 - include: punctuation-semicolon

2514− - include: string

2515− - include: comment

2516 string:

2244 string:

2517 - include: qstring-single

2245 - include: qstring-single

2518 - include: qstring-double

2246 - include: qstring-double

2519− - include: template

2520 string-character-escape:

2247 string-character-escape:

2521− - match: '\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}|u\{[0-9A-Fa-f]+\}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)'

2248+ - match: '\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.|$)'

2522 scope: constant.character.escape.tsx

2249 scope: constant.character.escape.tsx

2523 super-literal:

2250 super-literal:

2524 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))super\b(?!\$)'

2251 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))super\b(?!\$)'

2525 scope: variable.language.super.tsx

2252 scope: variable.language.super.tsx

2526− support-function-call-identifiers:

2527− - include: literal

2528− - include: support-objects

2529− - include: object-identifiers

2530− - include: punctuation-accessor

2531− - match: '(?:(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))import(?=\s*[\(]\s*[\"\''\`]))'

2532− scope: keyword.operator.expression.import.tsx

2533 support-objects:

2253 support-objects:

2534 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(arguments)\b(?!\$)'

2254 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(arguments)\b(?!\$)'

2535 scope: variable.language.arguments.tsx

2255 scope: variable.language.arguments.tsx

2536 - match: |-

2256 - match: |-

2541 scope: support.class.builtin.tsx

2261 scope: support.class.builtin.tsx

@@ -2589,9 +2309,9 @@ contexts:

2589 4: support.variable.property.target.tsx

2309 4: support.variable.property.target.tsx

2590 - match: |-

2310 - match: |-

2591 (?x) (?:(\.)|(\?\.(?!\s*[[:digit:]]))) \s* (?:

2311 (?x) (?:(\.)|(\?\.(?!\s*[[:digit:]]))) \s* (?:

2592− (?:(constructor|length|prototype|__proto__)\b(?!\$|\s*(<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?\())

2312+ (constructor|length|prototype|__proto__)

2593 |

2313 |

2595 captures:

2315 captures:

2596 1: punctuation.accessor.tsx

2316 1: punctuation.accessor.tsx

2597 2: punctuation.accessor.optional.tsx

2317 2: punctuation.accessor.optional.tsx

@@ -2695,7 +2415,7 @@ contexts:

2698− |vAlign|value|valueType|vendor|vendorSub|version|visibility|vspace|whiteSpace|width|X[MS]LDocument|zIndex))\b(?!\$|\s*(<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?\()

2418+ |vAlign|value|valueType|vendor|vendorSub|version|visibility|vspace|whiteSpace|width|X[MS]LDocument|zIndex))\b(?!\$|\s*(<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*>\s*)?\()

2699 captures:

2419 captures:

2700 1: punctuation.accessor.tsx

2420 1: punctuation.accessor.tsx

2701 2: punctuation.accessor.optional.tsx

2421 2: punctuation.accessor.optional.tsx

@@ -2819,7 +2539,6 @@ contexts:

2819 captures:

2539 captures:

2820 0: punctuation.definition.block.tsx

2540 0: punctuation.definition.block.tsx

2821 pop: true

2541 pop: true

2822− - include: comment

2823 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(switch)\s*(\()'

2542 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(switch)\s*(\()'

2824 captures:

2543 captures:

2825 1: keyword.control.switch.tsx

2544 1: keyword.control.switch.tsx

@@ -2862,34 +2581,7 @@ contexts:

2862 0: case-clause.expr.tsx punctuation.definition.section.case-statement.tsx

2581 0: case-clause.expr.tsx punctuation.definition.section.case-statement.tsx

2863 - include: statements

2582 - include: statements

2864 template:

2583 template:

2865− - include: template-call

2584+ - match: '([_$[:alpha:]][_$[:alnum:]]*)\s*(?=(<\s*(((keyof|infer)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''[^\'']*\'')|(\"[^\"]*\")|(\`[^\`]*\`))(?=\s*([\<\>\,\.\[=]|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($[^\($]*\)))*\))|(?<==)\>|\<\s*(((keyof|infer)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\''[^\'']*\'')|(\"[^\"]*\")|(\`[^\`]*\`))(?=\s*([\<\>\,\.\[=]|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($[^\($]*\)))*\))|(?<==)\>)*(?!=)\>)*(?!=)>\s*)`)'

2866− - match: "([_$[:alpha:]][_$[:alnum:]]*)?(`)"

2867− captures:

2868− 1: entity.name.function.tagged-template.tsx

2869− 2: punctuation.definition.string.template.begin.tsx

2870− push:

2871− - meta_scope: string.template.tsx

2872− - match: "`"

2873− captures:

2874− 0: punctuation.definition.string.template.end.tsx

2875− pop: true

2876− - include: template-substitution-element

2877− - include: string-character-escape

2878− template-call:

2879− - match: '(?=(([_$[:alpha:]][_$[:alnum:]]*\s*\??\.\s*)*|(\??\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)?`)'

2880− push:

2881− - meta_scope: string.template.tsx

2882− - match: (?=`)

2883− pop: true

2884− - match: '(?=(([_$[:alpha:]][_$[:alnum:]]*\s*\??\.\s*)*|(\??\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*))'

2885− push:

2886− - match: '(?=(<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)?`)'

2887− pop: true

2888− - include: support-function-call-identifiers

2889− - match: "([_$[:alpha:]][_$[:alnum:]]*)"

2890− scope: entity.name.function.tagged-template.tsx

2891− - include: type-arguments

2892− - match: '([_$[:alpha:]][_$[:alnum:]]*)?\s*(?=(<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))(([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>|\<\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\''([^\''\\]|\\.)*\'')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))([^<>$]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(?<==)\>)*(?<!=)\>))*(?<!=)\>)*(?<!=)>\s*)`)'

2893 captures:

2585 captures:

2894 1: entity.name.function.tagged-template.tsx

2586 1: entity.name.function.tagged-template.tsx

2895 push:

2587 push:

@@ -2897,20 +2589,6 @@ contexts:

2897 - match: (?=`)

2589 - match: (?=`)

2898 pop: true

2590 pop: true

2899 - include: type-arguments

2591 - include: type-arguments

2900− template-substitution-element:

2901− - match: '\$\{'

2902− captures:

2903− 0: punctuation.definition.template-expression.begin.tsx

2904− push:

2905− - meta_scope: meta.template.expression.tsx

2906− - meta_content_scope: meta.embedded.line.tsx

2907− - match: '\}'

2908− captures:

2909− 0: punctuation.definition.template-expression.end.tsx

2910− pop: true

2911− - include: expression

2912− template-type:

2913− - include: template-call

2914 - match: "([_$[:alpha:]][_$[:alnum:]]*)?(`)"

2592 - match: "([_$[:alpha:]][_$[:alnum:]]*)?(`)"

2915 captures:

2593 captures:

2916 1: entity.name.function.tagged-template.tsx

2594 1: entity.name.function.tagged-template.tsx

@@ -2921,9 +2599,9 @@ contexts:

2921 captures:

2599 captures:

2922 0: punctuation.definition.string.template.end.tsx

2600 0: punctuation.definition.string.template.end.tsx

2923 pop: true

2601 pop: true

2924− - include: template-type-substitution-element

2602+ - include: template-substitution-element

2925 - include: string-character-escape

2603 - include: string-character-escape

2926− template-type-substitution-element:

2604+ template-substitution-element:

2927 - match: '\$\{'

2605 - match: '\$\{'

2928 captures:

2606 captures:

2929 0: punctuation.definition.template-expression.begin.tsx

2607 0: punctuation.definition.template-expression.begin.tsx

@@ -2934,9 +2612,9 @@ contexts:

2934 captures:

2612 captures:

2935 0: punctuation.definition.template-expression.end.tsx

2613 0: punctuation.definition.template-expression.end.tsx

2936 pop: true

2614 pop: true

2937− - include: type

2615+ - include: expression

2938 ternary-expression:

2616 ternary-expression:

2939− - match: '(?!\?\.\s*[^[:digit:]])(\?)(?!\?)'

2617+ - match: '(?!\?\.\s*[^[:digit:]])(\?)'

2940 captures:

2618 captures:

2941 1: keyword.operator.ternary.tsx

2619 1: keyword.operator.ternary.tsx

2942 push:

2620 push:

@@ -2950,7 +2628,7 @@ contexts:

2950 scope: variable.language.this.tsx

2628 scope: variable.language.this.tsx

2951 type:

2629 type:

2952 - include: comment

2630 - include: comment

2953− - include: type-string

2631+ - include: string

2954 - include: numeric-literal

2632 - include: numeric-literal

2955 - include: type-primitive

2633 - include: type-primitive

2956 - include: type-builtin-literals

2634 - include: type-builtin-literals

@@ -2962,36 +2640,24 @@ contexts:

2962 - include: type-fn-type-parameters

2640 - include: type-fn-type-parameters

2963 - include: type-paren-or-function-parameters

2641 - include: type-paren-or-function-parameters

2964 - include: type-function-return-type

2642 - include: type-function-return-type

2965− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(readonly)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))\s*'

2966− captures:

2967− 1: storage.modifier.tsx

2968 - include: type-name

2643 - include: type-name

2969 type-alias-declaration:

2644 type-alias-declaration:

2970− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(type)\b\s+([_$[:alpha:]][_$[:alnum:]]*)\s*'

2645+ - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?\b(type)\b\s+([_$[:alpha:]][_$[:alnum:]]*)\s*'

2971 captures:

2646 captures:

2972 1: keyword.control.export.tsx

2647 1: keyword.control.export.tsx

2973− 2: storage.modifier.tsx

2648+ 2: storage.type.type.tsx

2974− 3: storage.type.type.tsx

2649+ 3: entity.name.type.alias.tsx

2975− 4: entity.name.type.alias.tsx

2976 push:

2650 push:

2977 - meta_scope: meta.type.declaration.tsx

2651 - meta_scope: meta.type.declaration.tsx

2978− - match: '(?=\}|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'

2652+ - match: '(?=\}|;|^\s*abstract\b|^\s*async\b|^\s*class\b|^\s*const\b|^\s*declare\b|^\s*enum\b|^\s*export\b|^\s*function\b|^\s*import\b|^\s*interface\b|^\s*let\b|^\s*module\b|^\s*namespace\b|^\s*return\b|^\s*type\b|^\s*var\b)'

2979 pop: true

2653 pop: true

2980 - include: comment

2654 - include: comment

2981 - include: type-parameters

2655 - include: type-parameters

2982− - match: '(=)\s*(intrinsic)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

2983− captures:

2984− 1: keyword.operator.assignment.tsx

2985− 2: keyword.control.intrinsic.tsx

2986− push:

2987− - match: '(?=\}|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'

2988− pop: true

2989− - include: type

2990 - match: (=)\s*

2656 - match: (=)\s*

2991 captures:

2657 captures:

2992 1: keyword.operator.assignment.tsx

2658 1: keyword.operator.assignment.tsx

2993 push:

2659 push:

2994− - match: '(?=\}|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'

2660+ - match: '(?=\}|;|^\s*abstract\b|^\s*async\b|^\s*class\b|^\s*const\b|^\s*declare\b|^\s*enum\b|^\s*export\b|^\s*function\b|^\s*import\b|^\s*interface\b|^\s*let\b|^\s*module\b|^\s*namespace\b|^\s*return\b|^\s*type\b|^\s*var\b)'

2995 pop: true

2661 pop: true

2996 - include: type

2662 - include: type

2997 type-annotation:

2663 type-annotation:

@@ -3021,13 +2687,8 @@ contexts:

3021 captures:

2687 captures:

3022 0: punctuation.definition.typeparameters.end.tsx

2688 0: punctuation.definition.typeparameters.end.tsx

3023 pop: true

2689 pop: true

3024− - include: type-arguments-body

2690+ - include: type

3025− type-arguments-body:

2691+ - include: punctuation-comma

3026− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(_)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

3027− captures:

3028− 0: keyword.operator.type.tsx

3029− - include: type

3030− - include: punctuation-comma

3031 type-builtin-literals:

2692 type-builtin-literals:

3033 scope: support.type.builtin.tsx

2694 scope: support.type.builtin.tsx

@@ -3049,19 +2710,13 @@ contexts:

3049 - include: type

2710 - include: type

3050 - include: type

2711 - include: type

3051 type-fn-type-parameters:

2712 type-fn-type-parameters:

3052− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(abstract)\s+)?(new)\b(?=\s*\<)'

2713+ - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(new)\b(?=\s*\<)'

2714+ scope: meta.type.constructor.tsx

3053 captures:

2715 captures:

3054− 1: meta.type.constructor.tsx storage.modifier.tsx

2716+ 1: keyword.control.new.tsx

3055− 2: meta.type.constructor.tsx keyword.control.new.tsx

2717+ - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(new)\b\s*(?=\()'

3056− push:

3057− - match: (?<=>)

3058− pop: true

3059− - include: comment

3060− - include: type-parameters

3061− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(abstract)\s+)?(new)\b\s*(?=\()'

3062 captures:

2718 captures:

3063− 1: storage.modifier.tsx

2719+ 1: keyword.control.new.tsx

3064− 2: keyword.control.new.tsx

3065 push:

2720 push:

3066 - meta_scope: meta.type.constructor.tsx

2721 - meta_scope: meta.type.constructor.tsx

3067 - match: (?<=\))

2722 - match: (?<=\))

@@ -3112,30 +2767,6 @@ contexts:

3112 - include: type-predicate-operator

2767 - include: type-predicate-operator

3113 - include: type

2768 - include: type

3114 type-name:

2769 type-name:

3115− - match: '([_$[:alpha:]][_$[:alnum:]]*)\s*(?:(\.)|(\?\.(?!\s*[[:digit:]])))\s*(<)'

3116− captures:

3117− 1: entity.name.type.module.tsx

3118− 2: punctuation.accessor.tsx

3119− 3: punctuation.accessor.optional.tsx

3120− 4: meta.type.parameters.tsx punctuation.definition.typeparameters.begin.tsx

3121− push:

3122− - meta_content_scope: meta.type.parameters.tsx

3123− - match: (>)

3124− captures:

3125− 1: meta.type.parameters.tsx punctuation.definition.typeparameters.end.tsx

3126− pop: true

3127− - include: type-arguments-body

3128− - match: '([_$[:alpha:]][_$[:alnum:]]*)\s*(<)'

3129− captures:

3130− 1: entity.name.type.tsx

3131− 2: meta.type.parameters.tsx punctuation.definition.typeparameters.begin.tsx

3132− push:

3133− - meta_content_scope: meta.type.parameters.tsx

3134− - match: (>)

3135− captures:

3136− 1: meta.type.parameters.tsx punctuation.definition.typeparameters.end.tsx

3137− pop: true

3138− - include: type-arguments-body

3139 - match: '([_$[:alpha:]][_$[:alnum:]]*)\s*(?:(\.)|(\?\.(?!\s*[[:digit:]])))'

2770 - match: '([_$[:alpha:]][_$[:alnum:]]*)\s*(?:(\.)|(\?\.(?!\s*[[:digit:]])))'

3140 captures:

2771 captures:

3141 1: entity.name.type.module.tsx

2772 1: entity.name.type.module.tsx

@@ -3171,16 +2802,18 @@ contexts:

3171 - include: type

2802 - include: type

3172 type-operators:

2803 type-operators:

3173 - include: typeof-operator

2804 - include: typeof-operator

3174− - match: '([&|])(?=\s*\{)'

2805+ - match: '(?:([&|])|(=(?!>)))(?=\s*\{)'

3175 captures:

2806 captures:

3176− 0: keyword.operator.type.tsx

2807+ 1: keyword.operator.type.tsx

2808+ 2: keyword.operator.assignment.tsx

3177 push:

2809 push:

3178 - match: '(?<=\})'

2810 - match: '(?<=\})'

3179 pop: true

2811 pop: true

3180 - include: type-object

2812 - include: type-object

3181− - match: "[&|]"

2813+ - match: "([&|])|(=(?!>))"

3182 captures:

2814 captures:

3183− 0: keyword.operator.type.tsx

2815+ 1: keyword.operator.type.tsx

2816+ 2: keyword.operator.assignment.tsx

3184 push:

2817 push:

3185 - match: (?=\S)

2818 - match: (?=\S)

3186 pop: true

2819 pop: true

@@ -3207,8 +2840,6 @@ contexts:

3207 scope: storage.modifier.tsx

2840 scope: storage.modifier.tsx

3208 - include: type

2841 - include: type

3209 - include: punctuation-comma

2842 - include: punctuation-comma

3210− - match: (=)(?!>)

3211− scope: keyword.operator.assignment.tsx

3212 type-paren-or-function-parameters:

2843 type-paren-or-function-parameters:

3213 - match: \(

2844 - match: \(

3214 captures:

2845 captures:

@@ -3219,6 +2850,7 @@ contexts:

3219 captures:

2850 captures:

3220 0: meta.brace.round.tsx

2851 0: meta.brace.round.tsx

3221 pop: true

2852 pop: true

2853+ - include: destructuring-parameter

3222 - match: |-

2854 - match: |-

3224 (<) |

2856 (<) |

@@ -3231,8 +2863,7 @@ contexts:

3231 ))

2863 ))

3232 ))

2864 ))

3233 )) |

2865 )) |

3234− (:\s*(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))Function(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))) |

2866+ (:\s*((<\s*$)|([\(]\s*([\{\[]\s*)?$))))

3235− (:\s*((<\s*$)|([$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))))

3236 captures:

2867 captures:

3237 1: storage.modifier.tsx

2868 1: storage.modifier.tsx

3238 2: keyword.operator.rest.tsx

2869 2: keyword.operator.rest.tsx

@@ -3251,28 +2882,11 @@ contexts:

3251 scope: punctuation.separator.parameter.tsx

2882 scope: punctuation.separator.parameter.tsx

3252 - include: type

2883 - include: type

3253 type-predicate-operator:

2884 type-predicate-operator:

3254− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(asserts)\s+)?(?!asserts)(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))\s(is)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

3255− captures:

3256− 1: keyword.operator.type.asserts.tsx

3257− 2: variable.parameter.tsx variable.language.this.tsx

3258− 3: variable.parameter.tsx

3259− 4: keyword.operator.expression.is.tsx

3260− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(asserts)\s+(?!is)(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

3261− captures:

3262− 1: keyword.operator.type.asserts.tsx

3263− 2: variable.parameter.tsx variable.language.this.tsx

3264− 3: variable.parameter.tsx

3265− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))asserts(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

3266− scope: keyword.operator.type.asserts.tsx

3267 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))is(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

2885 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))is(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

3268 scope: keyword.operator.expression.is.tsx

2886 scope: keyword.operator.expression.is.tsx

3269 type-primitive:

2887 type-primitive:

3271 scope: support.type.primitive.tsx

2889 scope: support.type.primitive.tsx

3272− type-string:

3273− - include: qstring-single

3274− - include: qstring-double

3275− - include: template-type

3276 type-tuple:

2890 type-tuple:

3277 - match: '\['

2891 - match: '\['

3278 captures:

2892 captures:

@@ -3283,84 +2897,56 @@ contexts:

3283 captures:

2897 captures:

3284 0: meta.brace.square.tsx

2898 0: meta.brace.square.tsx

3285 pop: true

2899 pop: true

3286− - match: \.\.\.

3287− scope: keyword.operator.rest.tsx

3288− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))([_$[:alpha:]][_$[:alnum:]]*)\s*(\?)?\s*(:)'

3289− captures:

3290− 1: entity.name.label.tsx

3291− 2: keyword.operator.optional.tsx

3292− 3: punctuation.separator.label.tsx

3293 - include: type

2900 - include: type

3294 - include: punctuation-comma

2901 - include: punctuation-comma

3295 typeof-operator:

2902 typeof-operator:

3296 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))typeof(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

2903 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))typeof(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

3297− captures:

2904+ scope: keyword.operator.expression.typeof.tsx

3298− 0: keyword.operator.expression.typeof.tsx

3299− push:

3300− - match: '(?=[,);}\]=>:&|{\?]|$|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))'

3301− pop: true

3302− - include: expression

3303 undefined-literal:

2905 undefined-literal:

3304 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))undefined(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

2906 - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))undefined(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

3305 scope: constant.language.undefined.tsx

2907 scope: constant.language.undefined.tsx

3306 var-expr:

2908 var-expr:

3307− - match: '(?=(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(var|let)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))'

2909+ - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?\b(var|let)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

2910+ captures:

2911+ 1: keyword.control.export.tsx

2912+ 2: storage.type.tsx

3308 push:

2913 push:

3309 - meta_scope: meta.var.expr.tsx

2914 - meta_scope: meta.var.expr.tsx

3310− - match: '(?!(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(var|let)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))((?=;|}|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(of|in)\s+)|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))|((?<!^let|[^\._$[:alnum:]]let|^var|[^\._$[:alnum:]]var)(?=\s*$)))'

2915+ - match: '((?=;|}|(\s+(of|in)\s+)|^\s*$|;|^\s*abstract\b|^\s*async\b|^\s*class\b|^\s*const\b|^\s*declare\b|^\s*enum\b|^\s*export\b|^\s*function\b|^\s*import\b|^\s*interface\b|^\s*let\b|^\s*module\b|^\s*namespace\b|^\s*return\b|^\s*type\b|^\s*var\b)|((?<=\S)(?<!^let|[^\._$[:alnum:]]let|^var|[^\._$[:alnum:]]var)(?=\s*$)))'

3311 pop: true

2916 pop: true

3312− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(var|let)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))\s*'

3313− captures:

3314− 1: keyword.control.export.tsx

3315− 2: storage.modifier.tsx

3316− 3: storage.type.tsx

3317− push:

3318− - match: (?=\S)

3319− pop: true

3320 - include: destructuring-variable

2917 - include: destructuring-variable

3321 - include: var-single-variable

2918 - include: var-single-variable

3322 - include: variable-initializer

2919 - include: variable-initializer

3323 - include: comment

2920 - include: comment

3324− - match: (,)\s*((?!\S)|(?=\/\/))

2921+ - match: (,)\s*(?!\S)

3325 captures:

2922 captures:

3326 1: punctuation.separator.comma.tsx

2923 1: punctuation.separator.comma.tsx

3327 push:

2924 push:

3328− - match: '(?<!,)(((?==|;|}|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(of|in)\s+)|^\s*$))|((?<=\S)(?=\s*$)))'

2925+ - match: '(?<!,)(((?==|;|}|(\s+(of|in)\s+)|^\s*$))|((?<=\S)(?=\s*$)))'

3329 pop: true

2926 pop: true

3330− - include: single-line-comment-consuming-line-ending

3331 - include: comment

2927 - include: comment

3332 - include: destructuring-variable

2928 - include: destructuring-variable

3333 - include: var-single-variable

2929 - include: var-single-variable

3334 - include: punctuation-comma

2930 - include: punctuation-comma

3335 - include: punctuation-comma

2931 - include: punctuation-comma

3336− - match: '(?=(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(const(?!\s+enum\b))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))'

2932+ - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?\b(const(?!\s+enum\b))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))'

3337 captures:

2933 captures:

3338 1: keyword.control.export.tsx

2934 1: keyword.control.export.tsx

3339− 2: storage.modifier.tsx

2935+ 2: storage.type.tsx

3340− 3: storage.type.tsx

3341 push:

2936 push:

3342 - meta_scope: meta.var.expr.tsx

2937 - meta_scope: meta.var.expr.tsx

3343− - match: '(?!(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(const(?!\s+enum\b))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))((?=;|}|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(of|in)\s+)|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))|((?<!^const|[^\._$[:alnum:]]const)(?=\s*$)))'

2938+ - match: '((?=;|}|(\s+(of|in)\s+)|^\s*$|;|^\s*abstract\b|^\s*async\b|^\s*class\b|^\s*const\b|^\s*declare\b|^\s*enum\b|^\s*export\b|^\s*function\b|^\s*import\b|^\s*interface\b|^\s*let\b|^\s*module\b|^\s*namespace\b|^\s*return\b|^\s*type\b|^\s*var\b)|((?<=\S)(?<!^const|[^\._$[:alnum:]]const)(?=\s*$)))'

3344 pop: true

2939 pop: true

3345− - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(\bexport)\s+)?(?:(\bdeclare)\s+)?\b(const(?!\s+enum\b))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))\s*'

3346− captures:

3347− 1: keyword.control.export.tsx

3348− 2: storage.modifier.tsx

3349− 3: storage.type.tsx

3350− push:

3351− - match: (?=\S)

3352− pop: true

3353 - include: destructuring-const

2940 - include: destructuring-const

3354 - include: var-single-const

2941 - include: var-single-const

3355 - include: variable-initializer

2942 - include: variable-initializer

3356 - include: comment

2943 - include: comment

3357− - match: (,)\s*((?!\S)|(?=\/\/))

2944+ - match: (,)\s*(?!\S)

3358 captures:

2945 captures:

3359 1: punctuation.separator.comma.tsx

2946 1: punctuation.separator.comma.tsx

3360 push:

2947 push:

3361− - match: '(?<!,)(((?==|;|}|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(of|in)\s+)|^\s*$))|((?<=\S)(?=\s*$)))'

2948+ - match: '(?<!,)(((?==|;|}|(\s+(of|in)\s+)|^\s*$))|((?<=\S)(?=\s*$)))'

3362 pop: true

2949 pop: true

3363− - include: single-line-comment-consuming-line-ending

3364 - include: comment

2950 - include: comment

3365 - include: destructuring-const

2951 - include: destructuring-const

3366 - include: var-single-const

2952 - include: var-single-const

@@ -3377,11 +2963,11 @@ contexts:

3377 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

2963 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

3378 )) |

2964 )) |

3379 ((async\s*)?(

2965 ((async\s*)?(

3380− ((<\s*$)|([$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

2966+ ((<\s*$)|([\(]\s*([\{\[]\s*)?$)) |

3381 # sure shot arrow functions even if => is on new line

2967 # sure shot arrow functions even if => is on new line

3382 (

2968 (

3383− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

2969+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*>\s*)?

3384− [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

2970+ [(]\s*

3385 (

2971 (

3386 ([)]\s*:) | # ():

2972 ([)]\s*:) | # ():

3387 ((\.\.\.\s*)?[_$[:alpha:]][_$[:alnum:]]*\s*:) # [(]param: | [(]...param:

2973 ((\.\.\.\s*)?[_$[:alpha:]][_$[:alnum:]]*\s*:) # [(]param: | [(]...param:

@@ -3392,9 +2978,9 @@ contexts:

3392 ) |

2978 ) |

3393 # arrow function possible to detect only with => on same line

2979 # arrow function possible to detect only with => on same line

3394 (

2980 (

3395− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

2981+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*>\s*)? # typeparameters

3396− $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\) # parameters

2982+ $\s*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()]|(\(([^\($]|($[^\($]*\)))*\)))*)?\) # parameters

3397− (\s*:\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

2983+ (\s*:\s*([^<>]|\<[^<>]+\>|$[^\($]+\))+)? # return type

3398 \s*=> # arrow operator

2984 \s*=> # arrow operator

3399 )

2985 )

3400 ))

2986 ))

@@ -3411,20 +2997,19 @@ contexts:

3411 ))

2997 ))

3412 ))

2998 ))

3413 )) |

2999 )) |

3414− (:\s*(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))Function(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))) |

3000+ (:\s*((<\s*$)|([\(]\s*([\{\[]\s*)?$))) |

3415− (:\s*((<\s*$)|([$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))) |

3001+ (:\s*(=>|($([^\($]|($[^\($]*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(

3416− (:\s*(=>|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(

3417 ((async\s+)?(

3002 ((async\s+)?(

3418 (function\s*[(<*]) |

3003 (function\s*[(<*]) |

3419 (function\s+) |

3004 (function\s+) |

3420 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

3005 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

3421 )) |

3006 )) |

3422 ((async\s*)?(

3007 ((async\s*)?(

3423− ((<\s*$)|([$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

3008+ ((<\s*$)|([\(]\s*([\{\[]\s*)?$)) |

3424 # sure shot arrow functions even if => is on new line

3009 # sure shot arrow functions even if => is on new line

3425 (

3010 (

3426− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

3011+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*>\s*)?

3427− [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

3012+ [(]\s*

3428 (

3013 (

3429 ([)]\s*:) | # ():

3014 ([)]\s*:) | # ():

3430 ((\.\.\.\s*)?[_$[:alpha:]][_$[:alnum:]]*\s*:) # [(]param: | [(]...param:

3015 ((\.\.\.\s*)?[_$[:alpha:]][_$[:alnum:]]*\s*:) # [(]param: | [(]...param:

@@ -3435,9 +3020,9 @@ contexts:

3435 ) |

3020 ) |

3436 # arrow function possible to detect only with => on same line

3021 # arrow function possible to detect only with => on same line

3437 (

3022 (

3438− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

3023+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*>\s*)? # typeparameters

3439− $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\) # parameters

3024+ $\s*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()]|(\(([^\($]|($[^\($]*\)))*\)))*)?\) # parameters

3440− (\s*:\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

3025+ (\s*:\s*([^<>]|\<[^<>]+\>|$[^\($]+\))+)? # return type

3441 \s*=> # arrow operator

3026 \s*=> # arrow operator

3442 )

3027 )

3443 ))

3028 ))

@@ -3446,7 +3031,7 @@ contexts:

3446 1: meta.definition.variable.tsx variable.other.constant.tsx entity.name.function.tsx

3031 1: meta.definition.variable.tsx variable.other.constant.tsx entity.name.function.tsx

3447 push:

3032 push:

3448 - meta_scope: meta.var-single-variable.expr.tsx

3033 - meta_scope: meta.var-single-variable.expr.tsx

3449− - match: '(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(of|in)\s+))'

3034+ - match: '(?=$|^|[;,=}]|(\s+(of|in)\s+))'

3450 pop: true

3035 pop: true

3451 - include: var-single-variable-type-annotation

3036 - include: var-single-variable-type-annotation

3452 - match: "([_$[:alpha:]][_$[:alnum:]]*)"

3037 - match: "([_$[:alpha:]][_$[:alnum:]]*)"

@@ -3454,12 +3039,12 @@ contexts:

3454 1: meta.definition.variable.tsx variable.other.constant.tsx

3039 1: meta.definition.variable.tsx variable.other.constant.tsx

3455 push:

3040 push:

3456 - meta_scope: meta.var-single-variable.expr.tsx

3041 - meta_scope: meta.var-single-variable.expr.tsx

3457− - match: '(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(of|in)\s+))'

3042+ - match: '(?=$|^|[;,=}]|(\s+(of|in)\s+))'

3458 pop: true

3043 pop: true

3459 - include: var-single-variable-type-annotation

3044 - include: var-single-variable-type-annotation

3460 var-single-variable:

3045 var-single-variable:

3461 - match: |-

3046 - match: |-

3462− (?x)([_$[:alpha:]][_$[:alnum:]]*)(\!)?(?=\s*

3047+ (?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\s*

3463 # function assignment |

3048 # function assignment |

3464 (=\s*(

3049 (=\s*(

3465 ((async\s+)?(

3050 ((async\s+)?(

@@ -3468,11 +3053,11 @@ contexts:

3468 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

3053 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

3469 )) |

3054 )) |

3470 ((async\s*)?(

3055 ((async\s*)?(

3471− ((<\s*$)|([$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

3056+ ((<\s*$)|([\(]\s*([\{\[]\s*)?$)) |

3472 # sure shot arrow functions even if => is on new line

3057 # sure shot arrow functions even if => is on new line

3473 (

3058 (

3474− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

3059+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*>\s*)?

3475− [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

3060+ [(]\s*

3476 (

3061 (

3477 ([)]\s*:) | # ():

3062 ([)]\s*:) | # ():

3478 ((\.\.\.\s*)?[_$[:alpha:]][_$[:alnum:]]*\s*:) # [(]param: | [(]...param:

3063 ((\.\.\.\s*)?[_$[:alpha:]][_$[:alnum:]]*\s*:) # [(]param: | [(]...param:

@@ -3483,9 +3068,9 @@ contexts:

3483 ) |

3068 ) |

3484 # arrow function possible to detect only with => on same line

3069 # arrow function possible to detect only with => on same line

3485 (

3070 (

3486− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

3071+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*>\s*)? # typeparameters

3487− $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\) # parameters

3072+ $\s*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()]|(\(([^\($]|($[^\($]*\)))*\)))*)?\) # parameters

3488− (\s*:\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

3073+ (\s*:\s*([^<>]|\<[^<>]+\>|$[^\($]+\))+)? # return type

3489 \s*=> # arrow operator

3074 \s*=> # arrow operator

3490 )

3075 )

3491 ))

3076 ))

@@ -3502,20 +3087,19 @@ contexts:

3502 ))

3087 ))

3503 ))

3088 ))

3504 )) |

3089 )) |

3505− (:\s*(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))Function(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))) |

3090+ (:\s*((<\s*$)|([\(]\s*([\{\[]\s*)?$))) |

3506− (:\s*((<\s*$)|([$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*))))))) |

3091+ (:\s*(=>|($([^\($]|($[^\($]*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(

3507− (:\s*(=>|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(<[^<>]*>)|[^<>(),=])+=\s*(

3508 ((async\s+)?(

3092 ((async\s+)?(

3509 (function\s*[(<*]) |

3093 (function\s*[(<*]) |

3510 (function\s+) |

3094 (function\s+) |

3511 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

3095 ([_$[:alpha:]][_$[:alnum:]]*\s*=>)

3512 )) |

3096 )) |

3513 ((async\s*)?(

3097 ((async\s*)?(

3514− ((<\s*$)|([$]\s*((([\{\[]\s*)?$)|((\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})\s*((:\s*\{?$)|((\s*([^<>\($\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))|((\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])\s*((:\s*\[?$)|((\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+\s*)?=\s*)))))) |

3098+ ((<\s*$)|([\(]\s*([\{\[]\s*)?$)) |

3515 # sure shot arrow functions even if => is on new line

3099 # sure shot arrow functions even if => is on new line

3516 (

3100 (

3517− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)?

3101+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*>\s*)?

3518− [(]\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*

3102+ [(]\s*

3519 (

3103 (

3520 ([)]\s*:) | # ():

3104 ([)]\s*:) | # ():

3521 ((\.\.\.\s*)?[_$[:alpha:]][_$[:alnum:]]*\s*:) # [(]param: | [(]...param:

3105 ((\.\.\.\s*)?[_$[:alpha:]][_$[:alnum:]]*\s*:) # [(]param: | [(]...param:

@@ -3526,37 +3110,34 @@ contexts:

3526 ) |

3110 ) |

3527 # arrow function possible to detect only with => on same line

3111 # arrow function possible to detect only with => on same line

3528 (

3112 (

3529− (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|($([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=<>]|=[^<])*\>)*\>)*>\s*)? # typeparameters

3113+ (<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<]|\<\s*([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|($([^\($]|($[^\($]*\)))*\))|(\[([^\[\]]|(\[[^\[\]]*\]))*\]))([^=<>]|=[^<])*\>)*>\s*)? # typeparameters

3530− $\s*(\/\*([^\*]|(\*[^\/]))*\*\/\s*)*(([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()\'\"\`]|(\(([^\($]|($([^\($]|$[^\($]*\))*\)))*\))|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))*)?\) # parameters

3114+ $\s*(([_$[:alpha:]]|(\{([^\{\}]|(\{[^\{\}]*\}))*\})|(\[([^\[\]]|(\[[^\[\]]*\]))*\])|(\.\.\.\s*[_$[:alpha:]]))([^()]|(\(([^\($]|($[^\($]*\)))*\)))*)?\) # parameters

3531− (\s*:\s*([^<>\{\}]|\<([^<>]|\<([^<>]|\<[^<>]+\>)+\>)+\>|$[^\($]+\)|\{[^\{\}]+\})+)? # return type

3115+ (\s*:\s*([^<>]|\<[^<>]+\>|$[^\($]+\))+)? # return type

3532 \s*=> # arrow operator

3116 \s*=> # arrow operator

3533 )

3117 )

3534 ))

3118 ))

3535 )))

3119 )))

3536 captures:

3120 captures:

3537 1: meta.definition.variable.tsx entity.name.function.tsx

3121 1: meta.definition.variable.tsx entity.name.function.tsx

3538− 2: keyword.operator.definiteassignment.tsx

3539 push:

3122 push:

3540 - meta_scope: meta.var-single-variable.expr.tsx

3123 - meta_scope: meta.var-single-variable.expr.tsx

3541− - match: '(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(of|in)\s+))'

3124+ - match: '(?=$|^|[;,=}]|(\s+(of|in)\s+))'

3542 pop: true

3125 pop: true

3543 - include: var-single-variable-type-annotation

3126 - include: var-single-variable-type-annotation

3544− - match: '([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])(\!)?'

3127+ - match: "([[:upper:]][_$[:digit:][:upper:]]*)(?![_$[:alnum:]])"

3545 captures:

3128 captures:

3546 1: meta.definition.variable.tsx variable.other.constant.tsx

3129 1: meta.definition.variable.tsx variable.other.constant.tsx

3547− 2: keyword.operator.definiteassignment.tsx

3548 push:

3130 push:

3549 - meta_scope: meta.var-single-variable.expr.tsx

3131 - meta_scope: meta.var-single-variable.expr.tsx

3550− - match: '(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(of|in)\s+))'

3132+ - match: '(?=$|^|[;,=}]|(\s+(of|in)\s+))'

3551 pop: true

3133 pop: true

3552 - include: var-single-variable-type-annotation

3134 - include: var-single-variable-type-annotation

3553− - match: '([_$[:alpha:]][_$[:alnum:]]*)(\!)?'

3135+ - match: "([_$[:alpha:]][_$[:alnum:]]*)"

3554 captures:

3136 captures:

3555 1: meta.definition.variable.tsx variable.other.readwrite.tsx

3137 1: meta.definition.variable.tsx variable.other.readwrite.tsx

3556− 2: keyword.operator.definiteassignment.tsx

3557 push:

3138 push:

3558 - meta_scope: meta.var-single-variable.expr.tsx

3139 - meta_scope: meta.var-single-variable.expr.tsx

3559− - match: '(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(of|in)\s+))'

3140+ - match: '(?=$|^|[;,=}]|(\s+(of|in)\s+))'

3560 pop: true

3141 pop: true

3561 - include: var-single-variable-type-annotation

3142 - include: var-single-variable-type-annotation

3562 var-single-variable-type-annotation:

3143 var-single-variable-type-annotation:

@@ -3564,17 +3145,17 @@ contexts:

3564 - include: string

3145 - include: string

3565 - include: comment

3146 - include: comment

3566 variable-initializer:

3147 variable-initializer:

3567− - match: (?<!=|!)(=)(?!=)(?=\s*\S)(?!\s*.*=>\s*$)

3148+ - match: (?<!=|!)(=)(?!=)(?=\s*\S)

3568 captures:

3149 captures:

3569 1: keyword.operator.assignment.tsx

3150 1: keyword.operator.assignment.tsx

3570 push:

3151 push:

3571− - match: '(?=$|^|[,);}\]]|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(of|in)\s+))'

3152+ - match: '(?=$|^|[,);}\]])'

3572 pop: true

3153 pop: true

3573 - include: expression

3154 - include: expression

3574 - match: (?<!=|!)(=)(?!=)

3155 - match: (?<!=|!)(=)(?!=)

3575 captures:

3156 captures:

3576 1: keyword.operator.assignment.tsx

3157 1: keyword.operator.assignment.tsx

3577 push:

3158 push:

3578− - match: '(?=[,);}\]]|((?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(of|in)\s+))|(?=^\s*$)|(?<=\S)(?<!=)(?=\s*$)'

3159+ - match: '(?=[,);}\]])|(?=^\s*$)|(?<=\S)(?<!=)(?=\s*$)'

3579 pop: true

3160 pop: true

3580 - include: expression

3161 - include: expression

assets/syntaxes/02_Extra/Verilog → assets/syntaxes/Verilogrenamed

The content is the same.

assets/syntaxes/02_Extra/Verilog.sublime-syntax → assets/syntaxes/Verilog.sublime-syntaxrenamed

The content is the same.

assets/syntaxes/VimLnew file+1

Submodule changed.

assets/syntaxes/VimL.sublime-syntaxnew file+91

@@ -0,0 +1,91 @@

1+%YAML 1.2

2+---

3+# http://www.sublimetext.com/docs/3/syntax.html

4+name: VimL

5+file_extensions:

6+ - vim

7+ - .vimrc

8+scope: source.viml

9+contexts:

10+ main:

11+ - include: comment

12+ - include: string_quoted_double

13+ - include: string_quoted_single

14+ - include: string_regex

15+ - include: inline_comment

16+ - include: number_int

17+ - include: number_hex

18+ - include: keyword

19+ - include: support_function

20+ - include: support_variable

21+ - include: support_type

22+ - include: function_params

23+ - include: function_definition

24+ - include: function_call

25+ - include: function

26+ - include: variable

27+ - include: expr

28+ comment:

29+ - match: ^\s*".*$

30+ scope: comment.line.quotes.viml

31+ captures:

32+ 1: punctuation.definition.comment.vim

33+ expr:

34+ - match: (\|\||&&|==(\?|#)?|(!|>|<)=(#|\?)?|(=|!)~(#|\?)?|(>|<)(#|\?)is|isnot|\.|\*|\\|%)

35+ scope: storage.function.viml

36+ function:

38+ scope: storage.function.viml

39+ function_call:

40+ - match: '(([sgbwtl]|)?:?[0-9a-zA-Z_#]+)(?=\()'

41+ scope: support.function.any-method

42+ function_definition:

43+ - match: '^\s*(function)\s*!?\s+(?=(s:)?[0-9a-zA-Z_#]+\s*\()'

44+ captures:

45+ 1: storage.function.viml

46+ push:

47+ - meta_scope: meta.function.viml

48+ - match: (\()

49+ captures:

50+ 1: punctuation.definition.parameters.begin.viml

51+ pop: true

52+ - match: "(s:)?[0-9a-zA-Z_#]+"

53+ scope: entity.name.function.viml

54+ function_params:

55+ - match: '-\w+='

56+ scope: support.type.viml

57+ inline_comment:

58+ - match: '(?!\$)(")(?!\{).*$\n?'

59+ scope: comment.line.quotes.viml

60+ captures:

61+ 1: punctuation.definition.comment.vim

62+ keyword:

63+ - match: \b(if|while|for|try|return|throw|end(if|for|while|try)?|au(g|group)|else(if|)?|do|in|catch|finally|:)\b

64+ scope: keyword.control.viml

65+ number_hex:

66+ - match: "0x[0-9a-f]+"

67+ scope: constant.numeric.hex

68+ number_int:

69+ - match: '-?\d+'

70+ scope: constant.numeric.integer

71+ string_quoted_double:

72+ - match: '"(\\\\|\\"|\n[^\S\n]*\\|[^\n"])*"'

73+ scope: string.quoted.double.viml

74+ string_quoted_single:

75+ - match: '''(''''|\n[^\S\n]*\\|[^\n''])*'''

76+ scope: string.quoted.single.viml

77+ string_regex:

78+ - match: '/(\\\\|\\/|\n[^\S\n]*\\|[^\n/])*/'

79+ scope: string.regexp.viml

80+ support_function:

82+ scope: support.function.viml

83+ support_type:

84+ - match: <.*?>

85+ scope: support.type.viml

86+ support_variable:

88+ scope: support.variable.viml

89+ variable:

90+ - match: '([sSgGbBwWlLaAvV]:|@|$|&(?!&))\w*'

91+ scope: variable.other.viml

assets/syntaxes/02_Extra/hosts → assets/syntaxes/hostsrenamed

The content is the same.

assets/syntaxes/requirementstxtnew file+1

Submodule changed.

assets/syntaxes/requirementstxt.sublime-syntaxnew file+19

@@ -0,0 +1,19 @@

1+%YAML 1.2

2+---

3+# http://www.sublimetext.com/docs/3/syntax.html

4+name: requirements.txt

5+file_extensions:

6+ - requirements.txt

7+scope: source.requirementstxt

8+contexts:

9+ main:

10+ - match: (#).*$\n?

11+ scope: comment.line.requirementstxt

12+ captures:

13+ 1: punctuation.definition.comment.requirementstxt

14+ - match: '(?i)^[a-z0-9_\-\.]+'

15+ scope: string.package_name.requirementstxt

16+ - match: (?i)==|<|<=|>=|>

17+ scope: keyword.operator.logical.punctuation.requirementstxt

18+ - match: '(?i)\d+\.[\da-z\-_\.]*'

19+ scope: constant.numeric.verions.requirementstxt

assets/syntaxes/02_Extra/show-nonprintable.sublime-syntax → assets/syntaxes/show-nonprintable.sublime-syntaxrenamed+1−1

@@ -7,7 +7,7 @@ file_extensions:

7scope: whitespace

8contexts:

9 main:

10− - match: "·"

10+ - match: "•"

11 scope: support.function.show-nonprintable.space

12 - match: "├─*┤"

13 scope: constant.character.escape.show-nonprintable.tab

assets/syntaxes/ssh-confignew file+1

Submodule changed.

assets/syntaxes/02_Extra/varlink → assets/syntaxes/varlinkrenamed

The content is the same.

assets/themes.bin

Binary file not shown.

assets/themes/Coldarkdeleted−1

Submodule changed.

assets/themes/Solarizeddeleted−1

Submodule changed.

assets/themes/base16-256.tmTheme → assets/themes/ansi-dark.tmThemerenamed+22−69

@@ -3,22 +3,14 @@

3<plist version="1.0">

4 <dict>

5 <!--

6− Most base16 users should use the base16 theme. This theme, base16-256,

7− is for users who configure their terminal with a 256-color variant of a

8− base16 theme, and who use base16-shell. DO NOT use this theme simply

9− because your terminal supports 256 colors.

10−

11− base16: https://github.com/chriskempson/base16

12− base16-shell: https://github.com/chriskempson/base16-shell

13−

14 The colors in this theme are encoded as #RRGGBBAA where RR is an ANSI

6 The colors in this theme are encoded as #RRGGBBAA where RR is an ANSI

15− palette number from 00 to ff (the 256 terminal colors), and AA is the

7+ palette number from 00 to 0f, and AA is the special value 00 to indicate

16− special value 00 to indicate this encoding is being used.

8+ that this encoding is being used.

17 -->

9 -->

18 <key>author</key>

10 <key>author</key>

19 <string>Template: Chris Kempson, Scheme: Mitchell Kember</string>

11 <string>Template: Chris Kempson, Scheme: Mitchell Kember</string>

20 <key>name</key>

12 <key>name</key>

21− <string>Base16 256</string>

13+ <string>ANSI Dark</string>

22 <key>colorSpaceName</key>

14 <key>colorSpaceName</key>

23 <string>sRGB</string>

15 <string>sRGB</string>

24 <key>settings</key>

16 <key>settings</key>

@@ -33,15 +25,15 @@

33 <key>foreground</key>

25 <key>foreground</key>

34 <string>#07000000</string>

26 <string>#07000000</string>

35 <key>invisibles</key>

27 <key>invisibles</key>

36− <string>#08000000</string>

28+ <string>#07000000</string>

37 <key>lineHighlight</key>

29 <key>lineHighlight</key>

38− <string>#08000000</string>

30+ <string>#07000000</string>

39 <key>selection</key>

31 <key>selection</key>

40− <string>#13000000</string>

32+ <string>#07000000</string>

41 <key>gutter</key>

33 <key>gutter</key>

42− <string>#12000000</string>

34+ <string>#00000000</string>

43 <key>gutterForeground</key>

35 <key>gutterForeground</key>

44− <string>#08000000</string>

36+ <string>#07000000</string>

45 </dict>

37 </dict>

46 </dict>

38 </dict>

47 <dict>

39 <dict>

@@ -63,7 +55,7 @@

63 <key>settings</key>

55 <key>settings</key>

64 <dict>

56 <dict>

65 <key>foreground</key>

57 <key>foreground</key>

66− <string>#08000000</string>

58+ <string>#02000000</string>

67 </dict>

59 </dict>

68 </dict>

60 </dict>

69 <dict>

61 <dict>

@@ -140,7 +132,7 @@

140 <key>settings</key>

132 <key>settings</key>

141 <dict>

133 <dict>

142 <key>foreground</key>

134 <key>foreground</key>

143− <string>#11000000</string>

135+ <string>#06000000</string>

144 </dict>

136 </dict>

145 </dict>

137 </dict>

146 <dict>

138 <dict>

@@ -162,7 +154,7 @@

162 <key>settings</key>

154 <key>settings</key>

163 <dict>

155 <dict>

164 <key>foreground</key>

156 <key>foreground</key>

165− <string>#0f000000</string>

157+ <string>#07000000</string>

166 </dict>

158 </dict>

167 </dict>

159 </dict>

168 <dict>

160 <dict>

@@ -217,7 +209,7 @@

217 <key>settings</key>

209 <key>settings</key>

218 <dict>

210 <dict>

219 <key>foreground</key>

211 <key>foreground</key>

220− <string>#10000000</string>

212+ <string>#03000000</string>

221 </dict>

213 </dict>

222 </dict>

214 </dict>

223 <dict>

215 <dict>

@@ -228,7 +220,7 @@

228 <key>settings</key>

220 <key>settings</key>

229 <dict>

221 <dict>

230 <key>foreground</key>

222 <key>foreground</key>

231− <string>#10000000</string>

223+ <string>#03000000</string>

232 </dict>

224 </dict>

233 </dict>

225 </dict>

234 <dict>

226 <dict>

@@ -239,7 +231,7 @@

239 <key>settings</key>

231 <key>settings</key>

240 <dict>

232 <dict>

241 <key>foreground</key>

233 <key>foreground</key>

242− <string>#10000000</string>

234+ <string>#03000000</string>

243 </dict>

235 </dict>

244 </dict>

236 </dict>

245 <dict>

237 <dict>

@@ -250,7 +242,7 @@

250 <key>settings</key>

242 <key>settings</key>

251 <dict>

243 <dict>

252 <key>foreground</key>

244 <key>foreground</key>

253− <string>#10000000</string>

245+ <string>#03000000</string>

254 </dict>

246 </dict>

255 </dict>

247 </dict>

256 <dict>

248 <dict>

@@ -272,7 +264,7 @@

272 <key>settings</key>

264 <key>settings</key>

273 <dict>

265 <dict>

274 <key>foreground</key>

266 <key>foreground</key>

275− <string>#10000000</string>

267+ <string>#03000000</string>

276 </dict>

268 </dict>

277 </dict>

269 </dict>

278 <dict>

270 <dict>

@@ -305,7 +297,7 @@

305 <key>settings</key>

297 <key>settings</key>

306 <dict>

298 <dict>

307 <key>foreground</key>

299 <key>foreground</key>

308− <string>#10000000</string>

300+ <string>#03000000</string>

309 </dict>

301 </dict>

310 </dict>

302 </dict>

311 <dict>

303 <dict>

@@ -329,7 +321,7 @@

329 <key>settings</key>

321 <key>settings</key>

330 <dict>

322 <dict>

331 <key>foreground</key>

323 <key>foreground</key>

332− <string>#10000000</string>

324+ <string>#03000000</string>

333 </dict>

325 </dict>

334 </dict>

326 </dict>

335 <dict>

327 <dict>

@@ -388,7 +380,7 @@

388 <key>settings</key>

380 <key>settings</key>

389 <dict>

381 <dict>

390 <key>foreground</key>

382 <key>foreground</key>

391− <string>#10000000</string>

383+ <string>#03000000</string>

392 </dict>

384 </dict>

393 </dict>

385 </dict>

394 <dict>

386 <dict>

@@ -399,20 +391,7 @@

399 <key>settings</key>

391 <key>settings</key>

400 <dict>

392 <dict>

401 <key>foreground</key>

393 <key>foreground</key>

402− <string>#10000000</string>

394+ <string>#03000000</string>

403− </dict>

404− </dict>

405− <dict>

406− <key>name</key>

407− <string>Separator</string>

408− <key>scope</key>

409− <string>meta.separator</string>

410− <key>settings</key>

411− <dict>

412− <key>background</key>

413− <string>#13000000</string>

414− <key>foreground</key>

415− <string>#07000000</string>

416 </dict>

395 </dict>

417 </dict>

396 </dict>

418 <dict>

397 <dict>

@@ -502,7 +481,7 @@

502 <key>background</key>

481 <key>background</key>

503 <string>#01000000</string>

482 <string>#01000000</string>

504 <key>foreground</key>

483 <key>foreground</key>

505− <string>#0f000000</string>

484+ <string>#07000000</string>

506 </dict>

485 </dict>

507 </dict>

486 </dict>

508 <dict>

487 <dict>

@@ -513,37 +492,11 @@

513 <key>settings</key>

492 <key>settings</key>

514 <dict>

493 <dict>

515 <key>background</key>

494 <key>background</key>

516− <string>#10000000</string>

495+ <string>#03000000</string>

517 <key>foreground</key>

496 <key>foreground</key>

518 <string>#00000000</string>

497 <string>#00000000</string>

519 </dict>

498 </dict>

520 </dict>

499 </dict>

521− <dict>

522− <key>name</key>

523− <string>Deprecated</string>

524− <key>scope</key>

525− <string>invalid.deprecated</string>

526− <key>settings</key>

527− <dict>

528− <key>background</key>

529− <string>#11000000</string>

530− <key>foreground</key>

531− <string>#0f000000</string>

532− </dict>

533− </dict>

534− <dict>

535− <key>name</key>

536− <string>Unimplemented</string>

537− <key>scope</key>

538− <string>invalid.unimplemented</string>

539− <key>settings</key>

540− <dict>

541− <key>background</key>

542− <string>#08000000</string>

543− <key>foreground</key>

544− <string>#0f000000</string>

545− </dict>

546− </dict>

547 </array>

500 </array>

548 <key>uuid</key>

501 <key>uuid</key>

549 <string>uuid</string>

502 <string>uuid</string>

assets/themes/ansi.tmTheme → assets/themes/ansi-light.tmThemerenamed+87−13

@@ -3,14 +3,14 @@

3<plist version="1.0">

4 <dict>

5 <!--

6− The colors in this theme are encoded as #RRGGBBAA where:

6+ The colors in this theme are encoded as #RRGGBBAA where RR is an ANSI

7− * If AA is 00, then RR is an ANSI palette number from 00 to 07.

7+ palette number from 00 to 0f, and AA is the special value 00 to indicate

8− * If AA is 01, the terminal's default fg/bg color is used.

8+ that this encoding is being used.

9 -->

10 <key>author</key>

11 <string>Template: Chris Kempson, Scheme: Mitchell Kember</string>

12 <key>name</key>

13− <string>ANSI</string>

13+ <string>ANSI Light</string>

14 <key>colorSpaceName</key>

15 <string>sRGB</string>

16 <key>settings</key>

@@ -19,17 +19,32 @@

19 <key>settings</key>

20 <dict>

21 <key>background</key>

22− <string>#00000001</string>

22+ <string>#07000000</string>

23− <key>foreground</key>

23+ <key>caret</key>

24− <string>#00000001</string>

24+ <string>#00000000</string>

25− <!--

25+ <key>foreground</key>

26− Explicitly set the gutter color since bat falls back to a

26+ <string>#00000000</string>

27− hardcoded DEFAULT_GUTTER_COLOR otherwise.

27+ <key>invisibles</key>

28− -->

28+ <string>#00000000</string>

29+ <key>lineHighlight</key>

30+ <string>#00000000</string>

31+ <key>selection</key>

32+ <string>#00000000</string>

29 <key>gutter</key>

33 <key>gutter</key>

30− <string>#00000001</string>

34+ <string>#07000000</string>

31 <key>gutterForeground</key>

35 <key>gutterForeground</key>

32− <string>#00000001</string>

36+ <string>#00000000</string>

37+ </dict>

38+ </dict>

39+ <dict>

40+ <key>name</key>

41+ <string>Text</string>

42+ <key>scope</key>

43+ <string>variable.parameter.function</string>

44+ <key>settings</key>

45+ <dict>

46+ <key>foreground</key>

47+ <string>#00000000</string>

33 </dict>

48 </dict>

34 </dict>

49 </dict>

35 <dict>

50 <dict>

@@ -43,6 +58,39 @@

43 <string>#02000000</string>

58 <string>#02000000</string>

44 </dict>

59 </dict>

45 </dict>

60 </dict>

61+ <dict>

62+ <key>name</key>

63+ <string>Punctuation</string>

64+ <key>scope</key>

65+ <string>punctuation.definition.string, punctuation.definition.variable, punctuation.definition.string, punctuation.definition.parameters, punctuation.definition.string, punctuation.definition.array</string>

66+ <key>settings</key>

67+ <dict>

68+ <key>foreground</key>

69+ <string>#00000000</string>

70+ </dict>

71+ </dict>

72+ <dict>

73+ <key>name</key>

74+ <string>Delimiters</string>

75+ <key>scope</key>

76+ <string>none</string>

77+ <key>settings</key>

78+ <dict>

79+ <key>foreground</key>

80+ <string>#00000000</string>

81+ </dict>

82+ </dict>

83+ <dict>

84+ <key>name</key>

85+ <string>Operators</string>

86+ <key>scope</key>

87+ <string>keyword.operator</string>

88+ <key>settings</key>

89+ <dict>

90+ <key>foreground</key>

91+ <string>#00000000</string>

92+ </dict>

93+ </dict>

46 <dict>

94 <dict>

47 <key>name</key>

95 <key>name</key>

48 <string>Keywords</string>

96 <string>Keywords</string>

@@ -54,6 +102,17 @@

54 <string>#05000000</string>

102 <string>#05000000</string>

55 </dict>

103 </dict>

56 </dict>

104 </dict>

105+ <dict>

106+ <key>name</key>

107+ <string>Variables</string>

108+ <key>scope</key>

109+ <string>variable</string>

110+ <key>settings</key>

111+ <dict>

112+ <key>foreground</key>

113+ <string>#00000000</string>

114+ </dict>

115+ </dict>

57 <dict>

116 <dict>

58 <key>name</key>

117 <key>name</key>

59 <string>Functions</string>

118 <string>Functions</string>

@@ -87,6 +146,17 @@

87 <string>#03000000</string>

146 <string>#03000000</string>

88 </dict>

147 </dict>

89 </dict>

148 </dict>

149+ <dict>

150+ <key>name</key>

151+ <string>Classes</string>

152+ <key>scope</key>

153+ <string>meta.class</string>

154+ <key>settings</key>

155+ <dict>

156+ <key>foreground</key>

157+ <string>#00000000</string>

158+ </dict>

159+ </dict>

90 <dict>

160 <dict>

91 <key>name</key>

161 <key>name</key>

92 <string>Methods</string>

162 <string>Methods</string>

@@ -410,6 +480,8 @@

410 <dict>

480 <dict>

411 <key>background</key>

481 <key>background</key>

412 <string>#01000000</string>

482 <string>#01000000</string>

483+ <key>foreground</key>

484+ <string>#00000000</string>

413 </dict>

485 </dict>

414 </dict>

486 </dict>

415 <dict>

487 <dict>

@@ -421,6 +493,8 @@

421 <dict>

493 <dict>

422 <key>background</key>

494 <key>background</key>

423 <string>#03000000</string>

495 <string>#03000000</string>

496+ <key>foreground</key>

497+ <string>#07000000</string>

424 </dict>

498 </dict>

425 </dict>

499 </dict>

426 </array>

500 </array>

assets/themes/base16.tmTheme+2−9

@@ -3,16 +3,9 @@

3<plist version="1.0">

4 <dict>

5 <!--

6− This theme is meant for users who configure their terminal with a base16

7− color theme. If you use a 256-color variant along with base16-shell, use

8− the bat theme base16-256 instead.

9−

10− base16: https://github.com/chriskempson/base16

11− base16-shell: https://github.com/chriskempson/base16-shell

12−

13 The colors in this theme are encoded as #RRGGBBAA where RR is an ANSI

6 The colors in this theme are encoded as #RRGGBBAA where RR is an ANSI

14− palette number from 00 to 0f (the 8 colors and their bright versions),

7+ palette number from 00 to 0f, and AA is the special value 00 to indicate

15− and AA is the special value 00 to indicate this encoding is being used.

8+ that this encoding is being used.

16 -->

9 -->

17 <key>author</key>

10 <key>author</key>

18 <string>Template: Chris Kempson, Scheme: Mitchell Kember</string>

11 <string>Template: Chris Kempson, Scheme: Mitchell Kember</string>

assets/themes/dracula-sublime+1−1

Submodule changed.

assets/themes/gruvboxdeleted−1

Submodule changed.

assets/themes/onehalf+1−1

Submodule changed.

assets/themes/visual-studio-dark-plusdeleted−1

Submodule changed.

assets/themes/zenburn+1−1

Submodule changed.

build.rs+55−68

@@ -1,78 +1,65 @@

1// TODO: Re-enable generation of shell completion files (below) when clap 3 is out.

2// For more details, see https://github.com/sharkdp/bat/issues/372

3

4−// For bat-as-a-library, no build script is required. The build script is for

4+#[macro_use]

5−// the manpage and completions, which are only relevant to the bat application.

5+extern crate lazy_static;

6−#[cfg(not(feature = "application"))]

6+extern crate liquid;

7−fn main() {}

7+

8−

8+use std::error::Error;

9−#[cfg(feature = "application")]

9+use std::fs;

10−fn main() -> Result<(), Box<dyn std::error::Error>> {

10+

11− use std::collections::HashMap;

11+// Read environment variables.

12− use std::error::Error;

12+lazy_static! {

13− use std::fs;

13+ pub static ref PROJECT_NAME: &'static str = option_env!("PROJECT_NAME").unwrap_or("bat");

14− use std::path::Path;

14+ pub static ref PROJECT_VERSION: &'static str = option_env!("CARGO_PKG_VERSION").unwrap();

15−

15+ pub static ref EXECUTABLE_NAME: &'static str = option_env!("PROJECT_EXECUTABLE")

16− // Read environment variables.

16+ .or(option_env!("PROJECT_NAME"))

17− let project_name = option_env!("PROJECT_NAME").unwrap_or("bat");

17+ .unwrap_or("bat");

18− let executable_name = option_env!("PROJECT_EXECUTABLE").unwrap_or(project_name);

18+}

19− let executable_name_uppercase = executable_name.to_uppercase();

20− static PROJECT_VERSION: &str = env!("CARGO_PKG_VERSION");

21−

22− /// Generates a file from a template.

23− fn template(

24− variables: &HashMap<&str, &str>,

25− in_file: &str,

26− out_file: impl AsRef<Path>,

27− ) -> Result<(), Box<dyn Error>> {

28− let mut content = fs::read_to_string(in_file)?;

29−

30− for (variable_name, value) in variables {

31− // Replace {{variable_name}} by the value

32− let pattern = format!("{{{{{variable_name}}}}}", variable_name = variable_name);

33− content = content.replace(&pattern, value);

34− }

35−

36− fs::write(out_file, content)?;

37− Ok(())

38− }

39−

40− let mut variables = HashMap::new();

41− variables.insert("PROJECT_NAME", project_name);

42− variables.insert("PROJECT_EXECUTABLE", executable_name);

43− variables.insert("PROJECT_EXECUTABLE_UPPERCASE", &executable_name_uppercase);

44− variables.insert("PROJECT_VERSION", PROJECT_VERSION);

45−

46− let out_dir_env = std::env::var_os("OUT_DIR").expect("OUT_DIR to be set in build.rs");

47− let out_dir = Path::new(&out_dir_env);

48−

49− fs::create_dir_all(out_dir.join("assets/manual")).unwrap();

50− fs::create_dir_all(out_dir.join("assets/completions")).unwrap();

51

19

52− template(

20+fn init_template() -> liquid::value::Object {

53− &variables,

21+ let mut globals = liquid::value::Object::new();

54− "assets/manual/bat.1.in",

22+

55− out_dir.join("assets/manual/bat.1"),

23+ globals.insert(

56− )?;

24+ "PROJECT_NAME".into(),

57− template(

25+ liquid::value::Value::scalar(PROJECT_NAME.to_owned()),

58− &variables,

26+ );

59− "assets/completions/bat.bash.in",

27+

60− out_dir.join("assets/completions/bat.bash"),

28+ globals.insert(

61− )?;

29+ "PROJECT_EXECUTABLE".into(),

30+ liquid::value::Value::scalar(EXECUTABLE_NAME.to_owned()),

31+ );

32+

33+ globals.insert(

34+ "PROJECT_VERSION".into(),

35+ liquid::value::Value::scalar(PROJECT_VERSION.to_owned()),

36+ );

37+

38+ globals

39+}

40+

41+/// Generates a file from a liquid template.

42+fn template(

43+ variables: &liquid::value::Object,

44+ in_file: &str,

45+ out_file: &str,

46+) -> Result<(), Box<dyn Error>> {

47+ let template = liquid::ParserBuilder::with_liquid()

48+ .build()?

49+ .parse(&fs::read_to_string(in_file)?)?;

50+

51+ fs::write(out_file, template.render(variables)?)?;

52+ Ok(())

53+}

54+

55+fn main() -> Result<(), Box<dyn Error>> {

56+ let variables = init_template();

57+

58+ template(&variables, "assets/manual/bat.1.in", "assets/manual/bat.1")?;

62 template(

59 template(

63 &variables,

60 &variables,

64 "assets/completions/bat.fish.in",

61 "assets/completions/bat.fish.in",

65− out_dir.join("assets/completions/bat.fish"),

62+ "assets/completions/bat.fish",

66− )?;

67− template(

68− &variables,

69− "assets/completions/_bat.ps1.in",

70− out_dir.join("assets/completions/_bat.ps1"),

71− )?;

72− template(

73− &variables,

74− "assets/completions/bat.zsh.in",

75− out_dir.join("assets/completions/bat.zsh"),

76 )?;

63 )?;

77

64

78 Ok(())

65 Ok(())

diagnostics/.gitattributes → ci/.gitattributesrenamed

The content is the same.

ci/before_deploy.bashnew file+187

@@ -0,0 +1,187 @@

1+#!/usr/bin/env bash

2+# Building and packaging for release

3+set -ex

4+

5+# Ensure environment variables exist.

6+if [[ -z "$PROJECT_NAME" ]]; then

7+ export PROJECT_NAME="bat"

8+fi

9+

10+build() {

11+ cargo build --bins --target "$TARGET" --release --verbose

12+}

13+

14+pack() {

15+ local tempdir

16+ local out_dir

17+ local package_name

18+ local gcc_prefix

19+

20+ tempdir=$(mktemp -d 2>/dev/null || mktemp -d -t tmp)

21+ out_dir=$(pwd)

22+ package_name="$PROJECT_NAME-$TRAVIS_TAG-$TARGET"

23+

24+ if [[ $TARGET == "arm-unknown-linux-gnueabihf" ]]; then

25+ gcc_prefix="arm-linux-gnueabihf-"

26+ elif [[ $TARGET == "aarch64-unknown-linux-gnu" ]]; then

27+ gcc_prefix="aarch64-linux-gnu-"

28+ else

29+ gcc_prefix=""

30+ fi

31+

32+ # create a "staging" directory

33+ mkdir "$tempdir/$package_name"

34+ mkdir "$tempdir/$package_name/autocomplete"

35+

36+ # copying the main binary

37+ cp "target/$TARGET/release/$PROJECT_NAME" "$tempdir/$package_name/"

38+ "${gcc_prefix}"strip "$tempdir/$package_name/$PROJECT_NAME"

39+

40+ # manpage, readme and license

41+ cp "assets/manual/bat.1" "$tempdir/$package_name/$PROJECT_NAME.1"

42+ cp README.md "$tempdir/$package_name"

43+ cp LICENSE-MIT "$tempdir/$package_name"

44+ cp LICENSE-APACHE "$tempdir/$package_name"

45+

46+ # various autocomplete

47+ # TODO: disabled for now, see issue #372

48+ # cp target/"$TARGET"/release/build/"$PROJECT_NAME"-*/out/"$PROJECT_NAME".bash "$tempdir/$package_name/autocomplete/${PROJECT_NAME}.bash-completion"

49+ # cp target/"$TARGET"/release/build/"$PROJECT_NAME"-*/out/"$PROJECT_NAME".fish "$tempdir/$package_name/autocomplete"

50+ cp "assets/completions/bat.fish" "$tempdir/$package_name/autocomplete/$PROJECT_NAME.fish"

51+ # cp target/"$TARGET"/release/build/"$PROJECT_NAME"-*/out/_"$PROJECT_NAME" "$tempdir/$package_name/autocomplete"

52+

53+ # archiving

54+ pushd "$tempdir"

55+ tar czf "$out_dir/$package_name.tar.gz" "$package_name"/*

56+ popd

57+ rm -r "$tempdir"

58+}

59+

60+make_deb() {

61+ local tempdir

62+ local architecture

63+ local version

64+ local dpkgname

65+ local conflictname

66+ local gcc_prefix

67+ local homepage

68+ local maintainer

69+

70+ homepage="https://github.com/sharkdp/bat"

71+ maintainer="David Peter <mail@david-peter.de>"

72+

73+ case $TARGET in

74+ x86_64*)

75+ architecture=amd64

76+ gcc_prefix=""

77+ ;;

78+ i686*)

79+ architecture=i386

80+ gcc_prefix=""

81+ ;;

82+ aarch64*)

83+ architecture=arm64

84+ gcc_prefix="aarch64-linux-gnu-"

85+ ;;

86+ arm*hf)

87+ architecture=armhf

88+ gcc_prefix="arm-linux-gnueabihf-"

89+ ;;

90+ *)

91+ echo "make_deb: skipping target '${TARGET}'" >&2

92+ return 0

93+ ;;

94+ esac

95+ version=${TRAVIS_TAG#v}

96+ if [[ $TARGET = *musl* ]]; then

97+ dpkgname=$PROJECT_NAME-musl

98+ conflictname=$PROJECT_NAME

99+ else

100+ dpkgname=$PROJECT_NAME

101+ conflictname=$PROJECT_NAME-musl

102+ fi

103+

104+ tempdir=$(mktemp -d 2>/dev/null || mktemp -d -t tmp)

105+

106+ # copy the main binary

107+ install -Dm755 "target/$TARGET/release/$PROJECT_NAME" "$tempdir/usr/bin/$PROJECT_NAME"

108+ "${gcc_prefix}"strip "$tempdir/usr/bin/$PROJECT_NAME"

109+

110+ # manpage

111+ install -Dm644 "assets/manual/bat.1" "$tempdir/usr/share/man/man1/$PROJECT_NAME.1"

112+ gzip --best "$tempdir/usr/share/man/man1/$PROJECT_NAME.1"

113+

114+ # completions

115+ install -Dm644 "assets/completions/bat.fish" "$tempdir/usr/share/fish/completions/$PROJECT_NAME.fish"

116+

117+ # readme and license

118+ install -Dm644 README.md "$tempdir/usr/share/doc/$PROJECT_NAME/README.md"

119+ install -Dm644 LICENSE-MIT "$tempdir/usr/share/doc/$PROJECT_NAME/LICENSE-MIT"

120+ install -Dm644 LICENSE-APACHE "$tempdir/usr/share/doc/$PROJECT_NAME/LICENSE-APACHE"

121+ cat > "$tempdir/usr/share/doc/$PROJECT_NAME/copyright" <<EOF

122+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/

123+Upstream-Name: $PROJECT_NAME

124+Source: $homepage

125+

126+Files: *

127+Copyright: $maintainer

128+License: Apache-2.0 or MIT

129+

130+License: Apache-2.0

131+ On Debian systems, the complete text of the Apache-2.0 can be found in the

132+ file /usr/share/common-licenses/Apache-2.0.

133+

134+License: MIT

135+ Permission is hereby granted, free of charge, to any

136+ person obtaining a copy of this software and associated

137+ documentation files (the "Software"), to deal in the

138+ Software without restriction, including without

139+ limitation the rights to use, copy, modify, merge,

140+ publish, distribute, sublicense, and/or sell copies of

141+ the Software, and to permit persons to whom the Software

142+ is furnished to do so, subject to the following

143+ conditions:

144+ .

145+ The above copyright notice and this permission notice

146+ shall be included in all copies or substantial portions

147+ of the Software.

148+ .

149+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF

150+ ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED

151+ TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A

152+ PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT

153+ SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

154+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

155+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR

156+ IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

157+ DEALINGS IN THE SOFTWARE.

158+EOF

159+

160+ # Control file

161+ mkdir "$tempdir/DEBIAN"

162+ cat > "$tempdir/DEBIAN/control" <<EOF

163+Package: $dpkgname

164+Version: $version

165+Section: utils

166+Priority: optional

167+Maintainer: David Peter <mail@david-peter.de>

168+Architecture: $architecture

169+Provides: $PROJECT_NAME

170+Conflicts: $conflictname

171+Description: A cat(1) clone with wings.

172+ A cat(1) clone with syntax highlighting and Git integration.

173+EOF

174+

175+ fakeroot dpkg-deb --build "$tempdir" "${dpkgname}_${version}_${architecture}.deb"

176+}

177+

178+

179+main() {

180+ build

181+ pack

182+ if [[ $TARGET = *linux* ]]; then

183+ make_deb

184+ fi

185+}

186+

187+main

ci/before_deploy.ps1new file+28

@@ -0,0 +1,28 @@

1+# This script takes care of packaging the build artifacts that will go in the

2+# release zipfile

3+

4+$SRC_DIR = $PWD.Path

5+$STAGE = [System.Guid]::NewGuid().ToString()

6+

7+Set-Location $ENV:Temp

8+New-Item -Type Directory -Name $STAGE

9+Set-Location $STAGE

10+

11+$ZIP = "$SRC_DIR\$($Env:CRATE_NAME)-$($Env:APPVEYOR_REPO_TAG_NAME)-$($Env:TARGET).zip"

12+

13+Copy-Item "$SRC_DIR\target\release\bat.exe" '.\'

14+# TODO: disabled for now, see issue #372

15+# Copy-Item $SRC_DIR\target\release\build\bat-*\out\_bat.ps1 '.\'

16+

17+# readme and license

18+Copy-Item $SRC_DIR\README.md '.\'

19+Copy-Item $SRC_DIR\LICENSE-MIT '.\'

20+Copy-Item $SRC_DIR\LICENSE-APACHE '.\'

21+

22+7z a "$ZIP" *

23+

24+Push-AppveyorArtifact "$ZIP"

25+

26+Set-Location ..

27+Remove-Item $STAGE -Force -Recurse

28+Set-Location $SRC_DIR

ci/before_install.bashnew file+38

@@ -0,0 +1,38 @@

1+#!/usr/bin/env bash

2+

3+set -ex

4+

5+if [ "$TRAVIS_OS_NAME" != linux ]; then

6+ exit 0

7+fi

8+

9+sudo apt-get update

10+

11+# needed for musl targets

12+sudo apt-get install -y musl-tools

13+

14+# needed to build deb packages

15+sudo apt-get install -y fakeroot

16+

17+# needed for i686 linux gnu target

18+if [[ $TARGET == i686-unknown-linux-gnu ]]; then

19+ sudo apt-get install -y gcc-multilib

20+fi

21+

22+# needed for cross-compiling for arm

23+if [[ $TARGET == arm-unknown-linux-gnueabihf ]]; then

24+ sudo apt-get install -y \

25+ gcc-4.8-arm-linux-gnueabihf \

26+ binutils-arm-linux-gnueabihf \

27+ libc6-armhf-cross \

28+ libc6-dev-armhf-cross

29+fi

30+

31+# needed for cross-compiling for arm64

32+if [[ $TARGET == aarch64-unknown-linux-gnu ]]; then

33+ sudo apt-get install -y \

34+ gcc-4.8-aarch64-linux-gnu \

35+ binutils-aarch64-linux-gnu \

36+ gcc-aarch64-linux-gnu \

37+ libc6-dev-arm64-cross

38+fi

ci/script.bashnew file+14

@@ -0,0 +1,14 @@

1+#!/usr/bin/env bash

2+

3+set -ex

4+

5+# Incorporate TARGET env var to the build and test process

6+cargo build --target "$TARGET" --verbose

7+

8+# We cannot run arm executables on linux

9+if [[ $TARGET != arm-unknown-linux-gnueabihf ]] && [[ $TARGET != aarch64-unknown-linux-gnu ]]; then

10+ cargo test --target "$TARGET" --verbose

11+

12+ # Run 'bat' on its own source code and the README

13+ cargo run --target "$TARGET" -- src/bin/bat/main.rs README.md --paging=never

14+fi

diagnostics/info.shdeleted−261

@@ -1,261 +0,0 @@

1−#!/usr/bin/env bash

2−_modules=('system' 'bat' 'bat_config' 'bat_wrapper' 'bat_wrapper_function' 'tool')

3−_modules_consented=()

4−

5−set -o pipefail

6−

7−export LC_ALL=C

8−export LANG=C

9−

10−BAT="bat"

11−if ! command -v bat &>/dev/null; then

12− if command -v batcat &> /dev/null; then

13− BAT="batcat"

14− else

15− tput setaf 1

16− printf "%s\n%s\n" \

17− "Unable to find a bat executable on your PATH." \

18− "Please ensure that 'bat' exists and is not named something else."

19− tput sgr0

20− exit 1

21− fi

22−fi

23−

24−# -----------------------------------------------------------------------------

25−# Modules:

26−# -----------------------------------------------------------------------------

27−

28−_bat_:description() {

29− _collects "Version information for 'bat'."

30− _collects "Custom syntaxes and themes for 'bat'."

31−}

32−

33−_bat_config_:description() {

34− _collects "The environment variables used by 'bat'."

35− _collects "The 'bat' configuration file."

36−}

37−

38−_bat_wrapper_:description() {

39− _collects "Any wrapper script used by 'bat'."

40−}

41−

42−_bat_wrapper_function_:description() {

43− _collects "The wrapper function surrounding 'bat' (if applicable)."

44−}

45−

46−_system_:description() {

47− _collects "Operating system name."

48− _collects "Operating system version."

49−}

50−

51−_tool_:description() {

52− _collects "Version information for 'less'."

53−}

54−

55−# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

56−

57−_bat_:run() {

58− _out "$BAT" --version

59− _out env | grep '^BAT_\|^PAGER='

60−

61− local cache_dir

62− cache_dir="$($BAT --cache-dir)"

63− if [[ -f "${cache_dir}/syntaxes.bin" ]]; then

64− _print_command "$BAT" "--list-languages"

65− echo "Found custom syntax set."

66− fi

67−

68− if [[ -f "${cache_dir}/themes.bin" ]]; then

69− _print_command "$BAT" "--list-themes"

70− echo "Found custom theme set."

71− fi

72−}

73−

74−_bat_config_:run() {

75− if [[ -f "$("$BAT" --config-file)" ]]; then

76− _out_fence cat "$("$BAT" --config-file)"

77− fi

78−}

79−

80−_bat_wrapper_:run() {

81− _bat_wrapper_:detect_wrapper() {

82− local bat="$1"

83− if file "$(command -v "${bat}")" | grep "text executable" &> /dev/null; then

84− _out_fence cat "$(command -v "${bat}")"

85− return

86− fi

87−

88− printf "\nNo wrapper script for '%s'.\n" "${bat}"

89− }

90−

91− _bat_wrapper_:detect_wrapper bat

92− if [[ "$BAT" != "bat" ]]; then

93− _bat_wrapper_:detect_wrapper "$BAT"

94− fi

95−}

96−

97−_bat_wrapper_function_:run() {

98− _bat_wrapper_function_:detect_wrapper() {

99− local command="$1"

100− case "$("$SHELL" --version | head -n 1)" in

101− *fish*)

102− if "$SHELL" --login -i -c "type ${command}" 2>&1 | grep 'function' &> /dev/null; then

103− _out_fence "$SHELL" --login -i -c "functions ${command}"

104− return

105− fi ;;

106−

107− *bash* | *zsh*)

108− local type

109− type="$("$SHELL" --login -i -c "type ${command}" 2>&1)"

110− if grep 'function' <<< "$type" &> /dev/null; then

111− _out_fence "$SHELL" --login -i -c "declare -f ${command}"

112− return

113− elif grep 'alias' <<< "$type" &> /dev/null; then

114− _out_fence "$SHELL" --login -i -c "type ${command}"

115− return

116− fi ;;

117−

118− *)

119− echo "Unable to determine if a wrapper function for '${command}' is set."

120− return ;;

121− esac

122− printf "\nNo wrapper function for '%s'.\n" "${command}"

123− }

124−

125− _bat_wrapper_function_:detect_wrapper bat

126− _bat_wrapper_function_:detect_wrapper cat

127− if [[ "$BAT" != "bat" ]]; then

128− _bat_wrapper_function_:detect_wrapper "$BAT"

129− fi

130−}

131−

132−_system_:run() {

133− _out uname -srm

134−

135− if command -v "sw_vers" &> /dev/null; then _out sw_vers; fi

136− if command -v "lsb_release" &> /dev/null; then _out lsb_release -a; fi

137−}

138−

139−_tool_:run() {

140− _out less --version | head -n1

141−}

142−

143−# -----------------------------------------------------------------------------

144−# Functions:

145−# -----------------------------------------------------------------------------

146−

147−_print_command() {

148− printf '\n**$' 1>&2

149− printf ' %s' "$@" 1>&2

150− printf '**\n' 1>&2

151−}

152−

153−_out() {

154− _print_command "$@"

155− "$@" 2>&1 | sed 's/$/ /'

156−}

157−

158−_out_fence() {

159− _print_command "$@"

160− printf '```\n' 1>&2

161− "$@" 2>&1

162− printf '```\n' 1>&2

163−}

164−

165−_tput() {

166− tput "$@" 1>&2 2> /dev/null

167−}

168−

169−_collects() {

170− printf " - %s\n" "$1" 1>&2

171−}

172−

173−_ask_module() {

174− _tput clear

175− _tput cup 0 0

176−

177− cat 1>&2 << EOF

178−--------------------------------------------------------------------------------

179−This script runs some harmless commands to collect information about your

180−system and bat configuration. It will give you a small preview of the commands

181−that will be run, and ask consent before running them. Once completed, it will

182−output a small report that you can review and copy into the issue description.

183−--------------------------------------------------------------------------------

184−EOF

185−

186− # Print description.

187− _tput setaf 3

188− printf "The following data will be collected:\n" 1>&2

189− _tput sgr0

190− "_$1_:description"

191− _tput sgr0

192−

193− # Print preview.

194− _tput setaf 3

195− printf "\nThe following commands will be run:\n" 1>&2

196− _tput sgr0

197− declare -f "_$1_:run" \

198− | sed 's/^ *//; s/;$//' \

199− | grep '^_out[^ ]* ' \

200− | sed 's/^_out[^ ]* //' \

201− | sed "s/\"\$BAT\"/$BAT/" 1>&2

202−

203− # Prompt

204− printf "\n" 1>&2

205− local response

206− while true; do

207− _tput cup "$(($( tput lines || echo 22) - 2))"

208− _tput el

209− read -er -p "Collect $(sed 's/_/ /' <<< "$1") data? [Y/n] " response

210− case "$response" in

211− Y | y | yes | '') return 0 ;;

212− N | n | no) return 1 ;;

213− *) continue ;;

214− esac

215− done

216−}

217−

218−_run_module() {

219− local module="$1"

220− printf "%s\n%s\n" "$module" "$(printf "%${#module}s" | tr ' ' '-')"

221− "_$1_:run"

222−}

223−

224−# -----------------------------------------------------------------------------

225−# Functions:

226−# -----------------------------------------------------------------------------

227−

228−# Tell the user if their executable isn't named "bat".

229−if [[ "$BAT" != "bat" ]] && [[ "$1" != '-y' ]]; then

230− trap '_tput rmcup; exit 1' INT

231− _tput smcup

232− _tput clear

233− _tput cup 0 0

234− _tput setaf 1

235− printf "The %s executable on your system is named '%s'.\n%s\n" "bat" "$BAT" \

236− "If your issue is related to installation, please check that this isn't the issue."

237− _tput sgr0

238− printf "Press any key to continue...\n"

239− read -rsn1

240− _tput rmcup

241−fi

242−

243−# Ask for consent.

244−if [[ "$1" == '-y' ]]; then

245− _modules_consented=("${_modules[@]}")

246−else

247− trap '_tput rmcup; exit 1' INT

248− _tput smcup

249− for _module in "${_modules[@]}"; do

250− if _ask_module "$_module"; then

251− _modules_consented+=("$_module")

252− fi

253− done

254− _tput rmcup

255−fi

256−

257−# Collect information.

258−for _module in "${_modules_consented[@]}"; do

259− _run_module "$_module" 2>&1

260− printf "\n"

261−done

doc/README-ja.md+110−309

@@ -1,59 +1,53 @@

1

2 <img src="logo-header.svg" alt="bat - a cat clone with wings">

3− <a href="https://github.com/sharkdp/bat/actions?query=workflow%3ACICD"><img src="https://github.com/sharkdp/bat/workflows/CICD/badge.svg" alt="Build Status"></a>

3+ <a href="https://travis-ci.org/sharkdp/bat"><img src="https://travis-ci.org/sharkdp/bat.svg?branch=master" alt="Build Status"></a>

4+ <a href="https://ci.appveyor.com/project/sharkdp/bat"><img src="https://ci.appveyor.com/api/projects/status/cptsmtbiwbnr2vhf?svg=true"></a>

4 <img src="https://img.shields.io/crates/l/bat.svg" alt="license">

5 <img src="https://img.shields.io/crates/l/bat.svg" alt="license">

5 <a href="https://crates.io/crates/bat"><img src="https://img.shields.io/crates/v/bat.svg?colorB=319e8c" alt="Version info"></a>

6 <a href="https://crates.io/crates/bat"><img src="https://img.shields.io/crates/v/bat.svg?colorB=319e8c" alt="Version info"></a>

6 シンタックスハイライトとGitとの連携機能付きの cat(1) クローン。

7 シンタックスハイライトとGitとの連携機能付きの cat(1) クローン。

7

8

8

9

9

10

10− <a href="#シンタックスハイライト">特徴</a> •

11+ <a href="#syntax-highlighting">特徴</a> •

11− <a href="#使い方">使い方</a> •

12+ <a href="#how-to-use">使い方</a> •

12− <a href="#インストール">インストール</a> •

13+ <a href="#installation">インストール</a> •

13− <a href="#カスタマイズ">カスタマイズ</a> •

14+ <a href="#customization">カスタマイズ</a> •

14− <a href="#プロジェクトの目標と既存の類似したOSS">プロジェクトの目標と既存の類似したOSS</a>

15+ <a href="#project-goals-and-alternatives">プロジェクトの目標と既存の類似したOSS</a> •

15− [<a href="../README.md">English</a>]

16+ 翻訳 [<a href="https://github.com/chinanf-boy/bat-zh">中文</a>][<a href="README-ja">日本文</a>]

16− [<a href="README-zh.md">中文</a>]

17− [日本語]

18− [<a href="README-ko.md">한국어</a>]

19− [<a href="README-ru.md">Русский</a>]

20

17

21

18

22### シンタックスハイライト

19### シンタックスハイライト

23

20

24−`bat` は多くのプログラミング言語やマークアップ言語の

21+`bat` は多くのプログラミング言語やマークアップ言語のシンタックスハイライトに対応しています。

25−シンタックスハイライトに対応しています:

26

22

27![Syntax highlighting example](https://imgur.com/rGsdnDe.png)

23![Syntax highlighting example](https://imgur.com/rGsdnDe.png)

28

24

29### Gitの統合

25### Gitの統合

30

26

31−`bat` は `git` とも連携しており、差分を表現する記号が表示されます

27+

32−（図の左端）:

28+`bat` は `git` とも連携しており、差分を表現する記号が表示されます（図の左端）:

33

29

34![Git integration example](https://i.imgur.com/2lSW4RE.png)

30![Git integration example](https://i.imgur.com/2lSW4RE.png)

35

31

36−### 印刷できない文字の表示

32+### 空白文字の可視化

37

33

38−`-A`/`--show-all` オプションをつけることで

34+`-A`/`--show-all` オプションをつけることで、空白文字を可視化できます:

39−印刷できない文字を可視化できます:

40

35

41![Non-printable character example](https://i.imgur.com/WndGp9H.png)

36![Non-printable character example](https://i.imgur.com/WndGp9H.png)

42

37

43−### 自動ページング

38+### 自動呼び出し

44

39

45−出力が1つの画面に対して大きすぎる場合、`bat` は自身の出力をページャー(例えば `less`) にパイプで繋げます。

40+出力が1つの画面に対して大きすぎる場合、`bat` は自身の出力を `less` にパイプで繋げることが可能です。

46

41

47### ファイルの連結

42### ファイルの連結

48

43

49−あなたはさらにファイルを連結させるために使うことも可能です:wink:。

44+あなたはさらにファイルを連結させるに使うことも可能です:wink:。

50−`bat` は非対話型のターミナルを検出すると(すなわち他のプロセスにパイプしたりファイル出力していると)、

45+`bat` は非対話型のターミナルを検出すると、いつでも `cat` の完全互換として振る舞い、

51−`bat` は `cat` の完全互換として振る舞い、

52プレーンなファイルを表示します。

46プレーンなファイルを表示します。

53

47

54## 使い方

48## 使い方

55

49

56−単一のファイルを表示させたい場合

50+単一のファイルを表示させたい

57

51

58```bash

52```bash

59> bat README.md

53> bat README.md

@@ -65,9 +59,7 @@

65> bat src/*.rs

59> bat src/*.rs

66```

60```

67

61

68−標準入力から自動的に構文を決定させたい場合(ハイライトされるのは、

62+標準入力から自動的に構文を決定させたい場合

69−たいていは `#!/bin/sh` のようなシバンを利用して、

70−ファイルの一行目から構文を決定できる場合のみです)

71

63

72```bash

64```bash

73> curl -s https://sh.rustup.rs | bat

65> curl -s https://sh.rustup.rs | bat

@@ -96,243 +88,117 @@ bat -n main.rs # show line numbers (only)

96bat f - g # output 'f', then stdin, then 'g'.

88bat f - g # output 'f', then stdin, then 'g'.

97```

89```

98

90

99−### 他のツールとの統合

100−

101−#### `fzf`

102−

103−[`fzf`](https://github.com/junegunn/fzf) のプレビューウィンドウに `bat` を使用できます。

104−その場合、`bat` の `--color=always` オプションを用いてカラー出力を強制しなければなりません。

105−また、`--line-range` オプションを用いることで巨大なファイルの読み込み時間を制限できます:

106−```bash

107−fzf --preview 'bat --color=always --style=numbers --line-range=:500 {}'

108−```

109−

110−詳しくは [`fzf` の `README`](https://github.com/junegunn/fzf#preview-window) を参照してください。

111−

112−#### `find` or `fd`

113−

114−`find` の `-exec` オプションを使用して、`bat` ですべての検索結果をプレビューできます:

115−```bash

116−find … -exec bat {} +

117−```

118−

119−[`fd`](https://github.com/sharkdp/fd) を使用している場合は、`-X` /`-exec-batch` オプションを使用して同じことを行うことができます:

120−```bash

121−fd … -X bat

122−```

123−

124−#### `ripgrep`

125−

126−[`batgrep`](https://github.com/eth-p/bat-extras/blob/master/doc/batgrep.md) では、[`ripgrep`](https://github.com/BurntSushi/ripgrep) 検索結果のプリンターとして `bat` を使用できます。

127−

128−```bash

129−batgrep needle src/

130−```

131−

132−#### `tail -f`

133−

134−`bat` を `tail -f` と組み合わせて、構文強調表示を使用して特定のファイルを継続的に監視できます。

135−```bash

136−tail -f /var/log/pacman.log | bat --paging=never -l log

137−```

138−注意事項：`tail -f`と組み合わせるには、ページングをオフにしなければなりません。また、この場合は構文が自動検出されないため、明示的に指定（`-l log`）しています。

139−

140−#### `git`

141−

142−`bat` を `git show` と組み合わせて、

143−適切な構文強調表示を使用して特定のファイルの古いバージョンを表示できます:

144−```bash

145−git show v0.6.0:src/main.rs | bat -l rs

146−```

147−

148−差分内の構文強調表示は現在サポートされていないことに注意してください。これを探しているなら、[`delta`](https://github.com/dandavison/delta) をチェックしてください。

149−

150−#### `xclip`

151−

152−`bat` の出力の行番号と Git 変更マーカーにより、ファイルの内容をコピーするのが難しくなる場合があります。

153−これを防ぐには、`-p` / `-plain` オプションを使用して `bat` を呼び出すか、

154−単に出力を `xclip` にパイプします:

155−```bash

156−bat main.cpp | xclip

157−```

158−`bat` は出力がリダイレクトされていることを検出し、プレーンファイルの内容を出力します。

159−

160−#### `man`

161−

162−`bat` は `MANPAGER` 環境変数を設定することにより、

163−`man` の色付けページャーとして使用できます:

164−

165−```bash

166−export MANPAGER="sh -c 'col -bx | bat -l man -p'"

167−man 2 select

168−```

169−

170−フォーマットの問題が発生した場合は

171−`MANROFFOPT="-c"` を設定する必要もあります。

172−

173−これを新しいコマンドにバンドルしたい場合は [`batman`](https://github.com/eth-p/bat-extras/blob/master/doc/batman.md) も使用できます。

174−

175−[Manpage syntax](assets/syntaxes/Manpage.sublime-syntax) はこのリポジトリで開発されており、まだ作業が必要であることに注意してください。

176−

177−#### `prettier` / `shfmt` / `rustfmt`

178−

179−[`prettybat`](https://github.com/eth-p/bat-extras/blob/master/doc/prettybat.md) スクリプトは、コードをフォーマットし、`bat` で印刷するラッパーです。

180−

181−

182## インストール

91## インストール

183

92

184−[![Packaging status](https://repology.org/badge/vertical-allrepos/bat-cat.svg)](https://repology.org/project/bat-cat/versions)

93+### Ubuntu

185−

186−### On Ubuntu (`apt` を使用)

187*... や他のDebianベースのLinuxディストリビューション*

94*... や他のDebianベースのLinuxディストリビューション*

188

95

189−Ubuntu Eoan 19.10 または Debian 不安定版 sid 以降の [the Ubuntu `bat` package](https://packages.ubuntu.com/eoan/bat) または [the Debian `bat` package](https://packages.debian.org/sid/bat) からインストールできます:

96+最新の `.deb` パッケージを[こちら](https://github.com/sharkdp/bat/releases)からダウンロードして、インストールしてください:

190−

191−```bash

192−apt install bat

193−```

194−

195−`apt` を使用して `bat` をインストールした場合、実行可能ファイルの名前が `bat` ではなく `batcat` になることがあります([他のパッケージとの名前衝突のため](https://github.com/sharkdp/bat/issues/982))。`bat -> batcat` のシンボリックリンクまたはエイリアスを設定することで、実行可能ファイル名が異なることによる問題の発生を防ぎ、他のディストリビューションと一貫性を保てます。

196

97

197``` bash

98``` bash

198−mkdir -p ~/.local/bin

99+sudo dpkg -i bat_0.12.1_amd64.deb # adapt version number and architecture

199−ln -s /usr/bin/batcat ~/.local/bin/bat

200```

100```

201

101

202−### On Ubuntu (最新の `.deb` パッケージを使用)

102+### Arch Linux

203−*... や他のDebianベースのLinuxディストリビューション

204

103

205−batの最新リリースを実行する場合、または Ubuntu/Debian の古いバージョンを使用している場合は、[release page](https://github.com/sharkdp/bat/releases) から最新の `.deb` パッケージをダウンロードし、

104+[Arch Linuxの公式リソース](https://www.archlinux.org/packages/community/x86_64/bat/)からインストールできます。

206−次の方法でインストールします:

207−```bash

208−sudo dpkg -i bat_0.18.3_amd64.deb # adapt version number and architecture

209−```

210−

211−### On Alpine Linux

212−

213−適切なリポジトリが有効になっている場合は、

214−公式のソースから [`bat` package](https://pkgs.alpinelinux.org/packages?name=bat) をインストールできます:

215

105

216```bash

106```bash

217−apk add bat

107+pacman -S bat

218```

108```

219

109

220−### On Arch Linux

110+### Void Linux

221

111

222−[Arch Linuxの公式リソース](https://www.archlinux.org/packages/community/x86_64/bat/)

112+xbps-ininstall経由で `bat` をインストールできます。

223−からインストールできます。

224

113

225−```bash

114+```

226−pacman -S bat

115+xbps-install -S bat

227```

116```

228

117

229−### On Fedora

118+### Fedora

230

119

231−公式の [Fedora Modular](https://docs.fedoraproject.org/en-US/modularity/using-modules/) リポジトリから [the `bat` package](https://koji.fedoraproject.org/koji/packageinfo?packageID=27506) をインストールできます。

120+[Fedora Modular](https://docs.fedoraproject.org/en-US/modularity/using-modules/)経由で `bat` をインストールできます。これはFedora 29以上ではデフォルトで有効化されています。もしそうでなければ、 `dnf install fedora-repos-modular` を実行してセットアップし、 `fedora-modular` と `fedora-updates-modular` が `/etc/yum.repos.d` で有効化されていることを確認してください。

232

121

233```bash

122```bash

234−dnf install bat

123+dnf module install bat

235```

124```

236

125

237−### On Gentoo Linux

126+### Gentoo Linux

238

127

239−公式ソースから

128+[Gentoo Linuxの公式リソース](https://packages.gentoo.org/packages/sys-apps/bat)からインストールできます。

240−[the `bat` package](https://packages.gentoo.org/packages/sys-apps/bat) をインストールできます。

241

129

242```bash

130```bash

243emerge sys-apps/bat

131emerge sys-apps/bat

244```

132```

245

133

246−### On Void Linux

134+### FreeBSD

247

135

248−xbps-install経由で `bat` をインストールできます。

136+事前にコンパイル済みである[pkg](https://www.freshports.org/textproc/bat)をインストールできます:

249−```

250−xbps-install -S bat

251−```

252−

253−### On FreeBSD

254−

255−pkg を使用してプリコンパイルされた [`bat` package](https://www.freshports.org/textproc/bat) をインストールできます:

256

137

257```bash

138```bash

258pkg install bat

139pkg install bat

259```

140```

260

141

261−または FreeBSD ポートから自分でビルドすることもできます:

142+または、FreeBSDのportsから自身でビルドすることも可能です:

262

143

263```bash

144```bash

264cd /usr/ports/textproc/bat

145cd /usr/ports/textproc/bat

265make install

146make install

266```

147```

267

148

268−### Via nix

149+### nix

269

150

270−`bat` を [nix package manager](https://nixos.org/nix) 経由でインストールすることができます:

151+`bat` を[nix package manager](https://nixos.org/nix)経由でインストールすることができます:

271

152

272```bash

153```bash

273nix-env -i bat

154nix-env -i bat

274```

155```

275

156

276−### On openSUSE

157+### openSUSE

158+

159+You can install `bat` with zypper:

277

160

278`bat` をzypperでインストールすることができます:

161`bat` をzypperでインストールすることができます:

279

162

280−```bash

163+```

281zypper install bat

164zypper install bat

282```

165```

283

166

284−### On macOS

167+### macOS

285−

286−[Homebrew](http://braumeister.org/formula/bat)で `bat` をインストールできます:

287

168

288−```bash

169+[Homebrew](http://braumeister.org/formula/bat)でインストールすることができます:

289−brew install bat

290−```

291

170

292−または [MacPorts](https://ports.macports.org/port/bat/summary) で `bat` をインストールします:

293

171

294```bash

172```bash

295−port install bat

173+brew install bat

296```

174```

297

175

298−### On Windows

176+### Windows

299−

300−Windowsにbatをインストールするいくつかのオプションがあります。

301−batをインストールしたら [Windowsでのbatの使用](#windows-での-bat-の利用) セクションをご覧ください。

302−

303−#### With Chocolatey

304

177

305−[Chocolatey](https://chocolatey.org/packages/Bat) から `bat` をインストールできます:

178+You can download prebuilt binaries from the [Release page],

306−```bash

179+or install it with :

307−choco install bat

308−```

309

180

310−#### With Scoop

181+事前にビルド済みのバイナリを[リリースページ](https://github.com/sharkdp/bat/releases)からダウンロードすることができます。または、[scoop](https://scoop.sh/)でインストールすることも可能です。

311

182

312−[scoop](https://scoop.sh/) から `bat` をインストールできます:

313```bash

183```bash

314scoop install bat

184scoop install bat

315```

185```

316

186

317−[Visual C ++再頒布可能](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) パッケージをインストールする必要があります。

187+[See below](#using-bat-on-windows) for notes.

318−

319−#### From prebuilt binaries:

320

188

321−[リリースページ](https://github.com/sharkdp/bat/releases) からビルド済みのバイナリをダウンロードできます。

189+### Docker

322

190

323−[Visual C ++再頒布可能](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) パッケージをインストールする必要があります。

324

191

325−### Via Docker

192+コンテナ内で`bat` を使いたい方のために[Docker image](https://hub.docker.com/r/danlynn/bat/)が用意されています。

326

193

327−コンテナ内で `bat` を使いたい方のために [Docker image](https://hub.docker.com/r/danlynn/bat/) が用意されています:

328```bash

194```bash

329docker pull danlynn/bat

195docker pull danlynn/bat

330alias bat='docker run -it --rm -e BAT_THEME -e BAT_STYLE -e BAT_TABS -v "$(pwd):/myapp" danlynn/bat'

196alias bat='docker run -it --rm -e BAT_THEME -e BAT_STYLE -e BAT_TABS -v "$(pwd):/myapp" danlynn/bat'

331```

197```

332

198

333−### Via Ansible

199+### Ansible

334

200

335−[Ansible](https://www.ansible.com/) でインストールすることができます:

201+[Ansible](https://www.ansible.com/)でインストールすることができます:

336

202

337```bash

203```bash

338# Install role on local machine

204# Install role on local machine

@@ -361,58 +227,45 @@ ansible-galaxy install aeimer.install_bat

361### From binaries

227### From binaries

362

228

363

229

364−多くの異なるアーキテクチャのためのプレビルドバージョンを[リリースページ](https://github.com/sharkdp/bat/releases)からチェックしてみてください。静的にリンクされている多くのバイナリも利用できます: ファイル名に `musl` を含むアーカイブを探してみてください。

230+多くの異なるアーキテクチャのためのプレビルドバージョンを[リリースページ](https://github.com/sharkdp/bat/releases)からチェックしてみてください。静的にリンクされている多くのバイナリも利用できます: ファイル名に `musl` を含むアーカイブを探します。

365

231

366### From source

232### From source

367

233

368

234

369−`bat` をソースからビルドしたいならば、Rust 1.51 以上の環境が必要です。

235+`bat` をソースからビルドしたいならば、Rust 1.29 以上の環境が必要です。そして、 `cargo` をビルドに対して使用します:

370−`cargo` を使用してビルドすることができます:

371

236

372```bash

237```bash

373−cargo install --locked bat

238+cargo install bat

374```

239```

375

240

376−一部のプラットフォームでは `llvm` および/または `libclang-dev` のインストールが必要になる場合があります。

377

241

378## カスタマイズ

242## カスタマイズ

379

243

380### ハイライトテーマ

244### ハイライトテーマ

381

245

382−`bat --list-themes` を使うと現在利用可能なシンタックスハイライトのテーマを入手できます。

246+`bat --list-themes` を使うと現在利用可能なシンタックスハイライトのテーマを入手できます。 `TwoDark` テーマを選ぶためには `--theme=TwoDark` オプションをつけるか `BAT_THEME` という環境変数に `TwoDark` を代入する必要があります。シェルの起動ファイルに `export BAT_THEME="TwoDark"` と定義すればその設定が変わることはないでしょう。あるいは、 `bat` の[設定ファイル](https://github.com/sharkdp/bat#configuration-file)を利用してください。

383−`TwoDark` テーマを選ぶためには

384−`--theme=TwoDark` オプションをつけるか `BAT_THEME` という環境変数に

385−`TwoDark` を代入する必要があります。シェルの起動ファイルに `export BAT_THEME="TwoDark"`

386−と定義すればその設定が変わることはないでしょう。あるいは、 `bat` の

387−[設定ファイル](#設定ファイル)を利用してください。

388

247

389−カスタムファイルでさまざまなテーマをプレビューする場合は、

248+

390−次のコマンドを使用できます（これには [`fzf`](https://github.com/junegunn/fzf) が必要です）。

249+もし、ファイルにより異なるテーマを利用したい場合は、以下の[`fzf`](https://github.com/junegunn/fzf)を利用した以下のコマンドを使うことができます:

391``` bash

250``` bash

392bat --list-themes | fzf --preview="bat --theme={} --color=always /path/to/file"

251bat --list-themes | fzf --preview="bat --theme={} --color=always /path/to/file"

393```

252```

394

253

395−`bat` はデフォルトだと黒い背景色のターミナルに適しています。

254+`bat` はデフォルトだと黒い背景色のターミナルに適しています。しかし、`GitHub` や `OneHalfLight` のような白い背景色のテーマでもいい感じにすることができます。

396−しかし、`GitHub` や `OneHalfLight` のような白い背景色のテーマでもいい感じにすることができます。

255+以下のカスタムテーマを参考にしてみてください。

397−['新しいテーマの追加' セクションに従って](#新しいテーマの追加)

256+['Adding new themes' section below](https://github.com/sharkdp/bat#adding-new-themes)

398−カスタムテーマを使用することもできます。

399

257

400### 出力のスタイル

258### 出力のスタイル

401

259

402−`--style` を使うことで `bat` の表示の見た目を変更することができます。

260+`--style` を使うことで `bat` の表示の見た目を変更することができます。例えば、 `--style=numbers,changes` と入力します。すると、Gitの差分と行番号だけが表示され、グリッド線とファイルヘッダーは表示されません。

403−例えば、 `--style=numbers,changes` と入力します。

404−すると、Gitの差分と行番号だけが表示され、グリッド線とファイルヘッダーは表示されません。

405環境変数に `BAT_STYLE` を定義するとこれらの設定を永続的に使用することができます。

261環境変数に `BAT_STYLE` を定義するとこれらの設定を永続的に使用することができます。

406−[設定ファイル](#設定ファイル) を参考にしても良いでしょう。

262+[設定ファイル](https://github.com/sharkdp/bat#configuration-file)を参考にしても良いでしょう。

407

263

408### 新しい構文の追加 / 言語の定義

264### 新しい構文の追加 / 言語の定義

409

265

410−`bat` はシンタックスハイライトのための [`syntect`](https://github.com/trishume/syntect/)

266+`bat` はシンタックスハイライトのための[`syntext`](https://github.com/trishume/syntect/)という最高にイケてるライブラリを使用しています。`syntect` はSublime Textのために作られた[`.sublime-syntax` file](https://www.sublimetext.com/docs/3/syntax.html)テーマです。新しい構文を定義するために以下の手順を行います。

411−という素晴らしいライブラリを使用しています。`syntect` は、

412−[Sublime Text の `.sublime-syntax` ファイル](https://www.sublimetext.com/docs/3/syntax.html)

413−とテーマを読み取ることができます。新しい構文を定義するために以下の手順を行います。

414

267

415−構文定義ファイルを入れておくためのフォルダを作ります:

268+構文定義ファイルを入れておくためのフォルダを作る:

416

269

417```bash

270```bash

418mkdir -p "$(bat --config-dir)/syntaxes"

271mkdir -p "$(bat --config-dir)/syntaxes"

@@ -430,7 +283,6 @@ bat cache --build

430```

283```

431

284

432最後に `bat --list-languages` と入力すると新しい言語が利用可能かどうかチェックします。

285最後に `bat --list-languages` と入力すると新しい言語が利用可能かどうかチェックします。

433−

434デフォルトの設定に戻したいときは以下のコマンドを実行します:

286デフォルトの設定に戻したいときは以下のコマンドを実行します:

435

287

436```bash

288```bash

@@ -453,65 +305,42 @@ git clone https://github.com/greggb/sublime-snazzy

453bat cache --build

305bat cache --build

454```

306```

455

307

456−最後に、 `bat --list-themes` で新しいテーマが利用可能かチェックします

308+最後に、 `bat --list-themes` で新しいテーマが利用可能がチェックします

457

309

458### 異なるページャーの使用

310### 異なるページャーの使用

459

311

460`bat` は環境変数 `PAGER` に使用するページャーを明記します。

312`bat` は環境変数 `PAGER` に使用するページャーを明記します。

461−この環境変数が定義されていない場合、デフォルトで `less` が使用されます。

313+この環境変数が定義されていない場合、デフォルトで `less` が使用されます。もし、異なるページャーが使用したい場合は、`PAGER` を修正してください。または、`PAGER` を上書きする環境変数として `BAT_PAGER` を定義することも可能です。

462−もし、異なるページャーを使用したい場合は、`PAGER` を修正してください。

463−または、`PAGER` を上書きする環境変数として `BAT_PAGER` を定義することも可能です。

464−

465−もし、ページャーにコマンドライン引数を渡したい場合は、

466−`PAGER`/`BAT_PAGER` 環境変数を定義してください:

467

314

315+もし、ページャーにコマンドライン引数を渡したい場合は、 `PAGER`/`BAT_PAGER` 環境変数を定義してください:

468```bash

316```bash

469export BAT_PAGER="less -RF"

317export BAT_PAGER="less -RF"

470```

318```

471

319

472−環境変数を利用する代わりに、 `bat` の [設定ファイル](#設定ファイル) を使用して設定も可能です（`--pager` オプション）

320+環境変数を利用する代わりに、 `bat` の[設定ファイル](https://github.com/sharkdp/bat#configuration-file)の `--pager` オプションを使用することも可能です。

473−

474−**注意**: デフォルトにより、ページャーが `less` にセットされているならば

475−`bat` はページャーの以下のコマンドラインオプションを受け付けるでしょう:

476−`-R`/`--RAW-CONTROL-CHARS`, `-F`/`--quit-if-one-screen` そして `-X`/`--no-init`。

477−最後のオプション（-X）は、530 より古いバージョンにのみ使用されます。

478−

479−`-R` オプションは、ANSIカラーを正しく解釈するために必要です。

480−2番目のオプション（`-F`）は、出力サイズが端末の垂直サイズよりも小さい場合、すぐに終了するようにlessに指示します。

481−これは、ページャーを終了するために `q` を押す必要がないため、小さなファイルに便利です。

482−3番目のオプション（`-X`）は、`less` の古いバージョンの `--quit-if-one-screen` 機能のバグを修正するために必要です。

483−残念ながら、`less` のマウスホイールのサポートも少なくなります。

484−

485−`less` の古いバージョンでマウスホイールのスクロールを有効にしたい場合は、

486−`-R` だけを渡すことができます（上記の例のように、これは1画面終了機能を無効にします）。

487−530以下の場合は、そのまま使用できます。

488

321

489−### Dark mode

322+**注意**: デフォルトにより、ページャーが `less` にセットされているならば `bat` は以下のコマンドラインを受け付けるでしょう。

323+ページャーのオプション： `-R`/`--RAW-CONTROL-CHARS`, `-F`/`--quit-if-one-screen` , `-X`/`--no-init`

324+最初の `-R` はANSIカラーを正しく解釈するために必要です。2番目の `-F` は出力サイズがターミナルの縦のサイズよりも小さいならば `less` に即座に終了するように命令します。したがって、少量のファイルのためにページャーを終了する `q` を押す必要がありません。3番目のオプションの `-X` は `less` の古いバージョンの機能である `--quit-if-one-screen` でバグを修正するために必要です。運の悪いことに、これは `less` のマウス-ホイールのサポートを無効にします。もし、マウス-ホイールスクローリングを有効にしたいなら、`-R` だけをオプションとしてつけてください（ただし、これは `--quit-if-one-screen` を無効にするでしょう）。または、 `less` の最近バージョンを利用し、 `-RF` をつけてください。これは望ましいことに `--quit-if-one-screen` とマウス-ホイールスクローリングの両方を有効にするでしょう。

490

325

491−macOSでダークモード機能を使用する場合、OSテーマに基づいて異なるテーマを使用するように `bat` を構成することができます。

326+スクロールが未だ動作しないのであれば、加えて `-S` オプションを追加してみてください。

492−次のスニペットは、ライトモードの場合は `デフォルト` のテーマを使用し、

493−ダークモードの場合は `GitHub` テーマを使用します。

494−

495−```bash

496−alias cat="bat --theme=\$(defaults read -globalDomain AppleInterfaceStyle &> /dev/null && echo default || echo GitHub)"

497−```

498

327

499## 設定ファイル

328## 設定ファイル

500

329

501−`bat` は設定ファイルでカスタマイズすることが可能です。ファイルの場所はOSに依存します。

330+

502−使用しているOSのデフォルトパスを調べるには以下のコマンドを実行してください:

331+`bat` は設定ファイルでカスタマイズすることが可能です。ファイルの場所はOSに依存します。使用しているOSのデフォルトパスを調べるには以下のコマンドを実行してください:

503```

332```

504bat --config-file

333bat --config-file

505```

334```

506

335

507−または、`BAT_CONFIG_PATH` 環境変数を使用して、`bat` が

336+また、環境変数 `BAT_CONFIG_PATH` に設定ファイルの場所を明記することもできます:

508−構成ファイルのデフォルト以外の場所を指すようにすることができます:

509```bash

337```bash

510export BAT_CONFIG_PATH="/path/to/bat.conf"

338export BAT_CONFIG_PATH="/path/to/bat.conf"

511```

339```

512

340

513### フォーマット

341### フォーマット

514

342

343+

515この設定ファイルはコマンドライン引数の単純なリストです。 `bat --help` を利用すると、利用可能なオプションとその値を閲覧することができます。さらに、`#` でコメント文を加えることができます。

344この設定ファイルはコマンドライン引数の単純なリストです。 `bat --help` を利用すると、利用可能なオプションとその値を閲覧することができます。さらに、`#` でコメント文を加えることができます。

516

345

517設定ファイルの例:

346設定ファイルの例:

@@ -525,11 +354,15 @@ export BAT_CONFIG_PATH="/path/to/bat.conf"

525# Use italic text on the terminal (not supported on all terminals)

354# Use italic text on the terminal (not supported on all terminals)

526--italic-text=always

355--italic-text=always

527

356

528−# Use C++ syntax for Arduino .ino files

357+# Add mouse scrolling support in less (does not work with older

529−--map-syntax "*.ino:C++"

358+# versions of "less")

359+--pager="less -FR"

360+

361+# Use C++ syntax (instead of C) for .h header files

362+--map-syntax h:cpp

530

363

531−# Use ".gitignore"-style highlighting for ".ignore" files

364+# Use "gitignore" highlighting for ".ignore" files

532−--map-syntax ".ignore:Git Ignore"

365+--map-syntax .ignore:.gitignore

533```

366```

534

367

535## Windows での `bat` の利用

368## Windows での `bat` の利用

@@ -538,29 +371,26 @@ Windows 上で `bat` はほとんど動作しますが、いくつかの機能

538

371

539### ページング

372### ページング

540

373

541−Windowsには、`more` 形式の非常に限られたページャーしか含まれていません。

374+Windows only includes a very limited pager in the form of `more`. You can download a Windows binary

542−`less` 用のWindowsバイナリは、[ホームページ](http://www.greenwoodsoftware.com/less/download.html) または

375+for `less` [from its homepage](http://www.greenwoodsoftware.com/less/download.html) or [through

543−[Chocolatey](https://chocolatey.org/packages/Less) からダウンロードできます。

376+Chocolatey](https://chocolatey.org/packages/Less). To use it, place the binary in a directory in

544−これを使用するには、バイナリを `PATH` のディレクトリに配置するか、環境変数を定義します。[Chocolateyパッケージ](#on-windows) は `less` を自動的にインストールします。

377+your `PATH` or [define an environment variable](#using-a-different-pager).

378+

379+

545

380

546### 色

381### 色

547

382

548−Windows 10では、`conhost.exe` （コマンドプロンプト）と

383+Windows 10 は[v1151](https://en.wikipedia.org/wiki/Windows_10_version_history#Version_1511_(November_Update))からbashの新しいバージョンと同様に `conhost.exe`（コマンドプロンプト）と PowerShell の色をネイティブサポートしていません。Windows の新しいバージョンでは、[Cmder](http://cmder.net/)を使うことができます。これは[ConEmu](https://conemu.github.io/)を含んでいます。

549−[v1511](https://en.wikipedia.org/wiki/Windows_10_version_history#Version_1511_(November_Update)) 以降の PowerShell の両方、

550−およびbashの新しいバージョンの色がネイティブにサポートされています。以前のバージョンのWindowsでは、

551−[ConEmu](https://conemu.github.io/) を含む [Cmder](http://cmder.net/) を使用できます。

552

384

553−**注意:** Git と MSYS の `less` はWindows上で色を正しく解釈しません。

385+**注意:** Git と MSYS の `less` はWindows上で色を正しく解釈しません。もし、あなたが他のページャーをインストールしていないのであれば、 `--paging=never` オプションを付け加えるまたは `BAT_PAGER` に空文字を設定することでページングを完全に無効にできます。

554−もし、あなたが他のページャーをインストールしていないのであれば、 `--paging=never` オプションを付け加えるか

555−`BAT_PAGER` に空文字を設定することでページングを完全に無効にできます。

556

386

557### Cygwin

387### Cygwin

558

388

559−Windows上の `bat` は Cygwin のunix風のpath(`/cygdrive/*`)をネイティブサポートしていません。絶対的なcygwinパスを引数として受けたときに、 `bat` は以下のエラーを返すでしょう: `The system cannot find the path specified. (os error 3)`

389+Windows上の `bat` は Cygwin のunix風のpath(`/cygdrive/*`)をネイティブサポートしていません。

560−

390+絶対的なcygwinパスを引数として受けたときに、 `bat` は以下のエラーを返すでしょう: `The system cannot find the path specified. (os error 3)`

561−wrapperを作成するか、以下の関数を `.bash_profile` に追記することで、この問題を解決することができます:

562

391

563−```bash

392+wrapperを作成するまたは以下の関数を `.bash_profile` に追記することでこの問題を解決することができます:

393+```shell

564bat() {

394bat() {

565 local index

395 local index

566 local args=("$@")

396 local args=("$@")

@@ -578,32 +408,15 @@ bat() {

578

408

579### ターミナルと色

409### ターミナルと色

580

410

581−`bat` はターミナルがトゥルーカラーをサポートしている/していないに関係なくサポートします。

411+`bat` はターミナルがトゥルーカラーをサポートしている/していない関係なくサポートします。しかし、シンタックスハイライトのテーマの色が8-bitカラーに最適化されていない場合、24-bitであるトゥルーカラーをサポートしているターミナルを使用することを強く推奨します（`terminator`, `konsole`, `iTerm2`, ...）。

582−しかし、シンタックスハイライトのテーマの色が8-bitカラーに最適化されていない場合、

412+この[記事](https://gist.github.com/XVilka/8346728)には24-bitカラーがサポートされているターミナルの一覧が掲載されています。

583−24-bitであるトゥルーカラーをサポートしているターミナルを使用することを強く推奨します（`terminator`, `konsole`, `iTerm2`, ...）。

584−この [記事](https://gist.github.com/XVilka/8346728) には

585−24-bitカラーがサポートされているターミナルの一覧が掲載されています。

586

413

587−本当の色をターミナルにセットするために、環境変数 `COLORTERM` に `truecolor` か

414+本当の色をターミナルにセットするために、環境変数 `COLORTERM` に `truecolor` か `24bit` のどちらかを代入してください。さもなければ、 `bat` はどの色を使うのか決定することができません。または、24-bit エスケープシーケンスがサポートされません（そして、8-bit colorに戻ります）。

588−`24bit` のどちらかを代入してください。さもなければ、`bat` はどの色を使うのか決定することができません。または、24-bit エスケープシーケンスがサポートされません

589−（そして、8-bit colorに戻ります）。

590

415

591### 行番号とグリッド線がほとんど見えない

416### 行番号とグリッド線がほとんど見えない

592

417

593−異なるテーマを試してみてください（`bat --list-themes` でテーマを閲覧できます）。

418+異なるテーマを試してみてください(`bat --list-themes` でテーマを閲覧できます)。 `OneHalfDark` と `OneHalfLight` テーマはグリッド線と線の色を明るくします。

594−`OneHalfDark` と `OneHalfLight` テーマはグリッド線と線の色を明るくします。

595−

596−### ファイルエンコーディング

597

419

598−`bat` は UTF-16 と同様に UTF-8 をネイティブにサポートします。

599−他のすべてのファイルエンコーディングでは、エンコーディングは通常自動検出できないため、最初に UTF-8 に変換する必要があります。

600−これを行うには `iconv` を使用できます。

601−例: Latin-1（ISO-8859-1）エンコーディングの PHP ファイルがある場合、次のように呼び出すことができます:

602−``` bash

603−iconv -f ISO-8859-1 -t UTF-8 my-file.php | bat

604−```

605−注: `bat` が構文を自動検出できない場合は

606−`-l` / `-language` オプションを使用する必要がある場合があります。

607

420

608## 開発

421## 開発

609

422

@@ -619,33 +432,21 @@ cargo build --bins

619cargo test

432cargo test

620

433

621# Install (release version)

434# Install (release version)

622−cargo install --locked

435+cargo install

623

436

624# Build a bat binary with modified syntaxes and themes

437# Build a bat binary with modified syntaxes and themes

625bash assets/create.sh

438bash assets/create.sh

626−cargo install --locked --force

439+cargo install -f

627```

440```

628

441

629−## Maintainers

630−

631−- [sharkdp](https://github.com/sharkdp)

632−- [eth-p](https://github.com/eth-p)

633−

634## プロジェクトの目標と既存の類似したOSS

442## プロジェクトの目標と既存の類似したOSS

635

443

636`bat` は以下の目標を達成しようと試みています:

444`bat` は以下の目標を達成しようと試みています:

637

445

638−- 美しく高度なシンタックスハイライトの提供

446+- 美しい高度なシンタックスハイライトの提供

639- ファイルの差分を表示するためのGitとの連携

447- ファイルの差分を表示するためのGitとの連携

640- (POSIX) `cat` との完全互換

448- (POSIX) `cat` との完全互換

641−- ユーザーフレンドリーなコマンドラインインターフェースの提供

449+- ユーザーフレンドリーがコマンドラインインターフェースの提供

642−

643−あなたが同様のプログラムを探しているなら、多くの選択肢があります。

644−比較については [このドキュメント](alternatives.md) を参照してください。

645−

646−## ライセンス

648−

649−`bat` は MIT License 及び Apache License 2.0 の両方の条件の下で配布されています。

650

450

651−ライセンスの詳細については [LICENSE-APACHE](../LICENSE-APACHE) 及び [LICENSE-MIT](../LICENSE-MIT) ファイルを参照して下さい。

451+既存の類似したOSSはたくさんあります。

452+`bat` とこれらを比較した表が[こちら](alternatives.md)にあります。

doc/README-ko.mddeleted−835

@@ -1,835 +0,0 @@

1−

2− <img src="logo-header.svg" alt="bat - a cat clone with wings">

3− <a href="https://github.com/sharkdp/bat/actions?query=workflow%3ACICD"><img src="https://github.com/sharkdp/bat/workflows/CICD/badge.svg" alt="Build Status"></a>

4− <img src="https://img.shields.io/crates/l/bat.svg" alt="license">

5− <a href="https://crates.io/crates/bat"><img src="https://img.shields.io/crates/v/bat.svg?colorB=319e8c" alt="Version info"></a>

6− 문법 강조와 Git 통합 기능의 cat(1) 클론

7−

8−

9−

10− <a href="#문법-강조">주요 기능들</a> •

11− <a href="#사용법">사용법</a> •

12− <a href="#설치">설치</a> •

13− <a href="#사용자화">사용자화</a> •

14− <a href="#프로젝트-목표와-대안들">프로젝트 목표와 대안들</a>

15− [<a href="../README.md">English</a>]

16− [<a href="README-zh.md">中文</a>]

17− [<a href="README-ja.md">日本語</a>]

18− [한국어]

19− [<a href="README-ru.md">Русский</a>]

20−

21−

22−### 문법 강조

23−

24−`bat`은 다양한 프로그래밍 및 마크업 언어의 문법 강조(syntax highlighting) 기능을

25−지원합니다:

26−

27−![Syntax highlighting example](https://imgur.com/rGsdnDe.png)

28−

29−### Git 통합

30−

31−`bat`은 `git`을 통해 인덱스와 함께 변경분을 표시합니다

32−(왼쪽 사이드바를 확인하세요):

33−

34−![Git integration example](https://i.imgur.com/2lSW4RE.png)

35−

36−### 비인쇄 문자 처리

37−

38−`-A`/`--show-all` 옵션을 사용하여 비인쇄 문자를 표시 및 강조할 수 있습니다:

39−

40−![Non-printable character example](https://i.imgur.com/WndGp9H.png)

41−

42−### 자동 페이징

43−

44−`bat`은 기본적으로 한 화면에 비해 출력이 큰 경우 `less`와 같은 페이저(pager)로

45−출력을 연결(pipe)합니다.

46−만약 `bat`을 언제나 `cat`처럼 작동하게 하려면 (출력을 페이지하지 않기),

47−`--paging=never` 옵션을 커맨드 라인이나 설정 파일에 넣을 수 있습니다.

48−셸(shell) 설정에서 `cat`을 `bat`의 alias로 사용하려면,

49−`alias cat='bat --paging=never'`를 써서 기본 행동을 유지할 수 있습니다.

50−

51−### 파일 연결(concatenation)

52−

53−페이저(pager)를 사용하더라도 `bat`은 파일들을 연결(concatenate)할 수 있습니다

54−:wink:.

55−`bat`이 비대화형(non-interactive) 터미널(예를 들어, 다른 프로세스나 파일에

56−연결(pipe)한 경우)을 감지하면, `bat`은 `--pager` 옵션의 값과 상관없이 `cat`과

57−동일하게 파일 내용을 그대로 출력합니다.

58−

59−## 사용법

60−

61−터미널에 하나의 파일 표시하기

62−

63−```bash

64−> bat README.md

65−```

66−

67−여러 파일 한 번에 보여주기

68−

69−```bash

70−> bat src/*.rs

71−```

72−

73−stdin에서 읽고, 자동으로 맞는 문법 결정하기 (참고로, 문법 강조는 파일의 첫

74−줄만으로 문법이 결정될 수 있을 때만 작동합니다.

75−이는 보통 `#!/bin/sh`와 같은 셔뱅(shebang)으로 판단합니다.)

76−

77−```bash

78−> curl -s https://sh.rustup.rs | bat

79−```

80−

81−stdin에서 읽고, 명시적으로 언어 지정하기

82−

83−```bash

84−> yaml2json .travis.yml | json_pp | bat -l json

85−```

86−

87−비인쇄 문자 표시 및 강조하기

88−```bash

89−> bat -A /etc/hosts

90−```

91−

92−`cat` 대신 사용하기:

93−

94−```bash

95−bat > note.md # quickly create a new file

96−

97−bat header.md content.md footer.md > document.md

98−

99−bat -n main.rs # show line numbers (only)

100−

101−bat f - g # output 'f', then stdin, then 'g'.

102−```

103−

104−### 다른 도구들과 통합하기

105−

106−#### `fzf`

107−

108−`bat`을 [`fzf`](https://github.com/junegunn/fzf)의 프리뷰로 쓸 수 있습니다.

109−이를 위해서는 `bat`의 `--color=always` 옵션으로 항상 컬러 출력이 나오게 해야

110−합니다.

111−또한 `--line-range` 옵션으로 긴 파일의 로드 시간을 제한할 수 있습니다:

112−```bash

113−fzf --preview 'bat --color=always --style=numbers --line-range=:500 {}'

114−```

115−더 많은 정보는

116−[`fzf`의 `README`](https://github.com/junegunn/fzf#preview-window)를 참고하세요.

117−

118−#### `find`와 `fd`

119−

120−`find`의 `-exec` 옵션을 사용하여 모든 검색 결과를 `bat`로 미리 볼 수 있습니다:

121−```bash

122−find … -exec bat {} +

123−```

124−

125−[`fd`](https://github.com/sharkdp/fd)를 사용하는 경우, `-X`/`--exec-batch`

126−옵션을 이용하여 동일하게 사용할 수 있습니다:

127−```bash

128−fd … -X bat

129−```

130−

131−#### `ripgrep`

132−

133−[`batgrep`](https://github.com/eth-p/bat-extras/blob/master/doc/batgrep.md)을

134−통해 `bat`로 [`ripgrep`](https://github.com/BurntSushi/ripgrep)의 검색 결과를

135−출력할 수 있습니다.

136−

137−```bash

138−batgrep needle src/

139−```

140−

141−#### `tail -f`

142−

143−`bat`와 `tail -f`를 함께 사용하여 주어진 파일을 문법 강조하며 지속적으로

144−모니터할 수 있습니다.

145−```bash

146−tail -f /var/log/pacman.log | bat --paging=never -l log

147−```

148−참고로 이 작업을 하려면 페이징 기능을 꺼야 합니다.

149−또한 이 경우 문법을 자동 감지할 수 없기 때문에, 적용할 문법을 직접 지정해야

150−합니다 (`-l log`).

151−

152−#### `git`

153−

154−`bat`과 `git show`를 함께 사용하여 주어진 파일의 이전 버전을 올바른 문법 강조로

155−볼 수 있습니다:

156−```bash

157−git show v0.6.0:src/main.rs | bat -l rs

158−```

159−

160−#### `git diff`

161−

162−`bat`과 `git diff`를 함께 사용하여 수정된 코드 주위의 줄들을 올바른 문법 강조로

163−볼 수 있습니다:

164−```bash

165−batdiff() {

166− git diff --name-only --diff-filter=d | xargs bat --diff

167−}

168−```

169−이것을 별도의 도구로 쓰고 싶다면

170−[`bat-extras`](https://github.com/eth-p/bat-extras)의 `batdiff`를 확인해 보세요.

171−

172−Git과 diff의 더 많은 지원을 원한다면

173−[`delta`](https://github.com/dandavison/delta)를 확인해 보세요.

174−

175−#### `xclip`

176−

177−`bat` 출력에 줄 번호와 Git 수정 내역이 포함되어서 파일의 내용을 복사하기

178−어려울 수 있습니다.

179−이 경우에는 `bat`의 `-p`/`--plain` 옵션을 사용하거나 간단히 `xclip`으로 출력을

180−연결(pipe)하면 됩니다:

181−```bash

182−bat main.cpp | xclip

183−```

184−`bat`는 출력이 우회되고 있다는 것을 감지하여 파일 내용 그대로를 출력합니다.

185−

186−#### `man`

187−

188−`MANPAGER` 환경 변수 설정을 통해 `bat`을 `man`의 컬러 페이저(pager)로 쓸 수

189−있습니다.

190−

191−```bash

192−export MANPAGER="sh -c 'col -bx | bat -l man -p'"

193−man 2 select

194−```

195−(Debian이나 Ubuntu를 사용한다면 `bat`을 `batcat`으로 치환하세요.)

196−

197−포팻 문제가 발생한다면, `MANROFFOPT="-c"`을 써야 할 수 있습니다.

198−

199−이 기능을 포함한 새로운 명령어를 선호한다면,

200−[`batman`](https://github.com/eth-p/bat-extras/blob/master/doc/batman.md)을 쓸

201−수도 있습니다.

202−

203−참고로 [Manpage 문법](../assets/syntaxes/Manpage.sublime-syntax)은 본 저장소에서

204−개발 중에 있으며, 아직 더 손봐야 합니다.

205−

206−또한, 이는 Mandoc의 `man` 구현에서

207−[작동하지 않습니다](https://github.com/sharkdp/bat/issues/1145).

208−

209−#### `prettier` / `shfmt` / `rustfmt`

210−

211−[`prettybat`](https://github.com/eth-p/bat-extras/blob/master/doc/prettybat.md)

212−스크립트는 코드를 포맷하고 `bat`으로 출력하는 래퍼(wrapper)입니다.

213−

214−

215−## 설치

216−

217−[![Packaging status](https://repology.org/badge/vertical-allrepos/bat-cat.svg)](https://repology.org/project/bat-cat/versions)

218−

219−### Ubuntu에서 (`apt` 사용)

220−*... 그리고 다른 Debian 기반의 Linux 배포판들에서.*

221−

222−`bat`은 [Ubuntu](https://packages.ubuntu.com/eoan/bat)와

223−[Debian](https://packages.debian.org/sid/bat) 패키지 배포 과정에 도입되는 중이며,

224−Eoan 19.10 버전의 Ubuntu에서부터 제공됩니다.

225−현재 Debian에서는 불안정한 "Sid" 브랜치에서만 `bat`이 제공됩니다.

226−

227−만약 충분히 최신 버전의 Ubuntu/Debian이 설치되어 있다면 간단히 다음을 실행하세요:

228−

229−```bash

230−apt install bat

231−```

232−

233−**중요**: 만약 `bat`을 이와 같이 설치한다면, ([다른 패키지와의 이름

234−충돌](https://github.com/sharkdp/bat/issues/982)로 인하여) `bat` 대신에

235−`batcat`이라는 이름의 실행 파일로 설치될 수 있음을 참고하세요.

236−이에 따른 문제들과 다른 배포판들과의 일관성을 위하여 `bat -> batcat` symlink

237−혹은 alias를 설정할 수 있습니다:

238−``` bash

239−mkdir -p ~/.local/bin

240−ln -s /usr/bin/batcat ~/.local/bin/bat

241−```

242−

243−### Ubuntu에서 (가장 최신 `.deb` 패키지들 사용)

244−*... 그리고 다른 Debian 기반의 Linux 배포판들에서.*

245−

246−만약 여러분이 설치한 Ubuntu/Debian에 패키지가 배포되지 않거나 가장 최신 릴리즈된

247−`bat`을 원한다면, [릴리즈 페이지](https://github.com/sharkdp/bat/releases)에서

248−다음과 같이 `.deb` 패키지를 받아 설치하세요:

249−

250−```bash

251−sudo dpkg -i bat_0.18.3_amd64.deb # adapt version number and architecture

252−```

253−

254−### Alpine Linux에서

255−

256−적절한 저장소가 활성화되어 있다면, 공식 소스를 통해

257−[`bat` 패키지](https://pkgs.alpinelinux.org/packages?name=bat)를 설치할 수

258−있습니다:

259−

260−```bash

261−apk add bat

262−```

263−

264−### Arch Linux에서

265−

266−공식 소스를 통해

267−[`bat` 패키지](https://www.archlinux.org/packages/community/x86_64/bat/)를

268−설치할 수 있습니다:

269−

270−```bash

271−pacman -S bat

272−```

273−

274−### Fedora에서

275−

276−공식

277−[Fedora 모듈](https://docs.fedoraproject.org/en-US/modularity/using-modules/)

278−저장소에서

279−[`bat` 패키지](https://koji.fedoraproject.org/koji/packageinfo?packageID=27506)를

280−설치할 수 있습니다:

281−

282−```bash

283−dnf install bat

284−```

285−

286−### Funtoo Linux에서

287−

288−dev-kit을 통해 [`bat` 패키지](https://github.com/funtoo/dev-kit/tree/1.4-release/sys-apps/bat)를 설치할 수 있습니다:

289−

290−```bash

291−emerge sys-apps/bat

292−```

293−

294−### Gentoo Linux에서

295−

296−공식 소스를 통해

297−[`bat` 패키지](https://packages.gentoo.org/packages/sys-apps/bat)를 설치할 수

298−있습니다:

299−

300−```bash

301−emerge sys-apps/bat

302−```

303−

304−### Void Linux에서

305−

306−xbps-install을 이용해 `bat`을 설치할 수 있습니다:

307−```bash

308−xbps-install -S bat

309−```

310−

311−### Termux에서

312−

313−pkg를 이용해 `bat`을 설치할 수 있습니다:

314−```bash

315−pkg install bat

316−```

317−

318−### FreeBSD에서

319−

320−pkg를 이용하여 미리 컴파일된

321−[`bat` 패키지](https://www.freshports.org/textproc/bat)를 설치할 수 있습니다:

322−

323−```bash

324−pkg install bat

325−```

326−

327−또는 FreeBSD 포트에서 직접 빌드할 수도 있습니다:

328−

329−```bash

330−cd /usr/ports/textproc/bat

331−make install

332−```

333−

334−### nix를 써서

335−

336−[nix package manager](https://nixos.org/nix)를 이용해 `bat`을 설치할 수

337−있습니다:

338−

339−```bash

340−nix-env -i bat

341−```

342−

343−### openSUSE에서

344−

345−zypper를 이용해 `bat`을 설치할 수 있습니다:

346−

347−```bash

348−zypper install bat

349−```

350−

351−### snap 패키지를 써서

352−

353−지금으로서는 추천하는 snap 패키지가 없습니다.

354−제공되는 패키지들이 존재할 수는 있지만, 공식적으로 지원되지 않으며

355−[문제](https://github.com/sharkdp/bat/issues/1519)가 있을 수 있습니다.

356−

357−

358−### macOS (또는 Linux)에서 Homebrew를 써서

359−

360−[macOS의 Homebrew](https://formulae.brew.sh/formula/bat) 또는

361−[Linux의 Homebrew](https://formulae.brew.sh/formula-linux/bat)를 이용하여

362−`bat`을 설치할 수 있습니다.

363−

364−```bash

365−brew install bat

366−```

367−

368−### macOS에서 MacPorts를 써서

369−

370−[MacPorts](https://ports.macports.org/port/bat/summary)를 이용하여 `bat`을

371−설치할 수 있습니다:

372−

373−```bash

374−port install bat

375−```

376−

377−### Windows에서

378−

379−Windows에서 `bat`을 설치할 수 있는 몇 가지 옵션들이 있습니다.

380−먼저 `bat`을 설치한 후,

381−["Windows에서 `bat` 사용하기"](#windows에서-bat-사용하기) 섹션을 살펴보세요.

382−

383−#### 전제 조건

384−

385−[Visual C++ 재배포 가능](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads)

386−패키지를 설치해야 합니다.

387−

388−#### Chocolatey를 써서

389−

390−[Chocolatey](https://chocolatey.org/packages/Bat)를 이용해 `bat`을 설치할 수

391−있습니다:

392−```bash

393−choco install bat

394−```

395−

396−#### Scoop을 써서

397−

398−[scoop](https://scoop.sh/)을 이용해 `bat`을 설치할 수 있습니다:

399−```bash

400−scoop install bat

401−```

402−

403−#### 사전 빌드된 바이너리들로

404−

405−[릴리즈 페이지](https://github.com/sharkdp/bat/releases)에서 사전 빌드된

406−바이너리를 다운받을 수 있습니다.

407−

408−[Visual C++ 재배포 가능](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads)

409−패키지를 설치해야 합니다.

410−

411−### 바이너리들로

412−

413−[릴리즈 페이지](https://github.com/sharkdp/bat/releases)에서 다양한 아키텍처를

414−위해 사전 빌드된 버전들을 확인할 수 있습니다.

415−정적 링크 바이너리들은 파일 이름에 `musl` 이 포함된 아카이브들을 확인하세요.

416−

417−### 소스에서

418−

419−`bat`의 소스를 빌드하기 위해서는, Rust 1.51 이상이 필요합니다.

420−`cargo`를 이용해 전부 빌드할 수 있습니다:

421−

422−```bash

423−cargo install --locked bat

424−```

425−

426−참고로 man 페이지나 셸 자동 완성 파일과 같은 부가 파일들은 이 방법으로 설치될 수

427−없습니다.

428−이것들은 `cargo`에 의해 생성이 되고 (`build` 밑의) cargo 타켓 폴더에서 찾을 수

429−있습니다.

430−

431−## 사용자화

432−

433−### 문법 강조 테마

434−

435−`bat --list-themes`을 사용하여 사용 가능한 문법 강조 테마들의 목록을 확인할 수

436−있습니다.

437−`TwoDark` 테마를 선택하려면, `--theme=TwoDark` 옵션과 함께 `bat`을 사용하거나

438−`BAT_THEME` 환경 변수를 `TwoDark`로 설정하세요.

439−셸 시작 파일에 `export BAT_THEME="TwoDark"` 를 정의해 영구적으로 설정할 수

440−있습니다.

441−이 밖에 `bat`의 [설정 파일](#설정-파일)을 이용할 수 있습니다.

442−

443−만약 다른 테마들을 사용하여 특정 파일을 보고 싶다면, 다음 명령어를 쓸 수

444−있습니다(이 경우 [`fzf`](https://github.com/junegunn/fzf)가 필요합니다.)

445−

446−```bash

447−bat --list-themes | fzf --preview="bat --theme={} --color=always /path/to/file"

448−```

449−

450−`bat`은 기본적으로 어두운 배경에 적합합니다.

451−그러나 밝은 배경의 터미널을 사용한다면 `GitHub`이나 `OneHalfLight`과 같은 테마가

452−더 잘 어울립니다.

453−아래 [새로운 테마 추가하기](#새로운-테마-추가하기) 섹션에 따라 커스텀 테마를

454−사용할 수도 있습니다.

455−

456−### 8비트 테마

457−

458−`bat`은 트루컬러 지원이 되더라도 항상

459−[8비트 색상](https://en.wikipedia.org/wiki/ANSI_escape_code#Colors)을 사용하는

460−세 개의 테마가 있습니다.

461−

462−- `ansi`는 어떤 터미널에서도 무난하게 보입니다. 이는 3비트 색상을 사용합니다:

463− 검정, 빨강, 녹색, 노랑, 파랑, 마젠타, 시안, 하양.

464−- `base16`은 [base16](https://github.com/chriskempson/base16) 터미널 테마를 위해

465− 디자인되었습니다.

466− 이는 [base16 스타일 가이드라인](https://github.com/chriskempson/base16/blob/master/styling.md)에

467− 따라 4비트 색상(3비트 색상에 밝은 변형 추가)을 사용합니다.

468−- `base16-256`는 [base16-shell](https://github.com/chriskempson/base16-shell)을

469− 위해 디자인되었습니다.

470− 이는 16부터 21의 일부 밝은 색상을 8비트 색상으로 대치합니다.

471− 단지 256-색상 터미널을 쓰지만 base16-shell을 쓰지 않는다고 해서 이것을

472− 사용하지 **마십시오**.

473−

474−이들 테마는 더 제한적이지만, 트루컬러 테마에 비해 두 장점이 있습니다:

475−

476−- 이들은 3비트 혹은 4비트 색상을 쓰는 다른 터미널 소프트웨어와 더 잘

477− 어울립니다.

478−- 만약 터미널 테마를 바꾼다면, 이미 화면 상의 `bat`의 출력도 이에 맞추어

479− 업데이트됩니다.

480−

481−### 출력 스타일

482−

483−`--style` 옵션을 이용하면 `bat`의 출력 모양을 조절할 수 있습니다.

484−예를 들어, `--style=numbers,changes`를 통해 Git 변경분과 줄 번호는 출력하지만

485−격자와 파일 헤더는 출력하지 않을 수 있습니다.

486−`BAT_STYLE` 환경 변수를 정의하여 이러한 수정을 영구적으로 하거나 `bat`의

487−[설정 파일](#설정-파일)을 사용하세요.

488−

489−### 새로운 문법 / 언어 정의 추가하기

490−

491−만약 `bat`에서 특정 문법이 지원되지 않을 경우, 다음의 절차를 통해 현재 `bat`

492−설치본에 새로운 문법을 쉽게 추가할 수 있습니다.

493−

494−`bat`은 문법 강조를 위해 훌륭한

495−[`syntect`](https://github.com/trishume/syntect/) 라이브러리를 사용합니다.

496−`syntect`는 임의의 [Sublime Text의 `.sublime-syntax`

497−파일](https://www.sublimetext.com/docs/3/syntax.html)과 테마를 읽을 수 있습니다.

498−

499−[Package Control](https://packagecontrol.io/)에 Sublime 문법 패키지를 찾는

500−방법이 잘 정리되어 있습니다.

501−일단 문법을 찾았다면:

502−

503−1. 문법 정의 파일들을 넣을 폴더를 만듭니다:

504−

505− ```bash

506− mkdir -p "$(bat --config-dir)/syntaxes"

507− cd "$(bat --config-dir)/syntaxes"

508−

509− # Put new '.sublime-syntax' language definition files

510− # in this folder (or its subdirectories), for example:

511− git clone https://github.com/tellnobody1/sublime-purescript-syntax

512− ```

513−

514−2. 이제 다음 명령어를 통해 파일들을 파싱(parse)하여 바이너리 캐시를 만듭니다.

515−

516− ```bash

517− bat cache --build

518− ```

519−

520−3. 마지막으로, `bat --list-languages`로 새로 추가한 언어가 사용 가능한지

521− 확인합니다.

522−

523− 만약 기본 설정으로 돌아갈 일이 생긴다면, 다음 명령어를 이용합니다:

524−

525− ```bash

526− bat cache --clear

527− ```

528−

529−4. 만약 특정 문법이 `bat`에 기본적으로 포함되어 있어야 한다고 생각한다면, 방침과

530− 절차를 [여기](../doc/assets.md)서 읽은 후 "문법 요청(syntax request)"을 열어

531− 주세요: [문법 요청하기](https://github.com/sharkdp/bat/issues/new?labels=syntax-request&template=syntax_request.md).

532−

533−### 새로운 테마 추가하기

534−

535−이 과정은 새로운 문법 정의 추가 방식과 매우 비슷합니다.

536−

537−먼저, 새로운 문법 강조 테마 폴더를 만듭니다.

538−```bash

539−mkdir -p "$(bat --config-dir)/themes"

540−cd "$(bat --config-dir)/themes"

541−

542−# Download a theme in '.tmTheme' format, for example:

543−git clone https://github.com/greggb/sublime-snazzy

544−

545−# Update the binary cache

546−bat cache --build

547−```

548−

549−마지막으로 `bat --list-themes`을 통해 새로 추가한 테마들이 사용 가능한지

550−확인합니다.

551−

552−### 파일 타입 설정을 추가하거나 변경하기

553−

554−새로운 파일 이름 패턴을 추가하려면 (혹은 이미 존재하는 것을 변경하려면)

555−`--map-syntax` 커맨드 라인 옵션을 사용하세요.

556−이 옵션은 `pattern:syntax` 꼴의 인자를 받습니다.

557−이때 `pattern`은 파일 이름과 절대 파일 경로를 매치할 글로브(glob) 패턴입니다.

558−`syntax` 부분은 지원되는 언어의 전체 이름입니다

559−(`bat --list-languages`를 통해 개요를 확인하세요).

560−

561−참고: 이 옵션은 커맨드 라인에 넘겨 주는 것보다는 `bat`의 설정 파일에 넣는 것이

562−좋을 것입니다 (아래를 보세요).

563−

564−예시: "INI" 문법 강조를 `.conf` 파일 확장자의 모든 파일에 적용하려면, 다음을

565−사용하세요:

566−```bash

567−--map-syntax='*.conf:INI'

568−```

569−

570−예시: `.ignore`(완전 일치)이라는 이름의 모든 파일을 "Git Ignore" 문법으로

571−열려면, 다음을 사용하세요:

572−```bash

573−--map-syntax='.ignore:Git Ignore'

574−```

575−

576−예시: `/etc/apache2`의 하위 폴더들에 있는 모든 `.conf` 파일들을 "Apache Conf"

577−문법으로 열려면, 다음을 사용하세요 (이 대응(mapping)은 이미 내장되어 있습니다):

578−```bash

579−--map-syntax='/etc/apache2/**/*.conf:Apache Conf'

580−```

581−

582−### 다른 페이저 사용하기

583−

584−`bat`은 환경 변수 `PAGER`에 명시된 페이저를 사용합니다.

585−이 변수가 정의되어 있지 않다면, `less`가 기본으로 사용됩니다.

586−만약 다른 페이저를 사용하고 싶다면, `PAGER` 변수를 수정하거나 `BAT_PAGER` 환경

587−변수를 설정하여 `PAGER`의 설정을 오버라이드(override)할 수 있습니다.

588−

589−만약 커맨드라인 인수들을 페이저에게 넘겨 주려면, `PAGER`/`BAT_PAGER` 변수로

590−설정할 수 있습니다:

591−

592−```bash

593−export BAT_PAGER="less -RF"

594−```

595−

596−환경 변수를 사용하는 대신, `bat`의 [설정 파일](#설정-파일)로 페이저를 설정할

597−수도 있습니다 (`--pager` 옵션).

598−

599−**참고**: 기본적으로, 페이저가 `less`로 설정되어 있다면 (그리고 커맨드 라인

600−옵션이 지정되어 있지 않다면), `bat`은 다음 옵션들을 페이저로 넘겨줍니다:

601−`-R`/`--RAW-CONTROL-CHARS`, `-F`/`--quit-if-one-screen` 그리고 `-X`/`--no-init`.

602−마지막 옵션(`-X`)은 530 이전 버전의 `less`에만 사용됩니다.

603−

604−`-R` 옵션은 ANSI 색상을 올바르게 해석하기 위해 필요합니다.

605−두 번째 옵션(`-F`)은 출력 크기가 터미널의 세로 크기보다 작을 경우 less가 즉시

606−종료되도록 합니다.

607−이는 작은 파일을 다룰 때 페이저를 종료하기 위해 `q`를 누를 필요 없어서

608−편리합니다.

609−세 번째 옵션(`-X`)는 예전 버전의 `less`에 있는 `--quit-if-one-screen` 기능의

610−버그를 고치기 위해 필요합니다.

611−안타깝게도, 이는 `less`의 마우스 휠 지원과 호환되지 않습니다.

612−

613−`less`의 예전 버전에서 마우스 휠 기능을 활성화하려면, `-R` 옵션을 넘겨주세요

614−(위의 예제처럼, 이 옵션은 quit-if-one-screen 기능을 비활성화합니다).

615−less 530과 이후 버전에서는 그대로 사용할 수 있습니다.

616−

617−### 들여쓰기

618−

619−`bat`은 페이저에 의존하지 않고 탭을 4 스페이스로 확장합니다.

620−이를 변경하려면 간단히 `--tabs` 인자에 표시되기를 원하는 스페이스 개수를

621−추가하세요.

622−

623−**참고**: (`bat`의 `--pager` 인자 혹은 `less`의 `LESS` 환경 변수를 통해)

624−페이저의 탭 길이를 지정하는 것은 효과가 없을 것인데, 이는 페이저가 이미

625−스페이스로 확장된 탭을 받기 때문입니다.

626−이 기능은 사이드바에 의한 들여쓰기 문제를 회피하기 위해 추가되었습니다.

627−`bat`을 `--tabs=0`과 함께 호출하면 이를 오버라이드하여 페이저가 탭을 처리하게

628−합니다.

629−

630−### 다크 모드

631−

632−macOS에서 다크 모드를 사용하고 있다면, `bat`가 OS 테마에 따라 다른 테마를

633−사용하도록 구성할 수 있습니다.

634−아래 스니펫은 _다크 모드_에서는 `default` 테마를, _라이트 모드_에서는 `GitHub`

635−테마를 사용하는 방법입니다.

636−

637−```bash

638−alias cat="bat --theme=\$(defaults read -globalDomain AppleInterfaceStyle &> /dev/null && echo default || echo GitHub)"

639−```

640−

641−## 설정 파일

642−

643−`bat`는 설정 파일로도 사용자화 할 수 있습니다.

644−설정 파일의 위치는 운영 체제에 따라 다릅니다.

645−아래 커맨드를 통해 시스템의 기본 경로를 확인할 수 있습니다.

646−```

647−bat --config-file

648−```

649−

650−또는, `BAT_CONFIG_PATH` 환경 변수를 사용하여 `bat`가 설정 파일의 기본 경로

651−이외의 위치를 사용하도록 할 수 있습니다.

652−```bash

653−export BAT_CONFIG_PATH="/path/to/bat.conf"

654−```

655−

656−기본 설정 파일은 `--generate-config-file` 옵션으로 생성할 수 있습니다.

657−```bash

658−bat --generate-config-file

659−```

660−

661−### 포맷

662−

663−설정 파일은 단순히 커맨드 라인 인자들의 리스트입니다.

664−`bat --help`로 가능한 모든 옵션과 값들을 확인하세요.

665−추가적으로, 줄 앞에 `#` 문자를 추가해 주석을 넣을 수 있습니다.

666−

667−설정 파일 예시:

668−```bash

669−# "TwoDark" 테마 설정하기

670−--theme="TwoDark"

671−

672−# 줄 번호, Git 변경 내용, 파일 헤더 보이기 (격자 없이)

673−--style="numbers,changes,header"

674−

675−# 터미널에서 이탤릭체 쓰기 (일부 터미널에서 미지원)

676−--italic-text=always

677−

678−# Arduino .ino 파일에 C++ 문법 쓰기

679−--map-syntax "*.ino:C++"

680−```

681−

682−## Windows에서 `bat` 사용하기

683−

684−`bat`는 대부분의 경우 Windows에서 기본적으로 잘 작동하지만, 일부 기능은 추가적인

685−구성이 필요할 수 있습니다.

686−

687−#### 전제 조건

688−

689−[Visual C++ 재배포 가능](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads)

690−패키지를 설치해야 합니다.

691−

692−### 페이징

693−

694−Windows는 `more` 형식의 매우 제한된 페이저만 포함합니다.

695−Windows용 `less` 바이너리는

696−[공식 홈페이지](http://www.greenwoodsoftware.com/less/download.html)나

697−[Chocolatey](https://chocolatey.org/packages/Less)를 통해 다운로드 받을 수

698−있습니다.

699−이를 사용하려면 디렉터리 안의 바이너리를 `PATH`에 넣거나

700−[환경 변수로 정의](#using-a-different-pager)하세요.

701−[Chocolatey 패키지](#on-windows)는 `less`를 자동으로 설치합니다.

702−

703−### 색상

704−

705−Windows 10은

706−[v1511](https://en.wikipedia.org/wiki/Windows_10_version_history#Version_1511_(November_Update))부터

707−기본적으로 `conhost.exe`(Command Prompt)와 PowerShell에서 색상을 지원하며,

708−최신 버전의 bash에서도 색상을 지원합니다.

709−이전 버전의 Windows에서는, [ConEmu](https://conemu.github.io/)가 포함된

710−[Cmder](http://cmder.net/)를 사용할 수 있습니다.

711−

712−**참고:** Git과 MSYS 버전의 `less`는 Windows에서 색상을 올바르게 해석하지

713−않습니다.

714−다른 페이저가 설치되어 있지 않은 경우, `--paging=never`을 넘겨주거나

715−`BAT_PAGER`을 빈 문자열로 설정하여 페이징을 완전히 비활성화 할 수 있습니다.

716−

717−### Cygwin

718−

719−Windows에서의 `bat`은 기본적으로 Cygwin의 unix 스타일 경로(`/cygdrive/*`)를

720−지원하지 않습니다.

721−Cygwin 절대 경로를 인자로 받았을 때, `bat`은 다음과 같은 오류를 반환합니다:

722−`The system cannot find the path specified. (os error 3)`

723−

724−이는 wrapper를 만들거나 다음 함수를 `.bash_profile`에 추가하여 해결할 수

725−있습니다:

726−

727−```bash

728−bat() {

729− local index

730− local args=("$@")

731− for index in $(seq 0 ${#args[@]}) ; do

732− case "${args[index]}" in

733− -*) continue;;

734− *) [ -e "${args[index]}" ] && args[index]="$(cygpath --windows "${args[index]}")";;

735− esac

736− done

737− command bat "${args[@]}"

738−}

739−```

740−

741−## 문제 해결

742−

743−### 터미널과 색상

744−

745−`bat`은 터미널의 트루컬러 지원 여부와 상관 없이 동작합니다.

746−그러나 대부분 문법 강조 테마의 색상은 8비트 색상에 최적화되어 있지 않습니다.

747−따라서 24비트 트루컬러 지원이 되는 터미널(`terminator`, `konsole`, `iTerm2`,

748−...)을 사용하는 것을 적극 권장합니다.

749−트루컬러를 지원하는 터미널들과 더 자세한 정보는

750−[이 글](https://gist.github.com/XVilka/8346728)에서 찾아보실 수 있습니다.

751−

752−사용하고 있는 트루컬러 터미널에서 `COLORTERM` 변수를 `truecolor` 혹은

753−`24bit`로 설정되어 있는지 확인하세요.

754−그렇지 않을 경우, `bat`은 24비트 확장열(escape sequence)이 지원되는지 여부를

755−판단할 수 없습니다 (그리고 8비트 색상을 사용합니다).

756−

757−### 줄 번호와 격자가 잘 보이지 않는 경우

758−

759−다른 테마를 사용해 보세요 (`bat --list-themes`에서 목록을 볼 수 있습니다).

760−`OneHalfDark`와 `OneHalfLight` 테마는 더 밝은 눈금과 선의 색상을 사용합니다.

761−

762−### 파일 인코딩

763−

764−`bat`은 기본적으로 UTF-8과 UTF-16을 지원합니다.

765−다른 모든 종류의 파일 인코딩에 대해서는, 일반적으로 인코딩을 자동으로 판별하는

766−방법이 없기 때문에 먼저 UTF-8으로 변환해야 할 수 있습니다.

767−이를 위해 `iconv`를 사용할 수 있습니다.

768−예시: Latin-1(ISO-8859-1)로 인코딩된 PHP 파일은 다음과 같이 처리할 수 있습니다:

769−``` bash

770−iconv -f ISO-8859-1 -t UTF-8 my-file.php | bat

771−```

772−참고: `bat`으로 문법 자동 감지가 되지 않는 경우에는 `-l`/`--language` 옵션을

773−사용할 수 있습니다.

774−

775−## 개발

776−

777−```bash

778−# 모든 서브모듈을 받기 위해 재귀적으로 복제하기

779−git clone --recursive https://github.com/sharkdp/bat

780−

781−# (디버그 버전) 빌드

782−cd bat

783−cargo build --bins

784−

785−# 단위 테스트와 통합 테스트 실행

786−cargo test

787−

788−# (배포 버전) 설치

789−cargo install --locked

790−

791−# 수정된 문법과 테마가 적용된 bat 바이너리 빌드

792−bash assets/create.sh

793−cargo install --locked --force

794−```

795−

796−`bat`의 pretty-printing 기능을 라이브러리로 사용하는 애플리케이션을 만들고

797−싶다면, [API 문서](https://docs.rs/bat/)를 살펴보세요.

798−참고로 `bat`에 라이브러리로써 의존한다면, `regex-onig`나 `regex-fancy`를

799−기능으로 사용해야 합니다.

800−

801−## 기여하기

802−

803−[`CONTRIBUTING.md`](../CONTRIBUTING.md) 가이드를 살펴보세요.

804−

805−## 메인테이너들

806−

807−- [sharkdp](https://github.com/sharkdp)

808−- [eth-p](https://github.com/eth-p)

809−- [keith-hall](https://github.com/keith-hall)

810−- [Enselic](https://github.com/Enselic)

811−

812−## 보안 취약점

813−

814−만약 `bat`의 취약점을 발견하였다면, [David Peter](https://david-peter.de/)에게 메일로 연락주시기 바랍니다.

815−

816−## 프로젝트 목표와 대안들

817−

818−`bat`은 다음과 같은 목표를 달성하려고 합니다:

819−

820−- 아름답고 발전된 문법 강조 기능 제공

821−- Git과의 연동을 통한 파일 변경 내용 확인

822−- (POSIX) `cat`의 대체제

823−- 사용자 친화적인 커맨드 라인 인터페이스 제공

824−

825−비슷한 프로그램들을 찾고 있다면 많은 대안들이 있습니다.

826−비교는 [이 문서](../doc/alternatives.md)를 참조해 주세요.

827−

828−## 라이센스

830−

831−`bat`는 여러분의 선택에 따라 MIT 라이센스 또는 Apache 라이센스 2.0의 조건에 따라

832−배포됩니다.

833−

834−라이센스의 세부사항은 [LICENSE-APACHE](../LICENSE-APACHE)와

835−[LICENSE-MIT](../LICENSE-MIT)를 참조하세요.

doc/README-ru.mddeleted−597

@@ -1,597 +0,0 @@

1−

2− <img src="logo-header.svg" alt="bat - a cat clone with wings">

3− <a href="https://github.com/sharkdp/bat/actions?query=workflow%3ACICD"><img src="https://github.com/sharkdp/bat/workflows/CICD/badge.svg" alt="Build Status"></a>

4− <img src="https://img.shields.io/crates/l/bat.svg" alt="license">

5− <a href="https://crates.io/crates/bat"><img src="https://img.shields.io/crates/v/bat.svg?colorB=319e8c" alt="Version info"></a>

6− Клон утилиты cat(1) с поддержкой выделения синтаксиса и Git

7−

8−

9−

10− <a href="#выделение-синтаксиса">Ключевые возможности</a> •

11− <a href="#как-использовать">Использование</a> •

12− <a href="#установка">Установка</a> •

13− <a href="#кастомизация">Кастомизация</a> •

14− <a href="#цели-и-альтернативы">Цели и альтернативы </a>

15− [<a href="../README.md">English]

16− [<a href="README-zh.md">中文</a>]

17− [<a href="README-ja.md">日本語</a>]

18− [<a href="README-ko.md">한국어</a>]

19− [Русский]

20−

21−

22−### Выделение синтаксиса

23−

24−`bat` поддерживает выделение синтаксиса для огромного количества языков программирования и разметки:

25−

26−![Пример выделения синтаксиса](https://i.imgur.com/3FGy5tW.png)

27−

28−### Интеграция с Git

29−`bat` использует `git`, чтобы показать изменения в коде

30−(смотрите на левый сайдбар):

31−

32−![Пример интеграции с Git](https://i.imgur.com/azUAzdx.png)

33−

34−### Показать непечатаемые символы

35−

36−Вы можете использовать `-A` / `--show-all` флаг, чтобы показать символы, которые невозможно напечатать:

37−

38−![Строка с неотображемыми символами](https://i.imgur.com/X0orYY9.png)

39−

40−### Автоматическое разделение текста

41−

42−`bat` умеет перенаправлять вывод в `less`, если вывод не помещается на экране полностью.

43−

44−### Объединение файлов

45−

46−О... Вы также можете объединять файлы :wink:. Когда

47−`bat` обнаружит неинтерактивный терминал (например, когда вы перенаправляете вывод в файл или процесс), он будет работать как утилита `cat` и выведет содержимое файлов как обычный текст (без подсветки синтаксиса).

48−

49−## Как использовать

50−

51−Вывести единственный файл в терминале

52−

53−```bash

54−> bat README.md

55−```

56−

57−Отобразить сразу несколько файлов в терминале

58−

59−```bash

60−> bat src/*.rs

61−```

62−

63−Читаем из stdin и определяем синтаксис автоматически (внимание: это делается по заглавной строке файла, например, `#!/bin/sh`)

64−

65−```bash

66−> curl -s https://sh.rustup.rs | bat

67−```

68−

69−Прочитать из stdin с явным указанием языка

70−

71−```bash

72−> yaml2json .travis.yml | json_pp | bat -l json

73−```

74−

75−Вывести и выделить неотображаемые символы

76−```bash

77−> bat -A /etc/hosts

78−```

79−

80−Использование в качестве замены `cat`

81−

82−```bash

83−bat > note.md # мгновенно создаем новый файл

84−

85−bat header.md content.md footer.md > document.md

86−

87−bat -n main.rs # показываем только количество строк

88−

89−bat f - g # выводит 'f' в stdin, а потом 'g'.

90−```

91−

92−### Интеграция с другими утилитами

93−

94−#### `find` или `fd`

95−

96−Вы можете использовать флаг `-exec` в `find`, чтобы посмотреть превью всех файлов в `bat`

97−```bash

98−find … -exec bat {} +

99−```

100−

101−Если вы используете [`fd`](https://github.com/sharkdp/fd), применяйте для этого флаг `-X`/`--exec-batch`:

102−```bash

103−fd … -X bat

104−```

105−

106−#### `ripgrep`

107−

108−С помощью [`batgrep`](https://github.com/eth-p/bat-extras/blob/master/doc/batgrep.md), `bat` может быть использован для вывода результата запроса [`ripgrep`](https://github.com/BurntSushi/ripgrep)

109−

110−```bash

111−batgrep needle src/

112−```

113−

114−#### `tail -f`

115−

116−`bat` может быть использован вместе с `tail -f`, чтобы выводить содержимое файла с подсветкой синтаксиса в реальном времени.

117−```bash

118−tail -f /var/log/pacman.log | bat --paging=never -l log

119−```

120−Заметьте, что мы должны отключить пэйджинг, чтобы это заработало. Мы также явно указали синтаксис (`-l log`), так как он не может быть автоматически определен в данном случае.

121−

122−#### `git`

123−

124−Вы можете использовать `bat` с `git show`, чтобы просмотреть старую версию файла с выделением синтаксиса:

125−```bash

126−git show v0.6.0:src/main.rs | bat -l rs

127−```

128−

129−Обратите внимание, что выделение синтаксиса не работает в `git diff` на данный момент. Если вам это нужно, посмотрите [`delta`](https://github.com/dandavison/delta).

130−

131−#### `xclip`

132−

133−Нумерация стро и отображение изменений затрудняет копирование содержимого файлов в буфер обмена.

134−Чтобы спроваиться с этим, используйте флаг `-p`/`--plain` или просто перенаправьте стандартный вывод в `xclip`:

135−```bash

136−bat main.cpp | xclip

137−```

138−`bat` обнаружит перенаправление вывода и выведет обычный текст без выделения синтаксиса.

139−

140−#### `man`

141−

142−`bat` может быть использован в виде выделения цвета для `man`, для этого установите переменную окружения

143−`MANPAGER`:

144−

145−```bash

146−export MANPAGER="sh -c 'col -bx | bat -l man -p'"

147−man 2 select

148−```

149−

150−Возможно вам понадобится также установить `MANROFFOPT="-c"`, если у вас есть проблемы с форматированием.

151−

152−Если вы хотите сделать этой одной командой, вы можете использовать [`batman`](https://github.com/eth-p/bat-extras/blob/master/doc/batman.md).

153−

154−Обратите внимание, что [синтаксис manpage](assets/syntaxes/02_Extra/Manpage.sublime-syntax) разрабатывается в этом репозитории и все еще находится в разработке.

155−

156−#### `prettier` / `shfmt` / `rustfmt`

157−

158−[`Prettybat`](https://github.com/eth-p/bat-extras/blob/master/doc/prettybat.md) — скрипт, который форматирует код и выводит его с помощью `bat`.

159−

160−

161−## Установка

162−

163−[![Packaging status](https://repology.org/badge/vertical-allrepos/bat-cat.svg)](https://repology.org/project/bat-cat/versions)

164−

165−### Ubuntu (с помощью `apt`)

166−*... и другие дистрибутивы основанные на Debian.*

167−

168−`bat` есть в репозиториях [Ubuntu](https://packages.ubuntu.com/eoan/bat) и

169−[Debian](https://packages.debian.org/sid/bat) и доступен начиная с Ubuntu Eoan 19.10. На Debian `bat` пока что доступен только с нестабильной веткой "Sid".

170−

171−Если ваша версия Ubuntu/Debian достаточно новая, вы можете установить `bat` так:

172−

173−```bash

174−apt install bat

175−```

176−

177−Если вы установили `bat` таким образом, то бинарный файл может быть установлен как `batcat` вместо `bat` (из-за [конфликта имени с другим пакетом](https://github.com/sharkdp/bat/issues/982)). Вы можете сделать симлинк или алиас `bat -> batcat`, чтобы предотвратить подобные проблемы и в других дистрибутивах.

178−

179−``` bash

180−mkdir -p ~/.local/bin

181−ln -s /usr/bin/batcat ~/.local/bin/bat

182−```

183−

184−### Ubuntu (С помощью самого нового `.deb` пакета)

185−*... и другие дистрибутивы Linux основанные на Debian*

186−

187−Если пакет еще недоступен в вашем Ubuntu/Debian дистрибутиве или вы хотите установить самую последнюю версию `bat`, то вы можете скачать самый последний `deb`-пакет отсюда:

188−[release page](https://github.com/sharkdp/bat/releases) и установить так:

189−

190−```bash

191−sudo dpkg -i bat_0.18.3_amd64.deb # измените архитектуру и версию

192−```

193−

194−### Alpine Linux

195−

196−Вы можете установить [`bat`](https://pkgs.alpinelinux.org/packages?name=bat) из официальных источников:

197−

198−```bash

199−apk add bat

200−```

201−

202−### Arch Linux

203−

204−Вы можете установить [`bat`](https://www.archlinux.org/packages/community/x86_64/bat/) из официального источника:

205−

206−```bash

207−pacman -S bat

208−```

209−

210−### Fedora

211−

212−Вы можете установить [`bat`](https://koji.fedoraproject.org/koji/packageinfo?packageID=27506) из официального репозитория [Fedora Modular](https://docs.fedoraproject.org/en-US/modularity/using-modules/).

213−

214−```bash

215−dnf install bat

216−```

217−

218−### Gentoo Linux

219−

220−Вы можете установить [`bat`](https://packages.gentoo.org/packages/sys-apps/bat) из официальных источников:

221−

222−```bash

223−emerge sys-apps/bat

224−```

225−

226−### Void Linux

227−

228−Вы можете установить `bat` с помощью `xbps-install`:

229−```bash

230−xbps-install -S bat

231−```

232−

233−### FreeBSD

234−

235−Вы можете установить [`bat`](https://www.freshports.org/textproc/bat) с помощью `pkg`:

236−

237−```bash

238−pkg install bat

239−```

240−

241−или самому скомпилировать его:

242−

243−```bash

244−cd /usr/ports/textproc/bat

245−make install

246−```

247−

248−### С помощью nix

249−

250−Вы можете установить `bat`, используя [nix package manager](https://nixos.org/nix):

251−

252−```bash

253−nix-env -i bat

254−```

255−

256−### openSUSE

257−

258−Вы можете установить `bat` с помощью `zypper`:

259−

260−```bash

261−zypper install bat

262−```

263−

264−### macOS

265−

266−Вы можете установить `bat` с помощью [Homebrew](http://braumeister.org/formula/bat):

267−

268−```bash

269−brew install bat

270−```

271−

272−Или же установить его с помощью [MacPorts](https://ports.macports.org/port/bat/summary):

273−

274−```bash

275−port install bat

276−```

277−

278−### Windows

279−

280−Есть несколько способов установить `bat`. Как только вы установили его, посмотрите на секцию ["Использование `bat` в Windows"](#using-bat-on-windows).

281−

282−#### С помощью Chocolatey

283−

284−Вы можете установить `bat` с помощью [Chocolatey](https://chocolatey.org/packages/Bat):

285−```bash

286−choco install bat

287−```

288−

289−#### С помощью Scoop

290−

291−Вы можете установить `bat` с помощью [scoop](https://scoop.sh/):

292−```bash

293−scoop install bat

294−```

295−

296−Для этого у вас должен быть установлен [Visual C++ Redistributable](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads).

297−

298−#### Из заранее скомпилированных файлов:

299−

300−Их вы можете скачать на [странице релизов](https://github.com/sharkdp/bat/releases).

301−

302−Для этого у вас должен быть установлен [Visual C++ Redistributable](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads).

303−

304−### С помощью Docker

305−

306−Вы можете использовать [Docker image](https://hub.docker.com/r/danlynn/bat/), чтобы запустить `bat` в контейнере:

307−```bash

308−docker pull danlynn/bat

309−alias bat='docker run -it --rm -e BAT_THEME -e BAT_STYLE -e BAT_TABS -v "$(pwd):/myapp" danlynn/bat'

310−```

311−

312−### С помощью Ansible

313−

314−Вы можете установить `bat` с [Ansible](https://www.ansible.com/):

315−

316−```bash

317−# Устанавливаем роль на устройстве

318−ansible-galaxy install aeimer.install_bat

319−```

320−

321−```yaml

322−---

323−# Playbook для установки bat

324−- host: all

325− roles:

326− - aeimer.install_bat

327−```

328−

329−- [Ansible Galaxy](https://galaxy.ansible.com/aeimer/install_bat)

330−- [GitHub](https://github.com/aeimer/ansible-install-bat)

331−

332−Этот способ должен сработать со следующими дистрибутивами:

333−- Debian/Ubuntu

334−- ARM (например Raspberry PI)

335−- Arch Linux

336−- Void Linux

337−- FreeBSD

338−- macOS

339−

340−### Из скомпилированных файлов

341−

342−Перейдите на [страницу релизов](https://github.com/sharkdp/bat/releases) для

343−скомпилированных файлов `bat` для различных платформ. Бинарные файлы со статической связкой так же доступны: выбирайте архив с `musl` в имени.

344−

345−### Из исходников

346−

347−Если вы желаете установить `bat` из исходников, вам понадобится Rust 1.51 или выше. После этого используйте `cargo`, чтобы все скомпилировать:

348−

349−```bash

350−cargo install --locked bat

351−```

352−

353−## Кастомизация

354−

355−### Темы для выделения текста

356−

357−Используйте `bat --list-themes`, чтобы вывести список всех доступных тем. Для выбора темы `TwoDark` используйте `bat` с флагом

358−`--theme=TwoDark` или выставьте переменную окружения `BAT_THEME` в `TwoDark`. Используйте `export BAT_THEME="TwoDark"` в конфигурационном файле вашей оболочки, чтобы изменить ее навсегда. Или же используйте [конфигурационный файл](https://github.com/sharkdp/bat#configuration-file) `bat`.

359−

360−Если вы хотите просто просмотреть темы, используйте следующую команду (для этого вам понадобится [`fzf`](https://github.com/junegunn/fzf)):

361−```bash

362−bat --list-themes | fzf --preview="bat --theme={} --color=always /путь/к/файлу"

363−```

364−

365−`bat` отлично смотрится на темном фоне. Однако если ваш терминал использует светлую тему, то такие темы как `GitHub` или `OneHalfLight` будут смотреться куда лучше!

366−Вы также можете использовать новую тему, для этого перейдите [в раздел добавления тем](https://github.com/sharkdp/bat#добавление-новых-тем).

367−

368−### Изменение внешнего вывода

369−

370−Вы можете использовать флаг `--style`, чтобы изменять внешний вид вывода в `bat`.

371−Например, вы можете использовать `--style=numbers,changes`, чтобы показать только количество строк и изменений в Git. Установите переменную окружения `BAT_STYLE` чтобы изменить это навсегда, или используйте [конфиг файл](https://github.com/sharkdp/bat#configuration-file) `bat`.

372−

373−### Добавление новых синтаксисов

374−

375−`bat` использует [`syntect`](https://github.com/trishume/syntect/) для выделения синтаксиса. `syntect` может читать

376−[файл `.sublime-syntax`](https://www.sublimetext.com/docs/3/syntax.html)

377−и темы. Чтобы добавить новый синтаксис, сделайте следующее:

378−

379−Создайте каталог с синтаксисом:

380−

381−```bash

382−mkdir -p "$(bat --config-dir)/syntaxes"

383−cd "$(bat --config-dir)/syntaxes"

384−

385−# Разместите файлы '.sublime-syntax'

386−# в каталоге (или субкаталогах), например:

387−git clone https://github.com/tellnobody1/sublime-purescript-syntax

388−```

389−

390−Теперь используйте следующую команду, чтобы превратить эти файлы в бинарный кеш:

391−

392−```bash

393−bat cache --build

394−```

395−

396−Теперь вы можете использовать `bat --list-languages`, чтобы проверить, доступны ли новые языки.

397−

398−Если когда-нибудь вы заходите вернуться к настройкам по умолчанию, введите

399−

400−```bash

401−bat cache --clear

402−```

403−

404−### Добавление новых тем

405−

406−Это работает похожим образом, так же как и добавление новых тем выделения синтаксиса

407−

408−Во-первых, создайте каталог с новыми темами для синтаксиса:

409−```bash

410−mkdir -p "$(bat --config-dir)/themes"

411−cd "$(bat --config-dir)/themes"

412−

413−# Загрузите тему в формате '.tmTheme':

414−git clone https://github.com/greggb/sublime-snazzy

415−

416−# Обновите кеш

417−bat cache --build

418−```

419−

420−Теперь используйте `bat --list-themes`, чтобы проверить доступность новых тем.

421−

422−### Использование другого пейджера.

423−

424−`bat` использует пейджер, указанный в переменной окружения `PAGER`. Если она не задана, то используется `less`.

425−Если вы желаете использовать другой пейджер, вы можете либо изменить переменную `PAGER`, либо `BAT_PAGER` чтобы перезаписать то, что указано в `PAGER`.

426−

427−Чтобы передать дополнительные аргументы вашему пейджеру, перечислите их в этой переменной:

428−

429−```bash

430−export BAT_PAGER="less -RF"

431−```

432−

433−Так же вы можете использовать [файл конфигурации](https://github.com/sharkdp/bat#configuration-file) `bat` (флаг `--pager`).

434−

435−**Внимание**: По умолчанию пейджером является`less` (без каких-либо аргументов),

436−`bat` задаст следующие флаги для пейджера:

437− `-R`/`--RAW-CONTROL-CHARS`,

438−`-F`/`--quit-if-one-screen` и `-X`/`--no-init`. Последний флаг(`-X`) используется только для `less`, чья версия раньше 530.

439−

440−Флаг `-R` нужен чтобы корректно воспроизвести ANSI цвета. Второй флаг (`-F`) говорит

441−`less` чтобы тот сразу же завершился, если размер вывода меньше чем вертикальный размер терминала.

442−Это удобно для небольших файлов, так как вам не надо каждый раз нажимать `q`, чтобы выйти из пейджера. Третий флаг (`-X`) нужен для того, чтобы исправить баг с `--quit-if-one-screen` в старых версиях `less`. К сожалению, это блокирует возможность использования колеса мышки.

443−

444−Если вы хотите все же его включить, вы можете добавить флаг `-R`.

445−Для `less` новее чем 530 оно должно работать из коробки.

446−

447−### Темная тема

448−

449−Если вы используете темный режим в macOS, возможно вы захотите чтобы `bat` использовал другую тему, основанную на теме вашей ОС. Следующий сниппет использует тему `default`, когда у вас включен темный режим, и тему `GitHub`, когда включен светлый.

450−

451−```bash

452−alias cat="bat --theme=\$(defaults read -globalDomain AppleInterfaceStyle &> /dev/null && echo default || echo GitHub)"

453−```

454−

455−## Файл конфигурации

456−

457−`bat` также может быть кастомизирован с помощью файла конфигурации. Его местоположение зависит от вашей ОС: чтобы посмотреть его путь, введите

458−```

459−bat --config-file

460−```

461−

462−Также вы можете установить переменную окружения `BAT_CONFIG_PATH`, чтобы изменить путь к файлу конфигурации.

463−```bash

464−export BAT_CONFIG_PATH="/path/to/bat.conf"

465−```

466−

467−Файл конфигурации «по умолчанию» может быть создан с помощью флага `--generate-config-file`.

468−```bash

469−bat --generate-config-file

470−```

471−

472−### Формат

473−

474−Файл конфигурации - это всего лишь набор аргументов. Введите `bat --help`, чтобы просмотреть список всех возможных флагов и аргументов. Также вы можете закомментировать строку с помощью `#`.

475−

476−Пример файла конфигурации:

477−```bash

478−# Установить тему "TwoDark"

479−--theme="TwoDark"

480−

481−# Показывать количество строк, изменений в Git и заголовок файла

482−--style="numbers,changes,header"

483−

484−# Использовать курсив (поддерживается не всеми терминалами)

485−--italic-text=always

486−

487−# Использовать синтаксис C++ для всех Arduino .ino файлов

488−--map-syntax "*.ino:C++"

489−

490−# Использовать синтаксик Git Ignore для всех файлов .ignore

491−--map-syntax ".ignore:Git Ignore"

492−```

493−

494−## Использование `bat` в Windows

495−

496−`bat` полностью работоспособен "из коробки", но для некоторых возможностей могут понадобиться дополнительные настройки.

497−

498−### Пейджинг

499−

500−Windows поддерживает только очень простой пейджер `more`. Вы можете скачать установщик для `less` [с его сайта](http://www.greenwoodsoftware.com/less/download.html) или [через Chocolatey](https://chocolatey.org/packages/Less). Чтобы его использовать, скопируйте исполняемый файл в ваш `PATH` или [используйте переменную окружения](#Использование-другого-пейджера). [Пакет из Chocolatey](#windows) установит все автоматически.

501−

502−### Цвета

503−

504−Windows 10 поддерживает цвета и в `conhost.exe` (Command Prompt), и в PowerShell начиная с версии Windows

505−[v1511](https://ru.wikipedia.org/wiki/Windows_10#Обновления и поддержка), так же как и в bash. На ранних версиях Windows вы можете использовать

506−[Cmder](http://cmder.net/), в котором есть [ConEmu](https://conemu.github.io/).

507−

508−**Внимание:** Версия `less` в Git и MSYS2 воспроизводит цвета некорректно. Если у вас нет других пейджеров, мы можете отключить использование пейджеров с помощью флага `--paging=never`

509−или установить `BAT_PAGER` равным пустой строке.

510−

511−### Cygwin

512−

513−Из коробки `bat` не поддерживает пути в стиле Unix (`/cygdrive/*`). Когда указан абсолютный путь cygwin, `bat` выдаст следующую ошибку: `The system cannot find the path specified. (os error 3)`

514−

515−Она может быть решена добавлением следующей функции в `.bash_profile`:

516−

517−```bash

518−bat() {

519− local index

520− local args=("$@")

521− for index in $(seq 0 ${#args[@]}) ; do

522− case "${args[index]}" in

523− -*) continue;;

524− *) [ -e "${args[index]}" ] && args[index]="$(cygpath --windows "${args[index]}")";;

525− esac

526− done

527− command bat "${args[@]}"

528−}

529−```

530−

531−## Проблемы и их решение

532−

533−### Терминалы и цвета

534−

535−`bat` поддерживает терминалы *с* и *без* поддержки truecolor. Однако подсветка синтаксиса не оптимизирована для терминалов с 8-битными цветами, и рекомендуется использовать терминалы с поддержкой 24-битных цветов (`terminator`, `konsole`, `iTerm2`, ...).

536−Смотрите [эту статью](https://gist.github.com/XVilka/8346728) для полного списка терминалов.

537−

538−Удостовертесь, что переменная `COLORTERM` равна `truecolor` или

539−`24bit`. Иначе `bat` не сможет определить поддержку 24-битных цветов (и будет использовать 8-битные).

540−

541−### Текст и номера строк плохо видны

542−

543−Используйте другую тему (`bat --list-themes` выведет список всех установленных тем). Темы `OneHalfDark` и

544−`OneHalfLight` имеют более яркие номера строк и тексты.

545−

546−### Кодировки файлов

547−

548−`bat` поддерживает UTF-8 и UTF-16. Файлы в других кодировках, возможно, придётся перекодировать, так как кодировка может быть распознана неверно. Используйте `iconv`.

549−Пример: у вас есть PHP файл в кодировке Latin-1 (ISO-8859-1):

550−``` bash

551−iconv -f ISO-8859-1 -t UTF-8 my-file.php | bat

552−```

553−Внимание: вам может понадобится флаг `-l`/`--language`, если `bat` не сможет автоматически определить синтаксис.

554−

555−## Разработка

556−

557−```bash

558−# Рекурсивно клонирует все модули

559−git clone --recursive https://github.com/sharkdp/bat

560−

561−# Компиляции в режиме разработки

562−cd bat

563−cargo build --bins

564−

565−# Запуск тестов

566−cargo test

567−

568−# Установка (релизная версия)

569−cargo install --locked

570−

571−# Компилирование исполняего файла bat с другим синтаксисом и темами

572−bash assets/create.sh

573−cargo install --locked --force

574−```

575−

576−## Разработчики

577−

578−- [sharkdp](https://github.com/sharkdp)

579−- [eth-p](https://github.com/eth-p)

580−

581−## Цели и альтернативы

582−

583−Цели проекта `bat`:

584−

585−- Красивая и продвинутая подсветка синтаксиса.

586−- Интеграция с Git.

587−- Полноценная замена `cat`.

588−- Дружелюбный интерфейс и аргументы.

589−

590−Есть очень много альтернатив `bat`. Смотрите [этот документ](doc/alternatives.md) для сравнения.

591−

592−## Лицензия

594−

595−`bat` распостраняется под лицензями MIT License и Apache License 2.0 (на выбор пользователя).

596−

597−Смотрите [LICENSE-APACHE](LICENSE-APACHE) и [LICENSE-MIT](LICENSE-MIT) для более подробного ознакомления.

doc/README-zh.mddeleted−678