Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ungroup major languages #4979

Merged
merged 7 commits into from
Sep 1, 2020
Merged

Ungroup major languages #4979

merged 7 commits into from
Sep 1, 2020

Conversation

Alhadis
Copy link
Collaborator

@Alhadis Alhadis commented Aug 31, 2020

Fixes: #4291 / Depends on: #4978

Status of related tasks:

  1. Abolish restrictions governing colour choices
  2. Add/fix incorrect or missing language colours
  3. Ungroup major languages (this)

Description

This pull-request ungroups languages listed in #4291, from which I'll quote the reason for doing so:

There are several languages on GitHub which presently fall under the usage statistics of another, "parent" language, which certainly deserve reconsideration — or at the very least, some public discussion for highlighting the reasons why they fall under another language's umbrella.

Note that this PR includes #4978 as part of its changes, so ensure that gets merged first before this one. The reason is that users will notice (and complain) if their repository stats are 60% grey because SCSS/Less are no longer grouped under CSS or what-have-you.

Checklist:

  • I am changing adding the colours associated with languages.
    • I have obtained agreement from the wider language communities.
      "Agreement" isn't the word I'd use, since these colours are already used by each language's official branding, making them canon by proxy.

Copy link
Member

@lildude lildude left a comment

Choose a reason for hiding this comment

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

LGTM

@Alhadis Alhadis merged commit d4af312 into master Sep 1, 2020
@Alhadis Alhadis deleted the degroup branch September 1, 2020 09:59
sambacha pushed a commit to freight-trust/linguist that referenced this pull request Sep 4, 2020
@Alhadis Alhadis mentioned this pull request Jan 22, 2021
4 tasks
lildude pushed a commit that referenced this pull request Mar 19, 2021
* Split StringTemplates from HTML

Was originally added in #1117 as a HTML variant, but per #4979 language variants should be split.

Default to using default HTML grammar.

Will add a heuristic to differentiate from Smalltalk if needed.

* Fix StringTemplate name and colour

* Rename StringTemplate sample

* Add StringTemplate grammar to index

Uses `atom/language-html`; not ideal as ST-unique syntax isn't matched

* Add .st heuristic

* Add .st heuristic test

* Fix syntax error in heuristics tester

* Generalise part of Smalltalk .st heuristic

* Further fix to Smalltalk heuristic

* Fix unescaped character

* Remove single quote

* Replace StringTemplate grammar module

Using dangmarm/stringtemplate-lang now

* Update StringTemplate grammar link

dangmarm/stringtemplate-lang

* Replace tm_scope

`source.stringtemplate`

* Register StringTemplate tm_scope

* Add grammar license info

* Revert "Replace StringTemplate grammar module"

This reverts commit 7c3bce2.

* Revert StringTemplate grammar addition

* Minor fix to heuristic

* Replace raw space with Regex space char

* Allow whitespace at start of doc

* Add ^ and ' as Smalltalk characters

* Escape ' properly

* More accurate regex

* Change regex from \w+ to \w*

* Add other delimiters to StringTemplate heuristic

* Use grammar added in Alhadis/language-etc@f41e1a4

* Updated cached license data

Co-authored-by: Nixinova <Nixinova@users.noreply.github.com>
Co-authored-by: John Gardner <gardnerjohng@gmail.com>
@kwaa kwaa mentioned this pull request Aug 27, 2022
@github-linguist github-linguist locked as resolved and limited conversation to collaborators Jun 17, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Revisiting language groups
2 participants