Merge branch 'main' into add-gleam-compiler

Author: Papipo

.github/workflows/ci.yml

@@ -21,13 +21,16 @@ permissions:
 
 jobs:
   test_linux:
-    name: Ubuntu 24.04, Erlang/OTP ${{ matrix.otp_version }}${{ matrix.deterministic && ' (deterministic)' || '' }}
+    name: Ubuntu 24.04, Erlang/OTP ${{ matrix.otp_version }}${{ matrix.deterministic && ' (deterministic)' || '' }}${{ matrix.coverage && ' (coverage)' || '' }}
     strategy:
       fail-fast: false
       matrix:
         include:
           - otp_version: "27.1"
             deterministic: true
+          - otp_version: "27.1"
+            erlc_opts: "warnings_as_errors"
+            coverage: true
           - otp_version: "27.1"
             otp_latest: true
             erlc_opts: "warnings_as_errors"
@@ -68,6 +71,11 @@ jobs:
       - name: Elixir test suite
         run: make test_elixir
         continue-on-error: ${{ matrix.development }}
+        env:
+          COVER: "${{ matrix.coverage }}"
+      - name: "Calculate Coverage"
+        run: make cover | tee "$GITHUB_STEP_SUMMARY"
+        if: "${{ matrix.coverage }}"
       - name: Build docs (ExDoc main)
         if: ${{ matrix.otp_latest }}
         run: |
@@ -85,6 +93,12 @@ jobs:
           # Recompile System without .git
           cd lib/elixir && ../../bin/elixirc -o ebin lib/system.ex && cd -
           taskset 1 make check_reproducible
+      - name: "Upload Coverage Artifact"
+        if: "${{ matrix.coverage }}"
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: TestCoverage
+          path: cover/*
 
   test_windows:
     name: Windows Server 2019, Erlang/OTP ${{ matrix.otp_version }}

.github/workflows/release.yml

@@ -127,7 +127,7 @@ jobs:
 
     steps:
       - name: "Download build"
-        uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
+        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
         with:
           name: build-${{ matrix.flavor }}-elixir-otp-${{ matrix.otp }}
 
@@ -201,7 +201,7 @@ jobs:
 
       - name: "Download Build Artifacts"
         id: download-build-artifacts
-        uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
+        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
         with:
           pattern: "{sign-*-elixir-otp-*,Docs}"
           merge-multiple: true
@@ -267,7 +267,7 @@ jobs:
       contents: write
 
     steps:
-      - uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
+      - uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
         with:
           pattern: "{sign-*-elixir-otp-*,Docs,SBoM,Attestations}"
           merge-multiple: true
@@ -312,7 +312,7 @@ jobs:
       FASTLY_KEY: ${{ secrets.HEX_FASTLY_KEY }}
       OTP_GENERIC_VERSION: "25"
     steps:
-      - uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
+      - uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
         with:
           pattern: "{sign-*-elixir-otp-*,Docs}"
           merge-multiple: true

.gitignore

@@ -15,3 +15,4 @@
 /.eunit
 .elixir.plt
 erl_crash.dump
+/cover/

CHANGELOG.md

@@ -117,7 +117,6 @@ https://elixir-lang.org/blog/2025/02/26/elixir-openchain-certification/
   * [Kernel] Support `min/2` and `max/2` as guards
   * [Macro] Print debugging results from `Macro.dbg/1` as they happen, instead of once at the end
   * [Protocol] Type checking of protocols dispatch and implementations
-  * [Protocol] Add `Protocol.impl_for/2` and `Protocol.impl_for!/2`
 
 #### ExUnit
 

Makefile

@@ -26,7 +26,7 @@ GIT_TAG = $(strip $(shell head="$(call GIT_REVISION)"; git tag --points-at $$hea
 SOURCE_DATE_EPOCH_PATH = lib/elixir/tmp/ebin_reproducible
 SOURCE_DATE_EPOCH_FILE = $(SOURCE_DATE_EPOCH_PATH)/SOURCE_DATE_EPOCH
 
-.PHONY: install install_man build_plt clean_plt dialyze test check_reproducible clean clean_elixir clean_man format docs Docs.zip Precompiled.zip zips
+.PHONY: cover install install_man build_plt clean_plt dialyze test check_reproducible clean clean_elixir clean_man format docs Docs.zip Precompiled.zip zips
 .NOTPARALLEL:
 
 #==> Functions
@@ -53,6 +53,10 @@ lib/$(1)/ebin/Elixir.$(2).beam: $(wildcard lib/$(1)/lib/*.ex) $(wildcard lib/$(1
 test_$(1): test_formatted $(1)
 	@ echo "==> $(1) (ex_unit)"
 	$(Q) cd lib/$(1) && ../../bin/elixir -r "test/test_helper.exs" -pr "test/**/$(TEST_FILES)";
+
+cover/ex_unit_$(1).coverdata:
+	$(Q) COVER="1" $(MAKE) test_$(1)
+cover/combined.coverdata: cover/ex_unit_$(1).coverdata
 endef
 
 define WRITE_SOURCE_DATE_EPOCH
@@ -175,6 +179,7 @@ clean: clean_man
 	rm -rf lib/mix/test/fixtures/git_sparse_repo/
 	rm -rf lib/mix/test/fixtures/archive/ebin/
 	rm -f erl_crash.dump
+	rm -rf cover
 
 clean_elixir:
 	$(Q) rm -f lib/*/ebin/Elixir.*.beam
@@ -287,6 +292,15 @@ test_stdlib: compile
 		cd lib/elixir && ../../bin/elixir --sname primary -r "test/elixir/test_helper.exs" -pr "test/elixir/**/$(TEST_FILES)"; \
 	fi
 
+cover/ex_unit_elixir.coverdata:
+	$(Q) COVER="1" $(MAKE) test_stdlib
+cover/combined.coverdata: cover/ex_unit_elixir.coverdata
+
+cover/combined.coverdata:
+	bin/elixir ./lib/elixir/scripts/cover.exs
+
+cover: cover/combined.coverdata
+
 #==> Dialyzer tasks
 
 DIALYZER_OPTS = --no_check_plt --fullpath -Werror_handling -Wunmatched_returns -Wunderspecs

README.md

@@ -12,6 +12,7 @@
 </h1>
 
 [![CI](https://github.com/elixir-lang/elixir/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/elixir-lang/elixir/actions/workflows/ci.yml?query=branch%3Amain)
+[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/10187/badge)](https://www.bestpractices.dev/projects/10187)
 
 Elixir is a dynamic, functional language designed for building scalable
 and maintainable applications.
@@ -37,15 +38,12 @@ All contributions are required to conform to our [Open Source Policy][11].
 
 For reporting bugs, [visit our issue tracker][2] and follow the steps
 for reporting a new issue. **Please disclose security vulnerabilities
-privately at <elixir-security@googlegroups.com>**.
+privately [in our Security page](https://github.com/elixir-lang/elixir/security)**.
 
-## Issues tracker management
-
-All currently open bugs related to the Elixir repository are listed
-in the issues tracker. The Elixir team uses the issues tracker to focus
-on *actionable items*, including planned enhancements in the short and
-medium term. We also do our best to label entries for clarity and to ease
-collaboration.
+All currently open bugs related to Elixir are listed in the issues tracker.
+The Elixir team uses the issues tracker to focus on *actionable items*,
+including planned enhancements in the short and medium term. We also do
+our best to label entries for clarity and to ease collaboration.
 
 Our *actionable item policy* has some important consequences, such as:
 
@@ -57,38 +55,42 @@ Our *actionable item policy* has some important consequences, such as:
     elsewhere if appropriate).
 
   * We actively close unrelated and non-actionable issues to keep the
-    issues tracker tidy. We may get things wrong from time to
-    time and will gladly revisit issues, reopening when necessary.
-
-Keep the tone positive and be kind! For more information, see the
-[Code of Conduct][1].
-
-### Proposing new features
+    issues tracker tidy. If you believe we got something wrong, drop a
+    comment and we can always reopen the issue.
 
-For proposing new features, please start a discussion in the
-[Elixir Core mailing list][3]. The [language development history and
-its focus are described on our website](https://elixir-lang.org/development.html).
-
-Keep in mind that it is your responsibility to argue and explain
-why a feature is useful and how it will impact the codebase and
-the community. A good proposal includes the problem description
-and how the proposed solution compares with existing alternatives
-in the Elixir ecosystem (as well as in other languages). To iron
-out a proposal before submission, consider using and gathering
-feedback from the community spaces [listed on the sidebar of the
-Elixir website](https://elixir-lang.org/).
-
-Once a proposal is accepted, it will be added to [the issue tracker][2].
-Features and bug fixes that have already been merged and will be included
-in the next release are then "closed" and added to the [changelog][7].
+By keeping the overall issues tracker tidy and organized, the community
+can easily peak at what is coming in new releases and also get involved
+by commenting on existing issues and submitting pull requests. Please
+remember to keep the tone positive and be kind! For more information,
+see the [Code of Conduct][1].
 
-### Discussions, support, and help
+## Discussions, support, and help
 
 For general discussions, support, and help, please use the community
 spaces [listed on the sidebar of the Elixir website](https://elixir-lang.org/),
 such as forums, chat platforms, etc, where the wider community will be available
 to help you.
 
+## Proposing new features
+
+We encourage you to first propose new features in the community spaces
+listed above. These discussions help refine ideas and gather feedback before
+submission. Our website also includes [a general outline of the language
+history and its current development focus](https://elixir-lang.org/development.html).
+
+Once you are ready, you can submit your proposal to the [Elixir Core
+mailing list][3], either through the web interface or by subscribing to
+it at <[email protected]>. Remember to include
+a clear problem description, compare the proposed solution to existing
+alternatives in the Elixir ecosystem (and in other languages if possible),
+and consider the potential impact your changes will have on the codebase and
+community.
+
+Once a proposal is accepted, it will be added to [the issue tracker][2].
+Features and bug fixes that have already been merged and will be included
+in the next release are then "closed" and added to the [changelog][7]
+before release.
+
 ## Compiling from source
 
 For the many different ways to install Elixir,

lib/eex/lib/eex/compiler.ex

@@ -304,7 +304,7 @@ defmodule EEx.Compiler do
       source: source,
       line: line,
       quoted: [],
-      parser_options: parser_options,
+      parser_options: [indentation: indentation] ++ parser_options,
       indentation: indentation
     }
 

lib/eex/test/eex_test.exs

@@ -502,6 +502,59 @@ defmodule EExTest do
       end
     end
 
+    test "from Elixir parser" do
+      line = __ENV__.line + 6
+
+      message =
+        assert_raise TokenMissingError, fn ->
+          EEx.compile_string(
+            """
+            <li>
+              <strong>Some:</strong>
+              <%= true && @some[ %>
+            </li>
+            """,
+            file: __ENV__.file,
+            line: line,
+            indentation: 12
+          )
+        end
+
+      assert message |> Exception.message() |> strip_ansi() =~ """
+                  │
+              514 │                   true && @some[\s
+                  │                                │ └ missing closing delimiter (expected "]")
+                  │                                └ unclosed delimiter
+             """
+    end
+
+    test "from Elixir parser with line breaks" do
+      line = __ENV__.line + 6
+
+      message =
+        assert_raise TokenMissingError, fn ->
+          EEx.compile_string(
+            """
+            <li>
+              <strong>Some:</strong>
+              <%= true &&
+                @some[ %>
+            </li>
+            """,
+            file: __ENV__.file,
+            line: line,
+            indentation: 12
+          )
+        end
+
+      assert message |> Exception.message() |> strip_ansi() =~ """
+                  │
+              #{line + 3} │                 @some[\s
+                  │                      │ └ missing closing delimiter (expected "]")
+                  │                      └ unclosed delimiter
+             """
+    end
+
     test "honor line numbers" do
       assert_raise EEx.SyntaxError,
                    "nofile:100:6: expected closing '%>' for EEx expression",
@@ -948,6 +1001,12 @@ defmodule EExTest do
     end
   end
 
+  @strip_ansi [IO.ANSI.green(), IO.ANSI.red(), IO.ANSI.reset()]
+
+  defp strip_ansi(doc) do
+    String.replace(doc, @strip_ansi, "")
+  end
+
   defp assert_eval(expected, actual, binding \\ [], opts \\ []) do
     opts = Keyword.merge([file: __ENV__.file, engine: opts[:engine] || EEx.Engine], opts)
     result = EEx.eval_string(actual, binding, opts)

lib/eex/test/test_helper.exs

@@ -5,6 +5,9 @@
 {line_exclude, line_include} =
   if line = System.get_env("LINE"), do: {[:test], [line: line]}, else: {[], []}
 
+Code.require_file("../../elixir/scripts/cover_record.exs", __DIR__)
+CoverageRecorder.maybe_record("eex")
+
 ExUnit.start(
   trace: !!System.get_env("TRACE"),
   include: line_include,