diff --git a/.gitmodules b/.gitmodules index ed4b313ccf..653f925289 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1083,6 +1083,9 @@ [submodule "vendor/grammars/vscode-gedcom"] path = vendor/grammars/vscode-gedcom url = https://github.com/fguitton/vscode-gedcom +[submodule "vendor/grammars/vscode-gleam"] + path = vendor/grammars/vscode-gleam + url = https://github.com/gleam-lang/vscode-gleam.git [submodule "vendor/grammars/vscode-go"] path = vendor/grammars/vscode-go url = https://github.com/golang/vscode-go diff --git a/grammars.yml b/grammars.yml index 4a80cb8116..206b69b411 100644 --- a/grammars.yml +++ b/grammars.yml @@ -946,6 +946,8 @@ vendor/grammars/vscode-gcode-syntax: - source.gcode vendor/grammars/vscode-gedcom: - source.gedcom +vendor/grammars/vscode-gleam: +- source.gleam vendor/grammars/vscode-go: - go.mod - go.sum diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 65395ecf19..2fc77c3a78 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -2080,6 +2080,14 @@ Git Config: codemirror_mime_type: text/x-properties tm_scope: source.gitconfig language_id: 807968997 +Gleam: + type: programming + color: "#ffaff3" + ace_mode: text + extensions: + - ".gleam" + tm_scope: source.gleam + language_id: 1054258749 Glyph: type: programming color: "#c1ac7f" diff --git a/samples/Gleam/contributor.gleam b/samples/Gleam/contributor.gleam new file mode 100644 index 0000000000..d6f46dacf5 --- /dev/null +++ b/samples/Gleam/contributor.gleam @@ -0,0 +1,57 @@ +import gleam/result +import gleam/option.{Option} +import gleam/dynamic.{DecodeError, Dynamic} +import gleam_contributors/json + +pub type Contributor { + Contributor(name: String, github: Option(String)) +} + +// Could include avatarURl and websiteUrl if required +pub type Contributorspage { + Contributorspage( + nextpage_cursor: Result(String, Nil), + contributor_list: List(Contributor), + ) +} + +// This is still parsing the response json into Gleam types, see +// parse_contributors, but it is the contributor section only. To make the parse +// function more readable +pub fn decode(json_obj: Dynamic) -> Result(Contributor, DecodeError) { + try author = dynamic.field(json_obj, "author") + + try dynamic_name = dynamic.field(author, "name") + try name = dynamic.string(dynamic_name) + let github = { + try user = dynamic.field(author, "user") + try dynamic_github = dynamic.field(user, "url") + dynamic.string(dynamic_github) + } + Ok(Contributor(name: name, github: option.from_result(github))) +} + +/// Converts response json into Gleam type. Represents one page of contributors +pub fn decode_page( + response_json: String, +) -> Result(Contributorspage, DecodeError) { + let res = json.decode(response_json) + + try data = dynamic.field(res, "data") + try repo = dynamic.field(data, "repository") + try object = dynamic.field(repo, "object") + try history = dynamic.field(object, "history") + try pageinfo = dynamic.field(history, "pageInfo") + try dynamic_nextpage = dynamic.field(pageinfo, "hasNextPage") + try nextpage = dynamic.bool(dynamic_nextpage) + let cursor = case nextpage { + False -> Error(Nil) + True -> + dynamic.field(pageinfo, "endCursor") + |> result.then(dynamic.string) + |> result.map_error(fn(_) { Nil }) + } + try nodes = dynamic.field(history, "nodes") + try contributors = dynamic.typed_list(nodes, of: decode) + Ok(Contributorspage(nextpage_cursor: cursor, contributor_list: contributors)) +} diff --git a/samples/Gleam/websocket.gleam b/samples/Gleam/websocket.gleam new file mode 100644 index 0000000000..a16353b018 --- /dev/null +++ b/samples/Gleam/websocket.gleam @@ -0,0 +1,58 @@ +import gleam/uri.{Uri} +import gleam/http.{Header} +import gleam/dynamic.{Dynamic} +import gleam/result +import nerf/gun.{ConnectionPid, StreamReference} + +pub opaque type Connection { + Connection(ref: StreamReference, pid: ConnectionPid) +} + +pub type Frame { + Close + Text(String) + Binary(BitString) +} + +pub fn connect( + hostname: String, + path: String, + on port: Int, + with headers: List(Header), +) -> Result(Connection, ConnectError) { + try pid = + gun.open(hostname, port) + |> result.map_error(ConnectionFailed) + try _ = + gun.await_up(pid) + |> result.map_error(ConnectionFailed) + + // Upgrade to websockets + let ref = gun.ws_upgrade(pid, path, headers) + let conn = Connection(pid: pid, ref: ref) + try _ = + await_upgrade(conn, 1000) + |> result.map_error(ConnectionFailed) + + Ok(conn) +} + +pub fn send(to conn: Connection, this message: String) -> Nil { + gun.ws_send(conn.pid, gun.Text(message)) +} + +pub external fn receive(from: Connection, within: Int) -> Result(Frame, Nil) = + "nerf_ffi" "ws_receive" + +external fn await_upgrade(from: Connection, within: Int) -> Result(Nil, Dynamic) = + "nerf_ffi" "ws_await_upgrade" + +pub fn close(conn: Connection) -> Nil { + gun.ws_send(conn.pid, gun.Close) +} + +/// The URI of the websocket server to connect to +pub type ConnectError { + ConnectionRefused(status: Int, headers: List(Header)) + ConnectionFailed(reason: Dynamic) +} diff --git a/vendor/README.md b/vendor/README.md index 3257c8bf6c..1d2ddc6be6 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -173,6 +173,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **Gherkin:** [cucumber/cucumber-tmbundle](https://github.com/cucumber/cucumber-tmbundle) - **Git Attributes:** [Alhadis/language-etc](https://github.com/Alhadis/language-etc) - **Git Config:** [Alhadis/language-etc](https://github.com/Alhadis/language-etc) +- **Gleam:** [gleam-lang/vscode-gleam](https://github.com/gleam-lang/vscode-gleam) - **Glyph:** [textmate/tcl.tmbundle](https://github.com/textmate/tcl.tmbundle) - **Glyph Bitmap Distribution Format:** [Alhadis/language-fontforge](https://github.com/Alhadis/language-fontforge) - **Gnuplot:** [mattfoster/gnuplot-tmbundle](https://github.com/mattfoster/gnuplot-tmbundle) diff --git a/vendor/grammars/vscode-gleam b/vendor/grammars/vscode-gleam new file mode 160000 index 0000000000..04efa8d3a0 --- /dev/null +++ b/vendor/grammars/vscode-gleam @@ -0,0 +1 @@ +Subproject commit 04efa8d3a0f63fb0e7a577ae0a5afcfea88c97a9 diff --git a/vendor/licenses/git_submodule/vscode-gleam.dep.yml b/vendor/licenses/git_submodule/vscode-gleam.dep.yml new file mode 100644 index 0000000000..9959584119 --- /dev/null +++ b/vendor/licenses/git_submodule/vscode-gleam.dep.yml @@ -0,0 +1,221 @@ +--- +name: vscode-gleam +version: 04efa8d3a0f63fb0e7a577ae0a5afcfea88c97a9 +type: git_submodule +homepage: https://github.com/gleam-lang/vscode-gleam.git +license: apache-2.0 +licenses: +- sources: LICENSE.txt + text: |2 + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2016 - present Louis Pilfold + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + + ## Runtime Library Exception to the Apache 2.0 License: ## + + + As an exception, if you use this Software to compile your source code and + portions of this Software are embedded into the binary product as a result, + you may redistribute such product without providing attribution as would + otherwise be required by Sections 4(a), 4(b) and 4(d) of the License. +notices: []