From 41ce4c6585f8e1c92f4c2d0e26a900e026df3eb4 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Thu, 23 Nov 2023 20:10:17 +0100 Subject: [PATCH] update erlang Signed-off-by: Andreas Gerler --- .../erlang-autoloads.el | 0 .../erlang-edoc.el | 0 .../erlang-eunit.el | 0 .../erlang-flymake.el | 0 .../erlang-pkg.el | 4 +- .../erlang-skels-old.el | 0 .../erlang-skels.el | 105 +++++++++++++++++- .../erlang-start.el | 0 .../erlang-test.el | 0 .../erlang.el | 14 ++- .../erldoc.el | 0 11 files changed, 115 insertions(+), 8 deletions(-) rename elpa/{erlang-20220215.1844 => erlang-20230628.1002}/erlang-autoloads.el (100%) rename elpa/{erlang-20220215.1844 => erlang-20230628.1002}/erlang-edoc.el (100%) rename elpa/{erlang-20220215.1844 => erlang-20230628.1002}/erlang-eunit.el (100%) rename elpa/{erlang-20220215.1844 => erlang-20230628.1002}/erlang-flymake.el (100%) rename elpa/{erlang-20220215.1844 => erlang-20230628.1002}/erlang-pkg.el (59%) rename elpa/{erlang-20220215.1844 => erlang-20230628.1002}/erlang-skels-old.el (100%) rename elpa/{erlang-20220215.1844 => erlang-20230628.1002}/erlang-skels.el (95%) rename elpa/{erlang-20220215.1844 => erlang-20230628.1002}/erlang-start.el (100%) rename elpa/{erlang-20220215.1844 => erlang-20230628.1002}/erlang-test.el (100%) rename elpa/{erlang-20220215.1844 => erlang-20230628.1002}/erlang.el (99%) rename elpa/{erlang-20220215.1844 => erlang-20230628.1002}/erldoc.el (100%) diff --git a/elpa/erlang-20220215.1844/erlang-autoloads.el b/elpa/erlang-20230628.1002/erlang-autoloads.el similarity index 100% rename from elpa/erlang-20220215.1844/erlang-autoloads.el rename to elpa/erlang-20230628.1002/erlang-autoloads.el diff --git a/elpa/erlang-20220215.1844/erlang-edoc.el b/elpa/erlang-20230628.1002/erlang-edoc.el similarity index 100% rename from elpa/erlang-20220215.1844/erlang-edoc.el rename to elpa/erlang-20230628.1002/erlang-edoc.el diff --git a/elpa/erlang-20220215.1844/erlang-eunit.el b/elpa/erlang-20230628.1002/erlang-eunit.el similarity index 100% rename from elpa/erlang-20220215.1844/erlang-eunit.el rename to elpa/erlang-20230628.1002/erlang-eunit.el diff --git a/elpa/erlang-20220215.1844/erlang-flymake.el b/elpa/erlang-20230628.1002/erlang-flymake.el similarity index 100% rename from elpa/erlang-20220215.1844/erlang-flymake.el rename to elpa/erlang-20230628.1002/erlang-flymake.el diff --git a/elpa/erlang-20220215.1844/erlang-pkg.el b/elpa/erlang-20230628.1002/erlang-pkg.el similarity index 59% rename from elpa/erlang-20220215.1844/erlang-pkg.el rename to elpa/erlang-20230628.1002/erlang-pkg.el index 27130c42..0bf14474 100644 --- a/elpa/erlang-20220215.1844/erlang-pkg.el +++ b/elpa/erlang-20230628.1002/erlang-pkg.el @@ -1,6 +1,6 @@ -(define-package "erlang" "20220215.1844" "Erlang major mode" +(define-package "erlang" "20230628.1002" "Erlang major mode" '((emacs "24.1")) - :commit "ce4ee6e960ece4193fd3031880f8cfc6b50ee69f" :authors + :commit "d051172925a5c84b2f21850a188a533f885f201c" :authors '(("Anders Lindgren")) :maintainer '("Anders Lindgren") diff --git a/elpa/erlang-20220215.1844/erlang-skels-old.el b/elpa/erlang-20230628.1002/erlang-skels-old.el similarity index 100% rename from elpa/erlang-20220215.1844/erlang-skels-old.el rename to elpa/erlang-20230628.1002/erlang-skels-old.el diff --git a/elpa/erlang-20220215.1844/erlang-skels.el b/elpa/erlang-20230628.1002/erlang-skels.el similarity index 95% rename from elpa/erlang-20220215.1844/erlang-skels.el rename to elpa/erlang-20230628.1002/erlang-skels.el index 3202f437..f61f156f 100644 --- a/elpa/erlang-20220215.1844/erlang-skels.el +++ b/elpa/erlang-20230628.1002/erlang-skels.el @@ -1,7 +1,7 @@ ;; ;; %CopyrightBegin% ;; -;; Copyright Ericsson AB 2010-2020. All Rights Reserved. +;; Copyright Ericsson AB 2010-2023. All Rights Reserved. ;; ;; Licensed under the Apache License, Version 2.0 (the "License"); ;; you may not use this file except in compliance with the License. @@ -70,6 +70,8 @@ erlang-skel-ct-test-suite-s erlang-skel-header) ("Large Common Test suite" "ct-test-suite-l" erlang-skel-ct-test-suite-l erlang-skel-header) + ("Common Test Hook" "ct-hook" + erlang-skel-ct-hook erlang-skel-header) ("Erlang TS test suite" "ts-test-suite" erlang-skel-ts-test-suite erlang-skel-header) ) @@ -1845,6 +1847,107 @@ Please see the function `tempo-define-template'.") "*The template of a library module. Please see the function `tempo-define-template'.") +(defvar erlang-skel-ct-hook + '((erlang-skel-include erlang-skel-normal-header) + "%% Mandatory callbacks" n + "-export([init/2])." n + n + "%% Optional callbacks" n + "-export([id/1])." n + n + "-export([pre_init_per_suite/3])." n + "-export([post_init_per_suite/4])." n + n + "-export([pre_end_per_suite/3])." n + "-export([post_end_per_suite/4])." n + n + "-export([pre_init_per_group/4])." n + "-export([post_init_per_group/5])." n + n + "-export([pre_end_per_group/4])." n + "-export([post_end_per_group/5])." n + n + "-export([pre_init_per_testcase/4])." n + "-export([post_init_per_testcase/5])." n + n + "-export([pre_end_per_testcase/4])." n + "-export([post_end_per_testcase/5])." n + n + "-export([on_tc_fail/4])." n + "-export([on_tc_skip/4])." n + n + "-export([terminate/1])." n + n + "%% The hook state is threaded through all callbacks," n + "%% but can be anything the hook needs, replace as desired." n + "-record(state, { cases=0, suites=0, groups=0, skips=0, fails=0 })." n + n + "%% Return a unique id for this CTH." n + "id(Opts) ->" n + " %% A reference is the default implementation, this can be removed" n + " %% or some value can be read from Opts instead." n + " erlang:make_ref()." n + n + "%% Always called before any other callback function, once per installed hook." n + "init(Id, Opts) ->" n + " {ok, #state{}}." n + n + "pre_init_per_suite(Suite, Config, State) ->" n + " {Config, State}." n + n + "post_init_per_suite(Suite, Config, Return, State) ->" n + " {Return, State}." n + n + "pre_end_per_suite(Suite, Config, State) ->" n + " {Config, State}." n + n + "post_end_per_suite(Suite, Config, Return, State) ->" n + " {Return, State#state{suites = State#state.suites + 1}}." n + n + "pre_init_per_group(Suite, Group, Config, State) ->" n + " {Config, State}." n + n + "post_init_per_group(Suite, Group, Config, Return, State) ->" n + " {Return, State}." n + n + "pre_end_per_group(Suite, Group, Config, State) ->" n + " {Config, State}." n + n + "post_end_per_group(Suite, Group, Config, Return, State) ->" n + " {Return, State#state{groups = State#state.groups + 1}}." n + n + "pre_init_per_testcase(Suite, TC, Config, State) ->" n + " {Config, State}." n + n + "%% Called after each init_per_testcase (immediately before the test case)." n + "post_init_per_testcase(Suite, TC, Config, Return, State) ->" n + " {Return, State}." n + n + "%% Called before each end_per_testcase (immediately after the test case)." n + "pre_end_per_testcase(Suite, TC, Config, State) ->" n + " {Config, State}." n + n + "post_end_per_testcase(Suite, TC, Config, Return, State) ->" n + " {Return, State#state{cases = State#state.cases + 1}}." n + n + "%% Called after post_init_per_suite, post_end_per_suite, post_init_per_group," n + "%% post_end_per_group and post_end_per_testcase if the suite, group or test case failed." n + "on_tc_fail(Suite, TC, Reason, State) ->" n + " State#state{fails = State#state.fails + 1}." n + n + "%% Called when a test case is skipped by either user action" n + "%% or due to an init function failing." n + "on_tc_skip(Suite, TC, Reason, State) ->" n + " State#state{skips = State#state.skips + 1}." n + n + "%% Called when the scope of the CTH is done" n + "terminate(State) ->" n + " logger:notice(\"~s is done: ~p~n\", [?MODULE, State])." n + n + ) + "*The template of a library module. + Please see the function `tempo-define-template'.") + ;; Skeleton code: ;; This code is based on the package `tempo' which is part of modern diff --git a/elpa/erlang-20220215.1844/erlang-start.el b/elpa/erlang-20230628.1002/erlang-start.el similarity index 100% rename from elpa/erlang-20220215.1844/erlang-start.el rename to elpa/erlang-20230628.1002/erlang-start.el diff --git a/elpa/erlang-20220215.1844/erlang-test.el b/elpa/erlang-20230628.1002/erlang-test.el similarity index 100% rename from elpa/erlang-20220215.1844/erlang-test.el rename to elpa/erlang-20230628.1002/erlang-test.el diff --git a/elpa/erlang-20220215.1844/erlang.el b/elpa/erlang-20230628.1002/erlang.el similarity index 99% rename from elpa/erlang-20220215.1844/erlang.el rename to elpa/erlang-20230628.1002/erlang.el index 065e1808..a21f1df2 100644 --- a/elpa/erlang-20220215.1844/erlang.el +++ b/elpa/erlang-20230628.1002/erlang.el @@ -9,7 +9,7 @@ ;; %CopyrightBegin% ;; -;; Copyright Ericsson AB 1996-2021. All Rights Reserved. +;; Copyright Ericsson AB 1996-2023. All Rights Reserved. ;; ;; Licensed under the Apache License, Version 2.0 (the "License"); ;; you may not use this file except in compliance with the License. @@ -928,7 +928,6 @@ resulting regexp is surrounded by \\_< and \\_>." "delay_trap" "delete_element" "display" - "display_nl" "display_string" "dist_get_stat" "dist_ctrl_get_data" @@ -3054,7 +3053,7 @@ Return nil if inside string, t if in a comment." (if (memq (following-char) '(?% ?\n)) (+ (nth 2 stack-top) erlang-indent-level) (current-column)))))))) - ((and (eq (car stack-top) '||) (looking-at "\\(]\\|>>\\)[^_a-zA-Z0-9]")) + ((and (eq (car stack-top) '||) (looking-at "\\(]\\|>>\\|}\\)[^_a-zA-Z0-9]")) (nth 2 (car (cdr stack)))) ;; Real indentation, where operators create extra indentation etc. ((memq (car stack-top) '(-> || try begin maybe)) @@ -3236,8 +3235,13 @@ Return nil if inside string, t if in a comment." ;; Take parent indentation + offset, ;; else just erlang-indent-level if no parent (if stack - (+ (caddr (car stack)) - offset) + (progn + (goto-char (- (nth 1 (car stack)) 1)) + (if (looking-at "#{") + (+ (caddr (car stack)) + (- offset 1)) + (+ (caddr (car stack)) + offset))) erlang-indent-level)) (erlang-skip-blank indent-point) (current-column))) diff --git a/elpa/erlang-20220215.1844/erldoc.el b/elpa/erlang-20230628.1002/erldoc.el similarity index 100% rename from elpa/erlang-20220215.1844/erldoc.el rename to elpa/erlang-20230628.1002/erldoc.el -- 2.47.3