Add WGSL support (#6442)

* Add WGSL support

* add sample

* rollback

* wgsl sample

* Changed grammar repository to wgsl-analyzer

* cached license

* change ace mode to text

* Sort files

.gitmodules

@@ -1305,6 +1305,9 @@
 [submodule "vendor/grammars/wdl-sublime-syntax-highlighter"]
 	path = vendor/grammars/wdl-sublime-syntax-highlighter
 	url = https://github.com/broadinstitute/wdl-sublime-syntax-highlighter
+[submodule "vendor/grammars/wgsl-analyzer"]
+	path = vendor/grammars/wgsl-analyzer
+	url = https://github.com/wgsl-analyzer/wgsl-analyzer.git
 [submodule "vendor/grammars/witcherscript-grammar"]
 	path = vendor/grammars/witcherscript-grammar
 	url = https://github.com/ADawesomeguy/witcherscript-grammar.git

grammars.yml

@@ -1182,6 +1182,8 @@ vendor/grammars/vue-syntax-highlight:
 - text.html.vue
 vendor/grammars/wdl-sublime-syntax-highlighter:
 - source.wdl
+vendor/grammars/wgsl-analyzer:
+- source.wgsl
 vendor/grammars/witcherscript-grammar:
 - source.witcherscript
 vendor/grammars/wollok-sublime:
@@ -1194,4 +1196,4 @@ vendor/grammars/xml.tmbundle:
 vendor/grammars/zeek-sublime:
 - source.zeek
 vendor/grammars/zephir-sublime:
-- source.php.zephir
+- source.php.zephir

lib/linguist/languages.yml

@@ -7402,6 +7402,14 @@ WDL:
   tm_scope: source.wdl
   ace_mode: text
   language_id: 374521672
+WGSL:
+  type: programming
+  color: "#1a5e9a"
+  extensions:
+  - ".wgsl"
+  tm_scope: source.wgsl
+  ace_mode: text
+  language_id: 836605993
 Wavefront Material:
   type: data
   extensions:

samples/WGSL/animate_shader.wgsl

@@ -0,0 +1,47 @@
+#import bevy_pbr::mesh_types
+// The time since startup data is in the globals binding which is part of the mesh_view_bindings import
+#import bevy_pbr::mesh_view_bindings
+
+fn oklab_to_linear_srgb(c: vec3<f32>) -> vec3<f32> {
+    let L = c.x;
+    let a = c.y;
+    let b = c.z;
+
+    let l_ = L + 0.3963377774 * a + 0.2158037573 * b;
+    let m_ = L - 0.1055613458 * a - 0.0638541728 * b;
+    let s_ = L - 0.0894841775 * a - 1.2914855480 * b;
+
+    let l = l_ * l_ * l_;
+    let m = m_ * m_ * m_;
+    let s = s_ * s_ * s_;
+
+    return vec3<f32>(
+        4.0767416621 * l - 3.3077115913 * m + 0.2309699292 * s,
+        -1.2684380046 * l + 2.6097574011 * m - 0.3413193965 * s,
+        -0.0041960863 * l - 0.7034186147 * m + 1.7076147010 * s,
+    );
+}
+
+struct FragmentInput {
+    #import bevy_pbr::mesh_vertex_output
+}
+
+@fragment
+fn fragment(in: FragmentInput) -> @location(0) vec4<f32> {
+    let speed = 2.0;
+    // The globals binding contains various global values like time
+    // which is the time since startup in seconds
+    let t_1 = sin(globals.time * speed) * 0.5 + 0.5;
+    let t_2 = cos(globals.time * speed);
+
+    let distance_to_center = distance(in.uv, vec2<f32>(0.5)) * 1.4;
+
+    // blending is done in a perceptual color space: https://bottosson.github.io/posts/oklab/
+    let red = vec3<f32>(0.627955, 0.224863, 0.125846);
+    let green = vec3<f32>(0.86644, -0.233887, 0.179498);
+    let blue = vec3<f32>(0.701674, 0.274566, -0.169156);
+    let white = vec3<f32>(1.0, 0.0, 0.0);
+    let mixed = mix(mix(red, blue, t_1), mix(green, white, t_2), distance_to_center);
+
+    return vec4<f32>(oklab_to_linear_srgb(mixed), 1.0);
+}

vendor/README.md

@@ -577,6 +577,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **Vue:** [vuejs/vue-syntax-highlight](https://github.com/vuejs/vue-syntax-highlight)
 - **Vyper:** [davidhq/SublimeEthereum](https://github.com/davidhq/SublimeEthereum)
 - **WDL:** [broadinstitute/wdl-sublime-syntax-highlighter](https://github.com/broadinstitute/wdl-sublime-syntax-highlighter)
+- **WGSL:** [wgsl-analyzer/wgsl-analyzer](https://github.com/wgsl-analyzer/wgsl-analyzer)
 - **Wavefront Material:** [Alhadis/language-wavefront](https://github.com/Alhadis/language-wavefront)
 - **Wavefront Object:** [Alhadis/language-wavefront](https://github.com/Alhadis/language-wavefront)
 - **Web Ontology Language:** [textmate/xml.tmbundle](https://github.com/textmate/xml.tmbundle)

vendor/licenses/git_submodule/wgsl-analyzer.dep.yml

@@ -0,0 +1,178 @@
+---
+name: wgsl-analyzer
+version: 49ce40f5d3281d90d6ecbe996375135952626bbb
+type: git_submodule
+homepage: https://github.com/wgsl-analyzer/wgsl-analyzer.git
+license: other
+licenses:
+- sources: LICENSE.md
+  text: |
+    wgsl-analyzer is dual-licensed under either
+
+    * MIT License ([./LICENSE-MIT](./LICENSE-MIT) or http://opensource.org/licenses/MIT)
+    * Apache License, Version 2.0 ([./LICENSE-APACHE](./LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
+
+    at your option.
+- sources: LICENSE-APACHE
+  text: "                              Apache License\n                        Version
+    2.0, January 2004\n                     http://www.apache.org/licenses/\n\nTERMS
+    AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n1. Definitions.\n\n
+    \  \"License\" shall mean the terms and conditions for use, reproduction,\n   and
+    distribution as defined by Sections 1 through 9 of this document.\n\n   \"Licensor\"
+    shall mean the copyright owner or entity authorized by\n   the copyright owner
+    that is granting the License.\n\n   \"Legal Entity\" shall mean the union of the
+    acting entity and all\n   other entities that control, are controlled by, or are
+    under common\n   control with that entity. For the purposes of this definition,\n
+    \  \"control\" means (i) the power, direct or indirect, to cause the\n   direction
+    or management of such entity, whether by contract or\n   otherwise, or (ii) ownership
+    of fifty percent (50%) or more of the\n   outstanding shares, or (iii) beneficial
+    ownership of such entity.\n\n   \"You\" (or \"Your\") shall mean an individual
+    or Legal Entity\n   exercising permissions granted by this License.\n\n   \"Source\"
+    form shall mean the preferred form for making modifications,\n   including but
+    not limited to software source code, documentation\n   source, and configuration
+    files.\n\n   \"Object\" form shall mean any form resulting from mechanical\n   transformation
+    or translation of a Source form, including but\n   not limited to compiled object
+    code, generated documentation,\n   and conversions to other media types.\n\n   \"Work\"
+    shall mean the work of authorship, whether in Source or\n   Object form, made
+    available under the License, as indicated by a\n   copyright notice that is included
+    in or attached to the work\n   (an example is provided in the Appendix below).\n\n
+    \  \"Derivative Works\" shall mean any work, whether in Source or Object\n   form,
+    that is based on (or derived from) the Work and for which the\n   editorial revisions,
+    annotations, elaborations, or other modifications\n   represent, as a whole, an
+    original work of authorship. For the purposes\n   of this License, Derivative
+    Works shall not include works that remain\n   separable from, or merely link (or
+    bind by name) to the interfaces of,\n   the Work and Derivative Works thereof.\n\n
+    \  \"Contribution\" shall mean any work of authorship, including\n   the original
+    version of the Work and any modifications or additions\n   to that Work or Derivative
+    Works thereof, that is intentionally\n   submitted to Licensor for inclusion in
+    the Work by the copyright owner\n   or by an individual or Legal Entity authorized
+    to submit on behalf of\n   the copyright owner. For the purposes of this definition,
+    \"submitted\"\n   means any form of electronic, verbal, or written communication
+    sent\n   to the Licensor or its representatives, including but not limited to\n
+    \  communication on electronic mailing lists, source code control systems,\n   and
+    issue tracking systems that are managed by, or on behalf of, the\n   Licensor
+    for the purpose of discussing and improving the Work, but\n   excluding communication
+    that is conspicuously marked or otherwise\n   designated in writing by the copyright
+    owner as \"Not a Contribution.\"\n\n   \"Contributor\" shall mean Licensor and
+    any individual or Legal Entity\n   on behalf of whom a Contribution has been received
+    by Licensor and\n   subsequently incorporated within the Work.\n\n2. Grant of
+    Copyright License. Subject to the terms and conditions of\n   this License, each
+    Contributor hereby grants to You a perpetual,\n   worldwide, non-exclusive, no-charge,
+    royalty-free, irrevocable\n   copyright license to reproduce, prepare Derivative
+    Works of,\n   publicly display, publicly perform, sublicense, and distribute the\n
+    \  Work and such Derivative Works in Source or Object form.\n\n3. Grant of Patent
+    License. Subject to the terms and conditions of\n   this License, each Contributor
+    hereby grants to You a perpetual,\n   worldwide, non-exclusive, no-charge, royalty-free,
+    irrevocable\n   (except as stated in this section) patent license to make, have
+    made,\n   use, offer to sell, sell, import, and otherwise transfer the Work,\n
+    \  where such license applies only to those patent claims licensable\n   by such
+    Contributor that are necessarily infringed by their\n   Contribution(s) alone
+    or by combination of their Contribution(s)\n   with the Work to which such Contribution(s)
+    was submitted. If You\n   institute patent litigation against any entity (including
+    a\n   cross-claim or counterclaim in a lawsuit) alleging that the Work\n   or
+    a Contribution incorporated within the Work constitutes direct\n   or contributory
+    patent infringement, then any patent licenses\n   granted to You under this License
+    for that Work shall terminate\n   as of the date such litigation is filed.\n\n4.
+    Redistribution. You may reproduce and distribute copies of the\n   Work or Derivative
+    Works thereof in any medium, with or without\n   modifications, and in Source
+    or Object form, provided that You\n   meet the following conditions:\n\n   (a)
+    You must give any other recipients of the Work or\n       Derivative Works a copy
+    of this License; and\n\n   (b) You must cause any modified files to carry prominent
+    notices\n       stating that You changed the files; and\n\n   (c) You must retain,
+    in the Source form of any Derivative Works\n       that You distribute, all copyright,
+    patent, trademark, and\n       attribution notices from the Source form of the
+    Work,\n       excluding those notices that do not pertain to any part of\n       the
+    Derivative Works; and\n\n   (d) If the Work includes a \"NOTICE\" text file as
+    part of its\n       distribution, then any Derivative Works that You distribute
+    must\n       include a readable copy of the attribution notices contained\n       within
+    such NOTICE file, excluding those notices that do not\n       pertain to any part
+    of the Derivative Works, in at least one\n       of the following places: within
+    a NOTICE text file distributed\n       as part of the Derivative Works; within
+    the Source form or\n       documentation, if provided along with the Derivative
+    Works; or,\n       within a display generated by the Derivative Works, if and\n
+    \      wherever such third-party notices normally appear. The contents\n       of
+    the NOTICE file are for informational purposes only and\n       do not modify
+    the License. You may add Your own attribution\n       notices within Derivative
+    Works that You distribute, alongside\n       or as an addendum to the NOTICE text
+    from the Work, provided\n       that such additional attribution notices cannot
+    be construed\n       as modifying the License.\n\n   You may add Your own copyright
+    statement to Your modifications and\n   may provide additional or different license
+    terms and conditions\n   for use, reproduction, or distribution of Your modifications,
+    or\n   for any such Derivative Works as a whole, provided Your use,\n   reproduction,
+    and distribution of the Work otherwise complies with\n   the conditions stated
+    in this License.\n\n5. Submission of Contributions. Unless You explicitly state
+    otherwise,\n   any Contribution intentionally submitted for inclusion in the Work\n
+    \  by You to the Licensor shall be under the terms and conditions of\n   this
+    License, without any additional terms or conditions.\n   Notwithstanding the above,
+    nothing herein shall supersede or modify\n   the terms of any separate license
+    agreement you may have executed\n   with Licensor regarding such Contributions.\n\n6.
+    Trademarks. This License does not grant permission to use the trade\n   names,
+    trademarks, service marks, or product names of the Licensor,\n   except as required
+    for reasonable and customary use in describing the\n   origin of the Work and
+    reproducing the content of the NOTICE file.\n\n7. Disclaimer of Warranty. Unless
+    required by applicable law or\n   agreed to in writing, Licensor provides the
+    Work (and each\n   Contributor provides its Contributions) on an \"AS IS\" BASIS,\n
+    \  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n   implied,
+    including, without limitation, any warranties or conditions\n   of TITLE, NON-INFRINGEMENT,
+    MERCHANTABILITY, or FITNESS FOR A\n   PARTICULAR PURPOSE. You are solely responsible
+    for determining the\n   appropriateness of using or redistributing the Work and
+    assume any\n   risks associated with Your exercise of permissions under this License.\n\n8.
+    Limitation of Liability. In no event and under no legal theory,\n   whether in
+    tort (including negligence), contract, or otherwise,\n   unless required by applicable
+    law (such as deliberate and grossly\n   negligent acts) or agreed to in writing,
+    shall any Contributor be\n   liable to You for damages, including any direct,
+    indirect, special,\n   incidental, or consequential damages of any character arising
+    as a\n   result of this License or out of the use or inability to use the\n   Work
+    (including but not limited to damages for loss of goodwill,\n   work stoppage,
+    computer failure or malfunction, or any and all\n   other commercial damages or
+    losses), even if such Contributor\n   has been advised of the possibility of such
+    damages.\n\n9. Accepting Warranty or Additional Liability. While redistributing\n
+    \  the Work or Derivative Works thereof, You may choose to offer,\n   and charge
+    a fee for, acceptance of support, warranty, indemnity,\n   or other liability
+    obligations and/or rights consistent with this\n   License. However, in accepting
+    such obligations, You may act only\n   on Your own behalf and on Your sole responsibility,
+    not on behalf\n   of any other Contributor, and only if You agree to indemnify,\n
+    \  defend, and hold each Contributor harmless for any liability\n   incurred by,
+    or claims asserted against, such Contributor by reason\n   of your accepting any
+    such warranty or additional liability.\n\nEND OF TERMS AND CONDITIONS\n\nAPPENDIX:
+    How to apply the Apache License to your work.\n\n   To apply the Apache License
+    to your work, attach the following\n   boilerplate notice, with the fields enclosed
+    by brackets \"[]\"\n   replaced with your own identifying information. (Don't
+    include\n   the brackets!)  The text should be enclosed in the appropriate\n   comment
+    syntax for the file format. We also recommend that a\n   file or class name and
+    description of purpose be included on the\n   same \"printed page\" as the copyright
+    notice for easier\n   identification within third-party archives.\n\nCopyright
+    [yyyy] [name of copyright owner]\n\nLicensed under the Apache License, Version
+    2.0 (the \"License\");\nyou may not use this file except in compliance with the
+    License.\nYou may obtain a copy of the License at\n\n\thttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless
+    required by applicable law or agreed to in writing, software\ndistributed under
+    the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS
+    OF ANY KIND, either express or implied.\nSee the License for the specific language
+    governing permissions and\nlimitations under the License.\n"
+- sources: LICENSE-MIT
+  text: |2-
+
+    Permission is hereby granted, free of charge, to any
+    person obtaining a copy of this software and associated
+    documentation files (the "Software"), to deal in the
+    Software without restriction, including without
+    limitation the rights to use, copy, modify, merge,
+    publish, distribute, sublicense, and/or sell copies of
+    the Software, and to permit persons to whom the Software
+    is furnished to do so, subject to the following
+    conditions:
+
+    The above copyright notice and this permission notice
+    shall be included in all copies or substantial portions
+    of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+    ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+    TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+    PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+    SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+    IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+notices: []