From c0c939437947a2f10ad1689cd237eef550d9f673 Mon Sep 17 00:00:00 2001 From: sebthom Date: Wed, 14 Feb 2024 23:58:58 +0100 Subject: [PATCH] fix: Prevent .txt files being associated with wrong content types --- org.eclipse.tm4e.language_pack/plugin.xml | 9 +++++---- .../updater/src/main/java/updater/Updater.java | 10 +++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/org.eclipse.tm4e.language_pack/plugin.xml b/org.eclipse.tm4e.language_pack/plugin.xml index f4a5386a6..47c20cecf 100644 --- a/org.eclipse.tm4e.language_pack/plugin.xml +++ b/org.eclipse.tm4e.language_pack/plugin.xml @@ -9,7 +9,8 @@ + priority="low" + file-names="WORKAROUND_SO_THAT_THIS_CONTENTTYPE_IS_NOT_ASSOCIATED_WITH_TXT_FILES_SEE_ISSUE_703" /> @@ -679,7 +680,7 @@ + file-names="WORKAROUND_SO_THAT_THIS_CONTENTTYPE_IS_NOT_ASSOCIATED_WITH_TXT_FILES_SEE_ISSUE_703" /> @@ -715,7 +716,7 @@ + file-names="WORKAROUND_SO_THAT_THIS_CONTENTTYPE_IS_NOT_ASSOCIATED_WITH_TXT_FILES_SEE_ISSUE_703" /> @@ -831,7 +832,7 @@ + file-names="WORKAROUND_SO_THAT_THIS_CONTENTTYPE_IS_NOT_ASSOCIATED_WITH_TXT_FILES_SEE_ISSUE_703" /> diff --git a/org.eclipse.tm4e.language_pack/updater/src/main/java/updater/Updater.java b/org.eclipse.tm4e.language_pack/updater/src/main/java/updater/Updater.java index 46190d0ca..03675f56a 100644 --- a/org.eclipse.tm4e.language_pack/updater/src/main/java/updater/Updater.java +++ b/org.eclipse.tm4e.language_pack/updater/src/main/java/updater/Updater.java @@ -403,12 +403,16 @@ private void updatePluginXML() throws IOException { fileExtensions = fileExtensions.stream().distinct().sorted().toList(); fileNames = fileNames.stream().distinct().sorted().toList(); filePatterns = filePatterns.stream().distinct().sorted().toList(); - - templateVars.put("file_associations", Arrays.asList( // + final String fileAssociations = Arrays.asList( // fileExtensions.isEmpty() ? null : "file-extensions=\"" + join(fileExtensions, ",") + "\"", // fileNames.isEmpty() ? null : "file-names=\"" + join(fileNames, ",") + "\"", // filePatterns.isEmpty() ? null : "file-patterns=\"" + join(filePatterns, ",") + "\"" // - ).stream().filter(Objects::nonNull).collect(Collectors.joining(" "))); + ).stream().filter(Objects::nonNull).collect(Collectors.joining(" ")); + + templateVars.put("file_associations", + fileAssociations.isBlank() + ? "file-names=\"WORKAROUND_SO_THAT_THIS_CONTENTTYPE_IS_NOT_ASSOCIATED_WITH_TXT_FILES_SEE_ISSUE_703\"" + : fileAssociations); pluginLines.append(render( """