Skip to content

Commit

Permalink
Merge branch 'master' into new-cbs-classifier
Browse files Browse the repository at this point in the history
  • Loading branch information
lildude committed Jun 8, 2024
2 parents 37db40b + 42fd3c2 commit 8e475ff
Show file tree
Hide file tree
Showing 377 changed files with 11,455 additions and 919 deletions.
7 changes: 3 additions & 4 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@
"vscode": {
"extensions": [
"EditorConfig.EditorConfig",
"rebornix.Ruby",
"redhat.vscode-yaml"
"redhat.vscode-yaml",
"Shopify.ruby-lsp"
]
}
},
"onCreateCommand": "./script/bootstrap",
"postCreateCommand": ".devcontainer/postCreate.sh",
"onCreateCommand": ".devcontainer/onCreateCommand.sh",
"remoteUser": "vscode"
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/bin/sh
./script/bootstrap
git remote add linguist https://github.com/github-linguist/linguist
git fetch linguist v2.0.0:v2.0.0 test/attributes:test/attributes test/master:test/master
108 changes: 90 additions & 18 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@
[submodule "vendor/grammars/FreeMarker.tmbundle"]
path = vendor/grammars/FreeMarker.tmbundle
url = https://github.com/freemarker/FreeMarker.tmbundle
[submodule "vendor/grammars/GeneroFgl.tmbundle"]
path = vendor/grammars/GeneroFgl.tmbundle
url = https://github.com/FourjsGenero/GeneroFgl.tmbundle.git
[submodule "vendor/grammars/Handlebars"]
path = vendor/grammars/Handlebars
url = https://github.com/daaain/Handlebars
Expand All @@ -61,6 +64,9 @@
[submodule "vendor/grammars/LiveScript.tmbundle"]
path = vendor/grammars/LiveScript.tmbundle
url = https://github.com/paulmillr/LiveScript.tmbundle
[submodule "vendor/grammars/Luau.tmLanguage"]
path = vendor/grammars/Luau.tmLanguage
url = https://github.com/JohnnyMorganz/Luau.tmLanguage.git
[submodule "vendor/grammars/MATLAB-Language-grammar"]
path = vendor/grammars/MATLAB-Language-grammar
url = https://github.com/mathworks/MATLAB-Language-grammar
Expand Down Expand Up @@ -185,9 +191,6 @@
[submodule "vendor/grammars/TXL"]
path = vendor/grammars/TXL
url = https://github.com/MikeHoffert/Sublime-Text-TXL-syntax
[submodule "vendor/grammars/Terraform.tmLanguage"]
path = vendor/grammars/Terraform.tmLanguage
url = https://github.com/alexlouden/Terraform.tmLanguage
[submodule "vendor/grammars/Textmate-Gosu-Bundle"]
path = vendor/grammars/Textmate-Gosu-Bundle
url = https://github.com/jpcamara/Textmate-Gosu-Bundle
Expand Down Expand Up @@ -323,9 +326,6 @@
[submodule "vendor/grammars/atom-salt"]
path = vendor/grammars/atom-salt
url = https://github.com/saltstack/atom-salt
[submodule "vendor/grammars/atomic-dreams"]
path = vendor/grammars/atomic-dreams
url = https://github.com/PJB3005/atomic-dreams
[submodule "vendor/grammars/ats"]
path = vendor/grammars/ats
url = https://github.com/steinwaywhw/ats-mode-sublimetext
Expand Down Expand Up @@ -353,6 +353,9 @@
[submodule "vendor/grammars/boogie-vscode"]
path = vendor/grammars/boogie-vscode
url = https://github.com/boogie-org/boogie-vscode
[submodule "vendor/grammars/bqn-vscode"]
path = vendor/grammars/bqn-vscode
url = https://github.com/razetime/bqn-vscode.git
[submodule "vendor/grammars/browserslist-vscode"]
path = vendor/grammars/browserslist-vscode
url = https://github.com/browserslist/browserslist-vscode
Expand Down Expand Up @@ -383,6 +386,9 @@
[submodule "vendor/grammars/cmake.tmbundle"]
path = vendor/grammars/cmake.tmbundle
url = https://github.com/textmate/cmake.tmbundle
[submodule "vendor/grammars/common-lisp-tmlanguage"]
path = vendor/grammars/common-lisp-tmlanguage
url = https://github.com/qingpeng9802/common-lisp-tmlanguage.git
[submodule "vendor/grammars/conllu-linguist-grammar"]
path = vendor/grammars/conllu-linguist-grammar
url = https://github.com/odanoburu/conllu-linguist-grammar
Expand All @@ -395,6 +401,9 @@
[submodule "vendor/grammars/creole"]
path = vendor/grammars/creole
url = https://github.com/Siddley/Creole
[submodule "vendor/grammars/cron.tmbundle"]
path = vendor/grammars/cron.tmbundle
url = https://github.com/textmate/cron.tmbundle
[submodule "vendor/grammars/csharp-tmLanguage"]
path = vendor/grammars/csharp-tmLanguage
url = https://github.com/dotnet/csharp-tmLanguage
Expand Down Expand Up @@ -425,6 +434,9 @@
[submodule "vendor/grammars/diff.tmbundle"]
path = vendor/grammars/diff.tmbundle
url = https://github.com/textmate/diff.tmbundle
[submodule "vendor/grammars/dm-syntax"]
path = vendor/grammars/dm-syntax
url = https://github.com/spacestation13/dm-syntax.git
[submodule "vendor/grammars/dylan.tmbundle"]
path = vendor/grammars/dylan.tmbundle
url = https://github.com/textmate/dylan.tmbundle
Expand All @@ -437,6 +449,12 @@
[submodule "vendor/grammars/ecl-tmLanguage"]
path = vendor/grammars/ecl-tmLanguage
url = https://github.com/hpcc-systems/ecl-tmLanguage
[submodule "vendor/grammars/edge-vscode"]
path = vendor/grammars/edge-vscode
url = https://github.com/edge-js/edge-vscode.git
[submodule "vendor/grammars/edgedb-editor-plugin"]
path = vendor/grammars/edgedb-editor-plugin
url = https://github.com/edgedb/edgedb-editor-plugin.git
[submodule "vendor/grammars/eiffel.tmbundle"]
path = vendor/grammars/eiffel.tmbundle
url = https://github.com/textmate/eiffel.tmbundle
Expand All @@ -458,6 +476,9 @@
[submodule "vendor/grammars/fancy-tmbundle"]
path = vendor/grammars/fancy-tmbundle
url = https://github.com/fancy-lang/fancy-tmbundle
[submodule "vendor/grammars/firrtl-syntax"]
path = vendor/grammars/firrtl-syntax
url = https://github.com/chipsalliance/firrtl-syntax.git
[submodule "vendor/grammars/fish-tmbundle"]
path = vendor/grammars/fish-tmbundle
url = https://github.com/l15n/fish-tmbundle
Expand All @@ -476,9 +497,6 @@
[submodule "vendor/grammars/gemini-vscode"]
path = vendor/grammars/gemini-vscode
url = https://github.com/printfn/gemini-vscode.git
[submodule "vendor/grammars/genero.tmbundle"]
path = vendor/grammars/genero.tmbundle
url = https://github.com/alienriver49/genero.tmbundle
[submodule "vendor/grammars/gettext.tmbundle"]
path = vendor/grammars/gettext.tmbundle
url = https://github.com/textmate/gettext.tmbundle
Expand Down Expand Up @@ -515,6 +533,9 @@
[submodule "vendor/grammars/hoon-grammar"]
path = vendor/grammars/hoon-grammar
url = https://github.com/pkova/hoon-grammar.git
[submodule "vendor/grammars/ide-tools"]
path = vendor/grammars/ide-tools
url = https://github.com/toitware/ide-tools.git
[submodule "vendor/grammars/idl.tmbundle"]
path = vendor/grammars/idl.tmbundle
url = https://github.com/mgalloy/idl.tmbundle
Expand Down Expand Up @@ -584,6 +605,9 @@
[submodule "vendor/grammars/language-batchfile"]
path = vendor/grammars/language-batchfile
url = https://github.com/mmims/language-batchfile
[submodule "vendor/grammars/language-bh"]
path = vendor/grammars/language-bh
url = https://github.com/B-Lang-org/language-bh.git
[submodule "vendor/grammars/language-blade"]
path = vendor/grammars/language-blade
url = https://github.com/jawee/language-blade
Expand Down Expand Up @@ -791,6 +815,9 @@
[submodule "vendor/grammars/language-texinfo"]
path = vendor/grammars/language-texinfo
url = https://github.com/Alhadis/language-texinfo
[submodule "vendor/grammars/language-ti-basic"]
path = vendor/grammars/language-ti-basic
url = https://github.com/TIny-Hacker/language-ti-basic.git
[submodule "vendor/grammars/language-toc-wow"]
path = vendor/grammars/language-toc-wow
url = https://github.com/nebularg/language-toc-wow
Expand Down Expand Up @@ -847,7 +874,7 @@
url = https://github.com/textmate/logtalk.tmbundle
[submodule "vendor/grammars/lua.tmbundle"]
path = vendor/grammars/lua.tmbundle
url = https://github.com/textmate/lua.tmbundle
url = https://github.com/LuaLS/lua.tmbundle.git
[submodule "vendor/grammars/m3"]
path = vendor/grammars/m3
url = https://github.com/newgrammars/m3
Expand Down Expand Up @@ -881,6 +908,9 @@
[submodule "vendor/grammars/mlir-grammar"]
path = vendor/grammars/mlir-grammar
url = https://github.com/jpienaar/mlir-grammar
[submodule "vendor/grammars/mojo-syntax"]
path = vendor/grammars/mojo-syntax
url = https://github.com/modularml/mojo-syntax.git
[submodule "vendor/grammars/monkey"]
path = vendor/grammars/monkey
url = https://github.com/gingerbeardman/monkey.tmbundle
Expand Down Expand Up @@ -947,6 +977,9 @@
[submodule "vendor/grammars/pike-textmate"]
path = vendor/grammars/pike-textmate
url = https://github.com/hww3/pike-textmate
[submodule "vendor/grammars/pkl.tmbundle"]
path = vendor/grammars/pkl.tmbundle
url = https://github.com/apple/pkl.tmbundle.git
[submodule "vendor/grammars/polar-grammar"]
path = vendor/grammars/polar-grammar
url = https://github.com/osohq/polar-grammar.git
Expand All @@ -956,6 +989,9 @@
[submodule "vendor/grammars/powershell"]
path = vendor/grammars/powershell
url = https://github.com/PowerShell/EditorSyntax
[submodule "vendor/grammars/praatvscode"]
path = vendor/grammars/praatvscode
url = https://github.com/orhunulusahin/praatvscode.git
[submodule "vendor/grammars/processing.tmbundle"]
path = vendor/grammars/processing.tmbundle
url = https://github.com/textmate/processing.tmbundle
Expand Down Expand Up @@ -986,6 +1022,9 @@
[submodule "vendor/grammars/riot-syntax-highlight"]
path = vendor/grammars/riot-syntax-highlight
url = https://github.com/riot/syntax-highlight
[submodule "vendor/grammars/roc-vscode-unofficial"]
path = vendor/grammars/roc-vscode-unofficial
url = https://github.com/ivan-demchenko/roc-vscode-unofficial.git
[submodule "vendor/grammars/ruby-slim.tmbundle"]
path = vendor/grammars/ruby-slim.tmbundle
url = https://github.com/slim-template/ruby-slim.tmbundle
Expand All @@ -1010,6 +1049,9 @@
[submodule "vendor/grammars/shaders-tmLanguage"]
path = vendor/grammars/shaders-tmLanguage
url = https://github.com/tgjones/shaders-tmLanguage
[submodule "vendor/grammars/slint-tmLanguage"]
path = vendor/grammars/slint-tmLanguage
url = https://github.com/slint-ui/slint-tmLanguage.git
[submodule "vendor/grammars/smali-sublime"]
path = vendor/grammars/smali-sublime
url = https://github.com/ShaneWilton/sublime-smali
Expand All @@ -1021,7 +1063,7 @@
url = https://github.com/awslabs/smithy-vscode.git
[submodule "vendor/grammars/sourcepawn-vscode"]
path = vendor/grammars/sourcepawn-vscode
url = https://github.com/Dreae/sourcepawn-vscode
url = https://github.com/Sarrus1/sourcepawn-vscode.git
[submodule "vendor/grammars/sql.tmbundle"]
path = vendor/grammars/sql.tmbundle
url = https://github.com/textmate/sql.tmbundle
Expand Down Expand Up @@ -1145,12 +1187,21 @@
[submodule "vendor/grammars/sway-vscode-plugin"]
path = vendor/grammars/sway-vscode-plugin
url = https://github.com/FuelLabs/sway-vscode-plugin.git
[submodule "vendor/grammars/swift.tmbundle"]
path = vendor/grammars/swift.tmbundle
url = https://github.com/textmate/swift.tmbundle
[submodule "vendor/grammars/sweave.tmbundle"]
path = vendor/grammars/sweave.tmbundle
url = https://github.com/textmate/sweave.tmbundle.git
[submodule "vendor/grammars/swift-tmlanguage"]
path = vendor/grammars/swift-tmlanguage
url = https://github.com/jtbandes/swift-tmlanguage.git
[submodule "vendor/grammars/syntax"]
path = vendor/grammars/syntax
url = https://github.com/hashicorp/syntax.git
[submodule "vendor/grammars/tcl.tmbundle"]
path = vendor/grammars/tcl.tmbundle
url = https://github.com/textmate/tcl.tmbundle
[submodule "vendor/grammars/templ-vscode"]
path = vendor/grammars/templ-vscode
url = https://github.com/templ-go/templ-vscode.git
[submodule "vendor/grammars/textmate.tmbundle"]
path = vendor/grammars/textmate.tmbundle
url = https://github.com/textmate/textmate.tmbundle
Expand All @@ -1169,12 +1220,18 @@
[submodule "vendor/grammars/turtle.tmbundle"]
path = vendor/grammars/turtle.tmbundle
url = https://github.com/peta/turtle.tmbundle
[submodule "vendor/grammars/typst-grammar"]
path = vendor/grammars/typst-grammar
url = https://github.com/michidk/typst-grammar.git
[submodule "vendor/grammars/verilog.tmbundle"]
path = vendor/grammars/verilog.tmbundle
url = https://github.com/textmate/verilog.tmbundle
[submodule "vendor/grammars/vhdl"]
path = vendor/grammars/vhdl
url = https://github.com/textmate/vhdl.tmbundle
[submodule "vendor/grammars/vsc-ember-syntax"]
path = vendor/grammars/vsc-ember-syntax
url = https://github.com/lifeart/vsc-ember-syntax.git
[submodule "vendor/grammars/vsc-fennel"]
path = vendor/grammars/vsc-fennel
url = https://github.com/kongeor/vsc-fennel
Expand All @@ -1184,9 +1241,15 @@
[submodule "vendor/grammars/vscode-antlers-language-server"]
path = vendor/grammars/vscode-antlers-language-server
url = https://github.com/Stillat/vscode-antlers-language-server.git
[submodule "vendor/grammars/vscode-bitbake"]
path = vendor/grammars/vscode-bitbake
url = https://github.com/yoctoproject/vscode-bitbake.git
[submodule "vendor/grammars/vscode-brightscript-language"]
path = vendor/grammars/vscode-brightscript-language
url = https://github.com/rokucommunity/vscode-brightscript-language.git
[submodule "vendor/grammars/vscode-caddyfile"]
path = vendor/grammars/vscode-caddyfile
url = https://github.com/caddyserver/vscode-caddyfile.git
[submodule "vendor/grammars/vscode-cadence"]
path = vendor/grammars/vscode-cadence
url = https://github.com/onflow/vscode-cadence.git
Expand Down Expand Up @@ -1239,6 +1302,9 @@
[submodule "vendor/grammars/vscode-lean"]
path = vendor/grammars/vscode-lean
url = https://github.com/leanprover/vscode-lean
[submodule "vendor/grammars/vscode-lean4"]
path = vendor/grammars/vscode-lean4
url = https://github.com/leanprover/vscode-lean4.git
[submodule "vendor/grammars/vscode-monkey-c"]
path = vendor/grammars/vscode-monkey-c
url = https://github.com/ghisguth/vscode-monkey-c
Expand All @@ -1250,7 +1316,7 @@
url = https://github.com/damirka/vscode-move-syntax.git
[submodule "vendor/grammars/vscode-opa"]
path = vendor/grammars/vscode-opa
url = https://github.com/tsandall/vscode-opa
url = https://github.com/open-policy-agent/vscode-opa.git
[submodule "vendor/grammars/vscode-pddl"]
path = vendor/grammars/vscode-pddl
url = https://github.com/jan-dolejsi/vscode-pddl.git
Expand All @@ -1266,9 +1332,15 @@
[submodule "vendor/grammars/vscode-proto3"]
path = vendor/grammars/vscode-proto3
url = https://github.com/zxh0/vscode-proto3
[submodule "vendor/grammars/vscode-python"]
path = vendor/grammars/vscode-python
url = https://github.com/microsoft/vscode-python.git
[submodule "vendor/grammars/vscode-rbs-syntax"]
path = vendor/grammars/vscode-rbs-syntax
url = https://github.com/soutaro/vscode-rbs-syntax.git
[submodule "vendor/grammars/vscode-ron"]
path = vendor/grammars/vscode-ron
url = https://github.com/a5huynh/vscode-ron.git
[submodule "vendor/grammars/vscode-scala-syntax"]
path = vendor/grammars/vscode-scala-syntax
url = https://github.com/scala/vscode-scala-syntax
Expand All @@ -1278,9 +1350,9 @@
[submodule "vendor/grammars/vscode-slice"]
path = vendor/grammars/vscode-slice
url = https://github.com/zeroc-ice/vscode-slice
[submodule "vendor/grammars/vscode-vba-json"]
path = vendor/grammars/vscode-vba-json
url = https://github.com/tiabeast/vscode-vba-json.git
[submodule "vendor/grammars/vscode-vba"]
path = vendor/grammars/vscode-vba
url = https://github.com/serkonda7/vscode-vba.git
[submodule "vendor/grammars/vscode-vlang"]
path = vendor/grammars/vscode-vlang
url = https://github.com/0x9ef/vscode-vlang
Expand Down
28 changes: 26 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,31 @@ By participating, you are expected to uphold this code.

The majority of contributions won't need to touch any Ruby code at all.

## Dependencies
## Setting up a working environment

In order to start contributing to Linguist, you will need to setup your working environment.
We detail three methods below and recommend using GitHub Codespaces as it is the easiest and quickest method that will provide you with a consistent pre-configured environment ready for you to start contributing.

### Using GitHub Codespaces

Using GitHub Codespaces is the easiest and quickest method to start contributing.
The Free and Pro plans for personal accounts include free use of GitHub Codespaces up to a fixed amount of usage every month.
For more info on GitHub Codespaces billing, see [this help page](https://docs.github.com/en/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces).

To get started, click this button: [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/github-linguist/linguist)

### Using the dev container locally

To open locally in VS Code using a dev container, follow the [Visual Studio Code Dev Containers installation instructions](https://code.visualstudio.com/docs/remote/containers#_installation) to configure dev container support.
Close the repo and open it in VS Code.
VS Code will automatically offer to run this project in a dev container when the project is opened.
No additional setup will be required.

### Using your local system without the dev container

This is the longest and most involved and error-prone approach and is documented for those who can't use one of the methods above or prefer to do everything within the native operating system environment.

#### Dependencies

Linguist is a Ruby library so you will need a recent version of Ruby installed.
There are known problems with the macOS/XCode supplied version of Ruby that causes problems installing some of the dependencies.
Expand All @@ -32,7 +56,7 @@ apt-get install cmake pkg-config libicu-dev docker.io ruby ruby-dev zlib1g-dev b

The latest version of Bundler can be installed with `gem install bundler`.

## Getting started
#### Getting started

Before you can start contributing to Linguist, you'll need to set up your environment first.
Clone the repo and run `script/bootstrap` to install its dependencies.
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Linguist

[![Actions Status](https://github.com/github/linguist/workflows/Run%20Tests/badge.svg)](https://github.com/github/linguist/actions)
[![Actions Status](https://github.com/github/linguist/workflows/Run%20Tests/badge.svg)](https://github.com/github/linguist/actions)

[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/github-linguist/linguist)

This library is used on github.com to detect blob languages, ignore binary or vendored files, suppress generated files in diffs, and generate language breakdown graphs.

Expand Down
Loading

0 comments on commit 8e475ff

Please sign in to comment.