Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ indent_size = 2
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.ts]
max_line_length = 120
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
# See https://michaelheap.com/git-ignore-rev/

7728691ea1cddf2fe53db0f007d2ac879b0d54d0
61707019a996d6c1e39a8abfb4c3d7f6af923cd2
58 changes: 29 additions & 29 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ permissions:

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for keeping the reformatting a separate commit. Could you add one more commit to this PR that adds a .git-blame-ignore-revs file to the root of the repo? Similar to https://github.com/llvm/llvm-project/blob/main/.git-blame-ignore-revs. The only known entry would the commit where you reformatted everything.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already is one apparently, so I've added the commit. Will try to remember it on next rebase, unless this is getting merged soon...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am ready to merge. Are you good to go?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, if you are. Checks are still queued though...

on:
push:
branches: [ main ]
branches: [main]
pull_request:
# The branches below must be a subset of the branches above
branches: [ main ]
branches: [main]
schedule:
- cron: '33 1 * * 5'
- cron: "33 1 * * 5"

jobs:
analyze:
Expand All @@ -35,39 +35,39 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ 'javascript' ]
language: ["javascript"]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support

steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Checkout repository
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release
#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
32 changes: 16 additions & 16 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,29 @@ permissions:

on:
push:
branches: [ main ]
branches: [main]
pull_request:
branches: [ main ]
branches: [main]
workflow_dispatch:

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: install node
uses: actions/setup-node@v3
with:
node-version: 16
- name: yarn install
run: yarn install
- name: tsc
run: tsc --noEmit --noErrorTruncation --pretty false
- uses: actions/checkout@v3
- name: install node
uses: actions/setup-node@v3
with:
node-version: 16
- name: yarn install
run: yarn install
- name: tsc
run: tsc --noEmit --noErrorTruncation --pretty false
api-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Check Meson API
run: |
git clone https://github.com/mesonbuild/meson --depth 1
./ci/check-meson-api.py
- uses: actions/checkout@v3
- name: Check Meson API
run: |
git clone https://github.com/mesonbuild/meson --depth 1
./ci/check-meson-api.py
33 changes: 33 additions & 0 deletions .github/workflows/prettier.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Prettier

on:
pull_request:
types: [opened, synchronize, reopened]

permissions:
contents: read

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref }}
cancel-in-progress: true

jobs:
prettier:
runs-on: ubuntu-latest

steps:
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: latest

- name: Checkout
uses: actions/checkout@v4

- name: Install dependencies
run: |
yarn install --immutable --immutable-cache --check-cache

- name: Check
run: |
yarn run prettier:check
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn --silent lint-staged -r
3 changes: 3 additions & 0 deletions .lintstagedrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"*.{js,jsx,ts,tsx,json,css,md,html,yml,yaml}": "prettier --write"
}
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/out/
35 changes: 24 additions & 11 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,53 +15,60 @@

## 1.9.0

- Automatically configure Intellisense to use compile_commands.json generated
by Meson
- Automatically configure Intellisense to use compile_commands.json generated by
Meson
- Meson `tasks.json` entries specifying `target` will now need to include the
target's type. E.g. `"target": "relative/path/to/targetname:shared_library"`

## 1.8.1

- Drop vscode-nls dependency, which was unused and is no longer provided by default
- Drop vscode-nls dependency, which was unused and is no longer provided by
default

## 1.8.0

- Generate `<builddir>/meson-vscode.env` to be used in `launch.json`'s `envFile`
to run programs using Meson's developper environment.
See https://mesonbuild.com/Commands.html#devenv
to run programs using Meson's developper environment. See
https://mesonbuild.com/Commands.html#devenv

## 1.7.1

- Track the version of linting tools, so that features of new versions may be used
- Track the version of linting tools, so that features of new versions may be
used

## 1.7.0

- Add `mesonbuild.debugOptions` configuration option. This allows to inject members into the debug configurations generated by this extension.
- Add `mesonbuild.debugOptions` configuration option. This allows to inject
members into the debug configurations generated by this extension.
- Add gcc compiler errors to problem view
- Allow opening meson.build files from tree-view
- Add button to run configure from the tree-view
- Add setupOptions, for options to pass exclusively to meson setup, but not meson configure
- Add setupOptions, for options to pass exclusively to meson setup, but not
meson configure

## 1.6.0

- Add highlighting for `add_project_dependencies()`
- Add a meson DSL linter framework
- Add a meson DSL formatter framework
- Add [muon](https://muon.build) as a linting and formatting provider
- Add `in` operator


## 1.5.2

- Fix highlighting for `structured_sources()`
- Add highlighting for `install_symlink()`
- Add highlighting for `debug()`
- Remove highlighting for obsolete `getext()` and `find_library()`. These have been deprecated for some time and will result in an error if used.
- Remove highlighting for obsolete `getext()` and `find_library()`. These have
been deprecated for some time and will result in an error if used.
- Add highlighting for `unset_variable()`, `install_emptydir()`, and `range()`


## 1.5.1

- Add highlighting for the new `structured_sources` function

## 1.5.0

- Update to the new Meson icon
- Initial support for the vscode native testing API
- Add support for vscode debug API
Expand All @@ -73,6 +80,7 @@
- Update various deprecated vscode features and API usage

## 1.4.0

- Move to the mesonbuild project
- syntax highlighting for dictionary literals, continue and break
- Bugfix: tests and benchmarks with spaces in their names now work
Expand All @@ -83,23 +91,28 @@
- Bugifx: Reload view on changes.

## 1.3.0

- Remove layout=flat from default options
- Change default build folder to builddir
- Add syntax highlighting for new builtins

## 1.2.0

- Add support for automatic task provider using `meson introspect`
- Add code snippets
- Add extension configuration

## 1.1.1

- Remove configuration for {} as special tokens
- Add licensing information

## 1.1.0

- Add support for toggling comments
- Auto-close brackets and strings
- Add support for hex literals

## 1.0.0

- Initial release
Loading