Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix typo in private variable name and upgrade dependencies #455

Merged
merged 4 commits into from
Oct 21, 2022
Merged

Fix typo in private variable name and upgrade dependencies #455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b25c2ae
Fix typo in private variable name
sebthom Oct 21, 2022
275938c
use geekyeggo/delete-artifact@v2
sebthom Oct 21, 2022
f763220
chore: upgrade Maven from 3.8.5 to 3.8.6
sebthom Oct 21, 2022
6304549
chore: upgrade org.apache.batik.css from 1.14.0 to 1.15.0
sebthom Oct 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
- name: Set up Maven
uses: stCarolas/setup-maven@v4.4
with:
maven-version: 3.8.5
maven-version: 3.8.6


- name: Build with Maven
Expand All @@ -82,8 +82,7 @@ jobs:
clean verify

- name: "Delete intermediate build artifacts"
uses: geekyeggo/delete-artifact@1-glob-support # https://github.com/GeekyEggo/delete-artifact/
uses: geekyeggo/delete-artifact@v2 # https://github.com/GeekyEggo/delete-artifact/
with:
name: "*"
useGlob: true
failOnError: false
6 changes: 3 additions & 3 deletions org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/utils/MarkerUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ static MarkerConfig forTask(final int priority) {
}
}

private static final Map<String, MarkerConfig> MARKERCONIG_BY_TAG = Map.of(
private static final Map<String, MarkerConfig> MARKERCONFIG_BY_TAG = Map.of(
// problem markers:
"BUG", MarkerConfig.forProblem(IMarker.SEVERITY_ERROR),
"NOTE", MarkerConfig.forProblem(IMarker.SEVERITY_INFO),
Expand All @@ -59,7 +59,7 @@ static MarkerConfig forTask(final int priority) {
"XXX", MarkerConfig.forTask(IMarker.PRIORITY_NORMAL));

private static final Pattern TAG_SELECTOR_PATTERN = Pattern.compile(
"\\b(" + MARKERCONIG_BY_TAG.keySet().stream().collect(Collectors.joining("|")) + ")\\b");
"\\b(" + MARKERCONFIG_BY_TAG.keySet().stream().collect(Collectors.joining("|")) + ")\\b");

/**
* Updates all TM4E text markers of the corresponding document starting from
Expand Down Expand Up @@ -143,7 +143,7 @@ public static void updateTextMarkers(final TMDocumentModel docModel, final int s
if (!matcher.find())
continue;

final var markerConfig = MarkerUtils.MARKERCONIG_BY_TAG.get(matcher.group());
final var markerConfig = MarkerUtils.MARKERCONFIG_BY_TAG.get(matcher.group());
final var markerText = commentText.substring(matcher.start()).trim();
final var markerTextStartOffset = lineOffset + token.startIndex + matcher.start();

Expand Down
2 changes: 1 addition & 1 deletion target-platform/tm4e-target.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
<unit id="org.apache.batik.css" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.css" version="1.15.0.v20221018-0736"/>
<unit id="org.yaml.snakeyaml" version="1.27.0.v20201111-1638"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/latest-S/"/>
</location>
Expand Down