Merge branch 'dev/patch' into fix/junit-reference-not-clearing

Author: TheLimeGlass

.github/workflows/docs/generate-docs/action.yml

@@ -23,6 +23,11 @@ inputs:
     required: false
     default: "*"
     type: string
+  generate_javadocs:
+    description: "Designates whether to generate javadocs for this nightly documentation"
+    required: false
+    default: false
+    type: boolean
 
 outputs:
   DOCS_CHANGED:
@@ -41,6 +46,7 @@ runs:
         SKRIPT_REPO_DIR: ${{ inputs.skript_repo_dir }}
         IS_RELEASE: ${{ inputs.is_release }}
         CLEANUP_PATTERN: ${{ inputs.cleanup_pattern }}
+        GENERATE_JAVADOCS: ${{ inputs.generate_javadocs }}
       run: |
         replace_in_directory() {
           find $1 -type f -exec sed -i -e "s/$2/$3/g" {} \;
@@ -55,7 +61,7 @@ runs:
         if [ -d "${DOCS_REPO_DIR}/docs/templates" ]
         then
           export SKRIPT_DOCS_TEMPLATE_DIR=${DOCS_REPO_DIR}/docs/templates
-        else
+        else # compatibility for older versions
           export SKRIPT_DOCS_TEMPLATE_DIR=${DOCS_REPO_DIR}/doc-templates
         fi
 
@@ -64,12 +70,16 @@ runs:
         cd $SKRIPT_REPO_DIR
         if [[ "${IS_RELEASE}" == "true" ]]; then
           ./gradlew genReleaseDocs releaseJavadoc
-        else
+        elif [[ "${GENERATE_JAVADOCS}" == "true" ]]; then
           ./gradlew genNightlyDocs javadoc
+        else
+          ./gradlew genNightlyDocs
         fi
 
         if [ -d "${DOCS_OUTPUT_DIR}" ]; then
-          mkdir -p "${SKRIPT_DOCS_OUTPUT_DIR}/javadocs" && cp -a "./build/docs/javadoc/." "$_"
+          if [[ "${GENERATE_JAVADOCS}" == "true" ]]; then
+              mkdir -p "${SKRIPT_DOCS_OUTPUT_DIR}/javadocs" && cp -a "./build/docs/javadoc/." "$_"
+          fi
   
           mkdir -p "/tmp/normalized-output-docs" && cp -a "${DOCS_OUTPUT_DIR}/." "$_"
           mkdir -p "/tmp/normalized-generated-docs" && cp -a "${SKRIPT_DOCS_OUTPUT_DIR}/." "$_"

.github/workflows/nightly-docs.yml

@@ -3,7 +3,11 @@ name: Nightly documentation
 on:
   push:
     branches:
-      - '**'
+      - 'dev/feature'
+      - 'dev/patch'
+      - 'enhancement/**'
+      - 'feature/**'
+      - 'fix/**'
     tags-ignore:
       - '**'
 

src/main/java/ch/njol/skript/SkriptCommand.java

@@ -398,7 +398,7 @@ else if (args[0].equalsIgnoreCase("info")) {
 			else if (args[0].equalsIgnoreCase("gen-docs")) {
 				File templateDir = Documentation.getDocsTemplateDirectory();
 				if (!templateDir.exists()) {
-					Skript.error(sender, "Cannot generate docs! Documentation templates not found at 'plugins/Skript/doc-templates/'");
+					Skript.error(sender, "Cannot generate docs! Documentation templates not found at '" + Documentation.getDocsTemplateDirectory().getPath() + "'");
 					TestMode.docsFailed = true;
 					return true;
 				}

src/main/java/ch/njol/skript/SkriptCommandTabCompleter.java

@@ -18,6 +18,7 @@
  */
 package ch.njol.skript;
 
+import ch.njol.skript.doc.Documentation;
 import ch.njol.skript.test.runner.TestMode;
 import ch.njol.util.StringUtils;
 import org.bukkit.command.Command;
@@ -116,7 +117,7 @@ public List<String> onTabComplete(CommandSender sender, Command command, String
 			options.add("disable");
 			options.add("update");
 			options.add("info");
-			if (new File(Skript.getInstance().getDataFolder() + "/doc-templates").exists())
+			if (Documentation.getDocsTemplateDirectory().exists())
 				options.add("gen-docs");
 			if (TestMode.DEV_MODE)
 				options.add("test");

src/main/java/ch/njol/skript/structures/StructVariables.java

@@ -87,14 +87,14 @@ public static class DefaultVariables implements ScriptData {
 
 		private final Deque<Map<String, Class<?>[]>> hints = new ArrayDeque<>();
 		private final List<NonNullPair<String, Object>> variables;
+		private boolean loaded;
 
 		public DefaultVariables(Collection<NonNullPair<String, Object>> variables) {
 			this.variables = ImmutableList.copyOf(variables);
 		}
 
-		@SuppressWarnings("unchecked")
 		public void add(String variable, Class<?>... hints) {
-			if (hints == null || hints.length <= 0)
+			if (hints == null || hints.length == 0)
 				return;
 			if (CollectionUtils.containsAll(hints, Object.class)) // Ignore useless type hint.
 				return;
@@ -115,7 +115,7 @@ public void exitScope() {
 		/**
 		 * Returns the type hints of a variable.
 		 * Can be null if no type hint was saved.
-		 * 
+		 *
 		 * @param variable The variable string of a variable.
 		 * @return type hints of a variable if found otherwise null.
 		 */
@@ -140,14 +140,24 @@ public boolean hasDefaultVariables() {
 		public List<NonNullPair<String, Object>> getVariables() {
 			return variables;
 		}
+		
+		private boolean isLoaded() {
+			return loaded;
+		}
 	}
 
 	@Override
 	public boolean init(Literal<?>[] args, int matchedPattern, ParseResult parseResult, EntryContainer entryContainer) {
 		SectionNode node = entryContainer.getSource();
 		node.convertToEntries(0, "=");
-
-		List<NonNullPair<String, Object>> variables = new ArrayList<>();
+		List<NonNullPair<String, Object>> variables;
+		Script script = getParser().getCurrentScript();
+		DefaultVariables existing = script.getData(DefaultVariables.class); // if the user has TWO variables: sections
+		if (existing != null && existing.hasDefaultVariables()) {
+			variables = new ArrayList<>(existing.variables);
+		} else {
+			variables = new ArrayList<>();
+		}
 		for (Node n : node) {
 			if (!(n instanceof EntryNode)) {
 				Skript.error("Invalid line in variables structure");
@@ -227,29 +237,40 @@ public boolean init(Literal<?>[] args, int matchedPattern, ParseResult parseResu
 			}
 			variables.add(new NonNullPair<>(name, o));
 		}
-		getParser().getCurrentScript().addData(new DefaultVariables(variables));
+		script.addData(new DefaultVariables(variables)); // we replace the previous entry
 		return true;
 	}
 
 	@Override
 	public boolean load() {
 		DefaultVariables data = getParser().getCurrentScript().getData(DefaultVariables.class);
+		if (data == null) { // this shouldn't happen
+			Skript.error("Default variables data missing");
+			return false;
+		} else if (data.isLoaded()) {
+			return true;
+		}
 		for (NonNullPair<String, Object> pair : data.getVariables()) {
 			String name = pair.getKey();
 			if (Variables.getVariable(name, null, false) != null)
 				continue;
-
 			Variables.setVariable(name, pair.getValue(), null, false);
 		}
+		data.loaded = true;
 		return true;
 	}
 
 	@Override
 	public void postUnload() {
 		Script script = getParser().getCurrentScript();
 		DefaultVariables data = script.getData(DefaultVariables.class);
-		for (NonNullPair<String, Object> pair : data.getVariables())
-			Variables.setVariable(pair.getKey(), null, null, false);
+		if (data == null) // band-aid fix for this section's behaviour being handled by a previous section
+			return; // see https://github.com/SkriptLang/Skript/issues/6013
+		for (NonNullPair<String, Object> pair : data.getVariables()) {
+			String name = pair.getKey();
+			if (name.contains("<") && name.contains(">")) // probably a template made by us
+				Variables.setVariable(pair.getKey(), null, null, false);
+		}
 		script.removeData(DefaultVariables.class);
 	}
 

src/main/resources/lang/english.lang

@@ -45,7 +45,7 @@ skript command:
 			changes: Lists all changes since the current version
 			download: Download the newest version
 		info: Prints a message with links to Skript's aliases and documentation
-		gen-docs: Generates documentation using doc-templates in plugin folder
+		gen-docs: Generates documentation using docs/templates in plugin folder
 		test: Used for running internal Skript tests
 
 	invalid script: Can't find the script <grey>'<gold>%s<grey>'<red> in the scripts folder!

src/main/resources/lang/french.lang

@@ -45,7 +45,7 @@ skript command:
 			changes: Liste toutes les modifications apportées depuis la version actuelle
 			download: Télécharge la dernière version
 		info: Affiche un message contenant les liens vers les alias et la documentation de Skript
-		gen-docs: Génère la documentation en utilisant doc-templates dans le dossier du plugin
+		gen-docs: Génère la documentation en utilisant docs/templates dans le dossier du plugin
 		test: Utilisé pour exécuter les tests Skript
 
 	invalid script: Impossible de trouver le script <grey>'<gold>%s<grey>'<red> dans le dossier des scripts !

src/main/resources/lang/german.lang

@@ -45,7 +45,7 @@ skript command:
 			changes: Listet alle Änderungen seit der aktuellen Version auf (auf englisch)
 			download: Lädt die neueste Version herunter
 		info: Druckt eine Nachricht mit Links zu den Aliases und der Dokumentation von Skript.
-		gen-docs: Generiert Dokumentation mithilfe von doc-templates im Plugin-Ordner
+		gen-docs: Generiert Dokumentation mithilfe von docs/templates im Plugin-Ordner
 		test: Wird zum Ausführen von Skript-Tests verwendet
 
 	invalid script: Das Skript <grey>'<gold>%s<grey>'<red> konnte nicht gefunden werden.

src/main/resources/lang/simplifiedchinese.lang

@@ -45,7 +45,7 @@ skript command:
 			changes: 列出自当前版本以来的所有变化
 			download: 下载最新的版本
 		info: 打印一个带有Skript的别名和文档链接的信息
-		gen-docs: 使用插件文件夹中的doc-templates生成文档
+		gen-docs: 使用插件文件夹中的docs/templates生成文档
 		test: 用于运行内部的Skript测试
 
 	invalid script: 无法在scripts文件夹中找到脚本<grey>“<gold>%s<grey>”<red>！

src/test/skript/tests/syntaxes/structures/StructVariables.sk

@@ -0,0 +1,10 @@
+variables:
+	{variables_test1} = true
+
+variables:
+	{variables_test1} = false # we hope it doesn't overwrite!
+	{variables_test2} = true
+
+test "default variables":
+	assert {variables_test1} is true with "{variables_test1} was not true"
+	assert {variables_test2} is true with "{variables_test2} was not true"