Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
1b55191
tooltip component
Kr0nox Jul 28, 2023
9b9e143
adjustments to tooltip
Kr0nox Jul 29, 2023
6e9e260
overwork options selector
Kr0nox Jul 29, 2023
e695c45
add metric selector
Kr0nox Jul 29, 2023
97c1222
replace old tooltip
Kr0nox Jul 29, 2023
2809704
more tooltips
Kr0nox Jul 30, 2023
691b79c
Re-write/Fix antlr-utils
brodmo Aug 25, 2023
ef9dce3
Fix errors
brodmo Aug 25, 2023
bb8a139
Adjust llvmir listener
brodmo Aug 25, 2023
6b77588
Fix code smells
brodmo Aug 25, 2023
2337898
Create language listeners statically
brodmo Aug 26, 2023
889f178
Fix code smell
brodmo Aug 26, 2023
5bcd1ed
Make language listeners package-private
brodmo Aug 26, 2023
a1f34b2
Add withLoopSemantics
brodmo Aug 26, 2023
468dfd6
Add tokens directly instead of using a handler
brodmo Aug 26, 2023
3dad69d
Fix bug, add warning
brodmo Aug 28, 2023
cc156ec
Simplify token collector file update
brodmo Aug 28, 2023
5e6e60d
update file handling
Kr0nox Sep 2, 2023
c757567
local zip loading
Kr0nox Sep 2, 2023
d93a608
store all selections
Kr0nox Sep 7, 2023
3917dd3
Merge remote-tracking branch 'origin/develop' into report-viewer/tool…
Kr0nox Sep 8, 2023
bf332f0
add some more tooltips
Kr0nox Sep 8, 2023
203cdd0
fix build
Kr0nox Sep 8, 2023
3961b3d
fix some tooltips
Kr0nox Sep 10, 2023
c327e5a
rearange classes
Kr0nox Sep 10, 2023
d86abec
fix bugs
Kr0nox Sep 10, 2023
32c00c1
add tests
Kr0nox Sep 10, 2023
83033b0
remove unused import
Kr0nox Sep 10, 2023
2a7a129
fix url problems
Kr0nox Sep 11, 2023
98e0fcb
Merge remote-tracking branch 'origin/develop' into report-viwer/local…
Kr0nox Sep 11, 2023
9b2d083
fix classic local mode
Kr0nox Sep 11, 2023
c9e08a5
revert changes to config file
Kr0nox Sep 11, 2023
9f66c2b
remove wrong file
Kr0nox Sep 11, 2023
4488e9a
fix build error
Kr0nox Sep 11, 2023
3efd496
Remove explicit super() calls
brodmo Sep 13, 2023
b263bc5
Merge branch 'develop' into antlr-utils-rewrite
brodmo Sep 13, 2023
cfdf579
Dependency(deps): Bump crazy-max/ghaction-import-gpg from 5 to 6 (#1300)
dependabot[bot] Sep 13, 2023
b62d897
Dependency(deps): Bump org.scalameta:scalameta_2.13 from 4.8.9 to 4.8…
dependabot[bot] Sep 13, 2023
d33db09
Dependency(deps): Bump org.scala-lang:scala-library from 2.13.11 to 2…
dependabot[bot] Sep 13, 2023
52453db
Dependency(deps-dev): Bump vue-tsc from 1.8.8 to 1.8.11 in /report-vi…
dependabot[bot] Sep 13, 2023
0c4136e
Dependency(deps-dev): Bump eslint from 8.48.0 to 8.49.0 in /report-vi…
dependabot[bot] Sep 13, 2023
b32c82f
Dependency(deps-dev): Bump @types/node from 20.5.9 to 20.6.0 in /repo…
dependabot[bot] Sep 13, 2023
f144902
Dependency(deps-dev): Bump vitest from 0.34.3 to 0.34.4 in /report-vi…
dependabot[bot] Sep 13, 2023
d1db0e9
Allow passing multiple options in the "Advanced" group
olmokramer Sep 14, 2023
36dae0f
Add test for the advanced options group
olmokramer Sep 14, 2023
c451e87
delay showing tooltip
Kr0nox Sep 14, 2023
52fd4b7
default option for metric selector
Kr0nox Sep 14, 2023
abbcdfb
change delay to tailwind classes
Kr0nox Sep 15, 2023
3b6050a
node v18
Kr0nox Sep 18, 2023
bdc8627
Merge pull request #1293 from jplag/report-viwer/local-zip
sebinside Sep 18, 2023
0fe97ee
Merge pull request #1292 from jplag/report-viewer/tooltips
sebinside Sep 18, 2023
86a1720
Merge pull request #1302 from jplag/node-version
sebinside Sep 18, 2023
a378218
Merge remote-tracking branch 'origin/develop' into report-viewer/stor…
Kr0nox Sep 18, 2023
abfe349
remove log message
Kr0nox Sep 18, 2023
10adb0d
Merge pull request #1290 from jplag/report-viewer/store-metric
sebinside Sep 20, 2023
482ad43
Dependency(deps-dev): Bump @playwright/test from 1.37.1 to 1.38.0 in …
dependabot[bot] Sep 21, 2023
1b64236
Dependency(deps-dev): Bump postcss from 8.4.29 to 8.4.30 in /report-v…
dependabot[bot] Sep 21, 2023
1e4a5bf
Dependency(deps-dev): Bump @types/jsdom from 21.1.2 to 21.1.3 in /rep…
dependabot[bot] Sep 21, 2023
fdbeec7
Dependency(deps-dev): Bump @rushstack/eslint-patch from 1.3.3 to 1.4.…
dependabot[bot] Sep 21, 2023
c222524
Dependency(deps): Bump org.eclipse.emf:org.eclipse.emf.ecore
dependabot[bot] Sep 6, 2023
2c98dcc
Dependency(deps): Bump org.eclipse.emf:org.eclipse.emf.ecore.xmi
dependabot[bot] Aug 30, 2023
8ef14dd
Dependency(deps): Bump org.eclipse.emf:org.eclipse.emf.common
dependabot[bot] Sep 25, 2023
8abdb4c
Merge pull request #1263 from mbrdl/antlr-utils-rewrite
tsaglam Sep 25, 2023
094fab8
Dependency(deps): Bump org.apache.maven.plugins:maven-javadoc-plugin
dependabot[bot] Sep 20, 2023
7ca56ff
Merge pull request #1301 from CodeGra-de/bugfix/allow-passing-multipl…
tsaglam Sep 26, 2023
77e22dd
Dependency(deps-dev): Bump eslint from 8.49.0 to 8.50.0 in /report-vi…
dependabot[bot] Sep 27, 2023
8f0f5f7
Dependency(deps-dev): Bump @types/node from 18.17.17 to 18.18.0 in /r…
dependabot[bot] Sep 27, 2023
dd1a20d
Dependency(deps-dev): Bump @playwright/test from 1.38.0 to 1.38.1 in …
dependabot[bot] Sep 27, 2023
9b877a3
Dependency(deps): Bump vue-router from 4.2.4 to 4.2.5 in /report-view…
dependabot[bot] Sep 27, 2023
7d1682e
Dependency(deps): Bump edu.stanford.nlp:stanford-corenlp from 4.5.4 t…
dependabot[bot] Sep 27, 2023
8722f62
Dependency(deps): Bump org.scalameta:scalameta_2.13 from 4.8.10 to 4.…
dependabot[bot] Sep 27, 2023
953bdc9
add view wrapper for async views
Kr0nox Sep 28, 2023
afc3f82
bump vue-tsc to 1.8.15
Kr0nox Sep 28, 2023
94301a0
Merge pull request #1321 from jplag/report-viewer/bump-vue-tsc
sebinside Sep 28, 2023
9149f42
Merge pull request #1320 from jplag/report-viewer/view-wrapper
sebinside Sep 29, 2023
a6f810b
Add parse and compare hooks
olmokramer Sep 4, 2023
55624bd
Add tests for the parse and compare hooks
olmokramer Sep 15, 2023
c340056
Fix NPE in `AbstractAntlrListener::getDescendant`
libre-man Oct 1, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
with:
servers: '[{ "id": "ossrh", "username": "jplag", "password": "${{ secrets.OSSRH_TOKEN }}" }]'
- name: Import GPG key
uses: crazy-max/ghaction-import-gpg@v5
uses: crazy-max/ghaction-import-gpg@v6
with:
gpg_private_key: ${{ secrets.PGP_SECRET }}
passphrase: ${{ secrets.PGP_PW }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/report-viewer-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: "16"
node-version: "18"

- name: Set version of Report Viewer
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/report-viewer-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: "16"
node-version: "18"

- name: Set version of Report Viewer
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/report-viewer-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: "16"
node-version: "18"

- name: Install and Test 🧪
working-directory: report-viewer
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/report-viewer-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: Report Viewer ESLint Workflow # Checks linting of report viewer
on:
workflow_dispatch:
push:
path:
paths:
- ".github/workflows/report-viewer-lint.yml"
- "report-viewer/**"
pull_request:
Expand Down Expand Up @@ -35,7 +35,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: "16"
node-version: "18"

- name: Install and Lint 🎨
working-directory: report-viewer
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/report-viewer-prettier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: "16"
node-version: "18"

- name: Install and Check 🎨
working-directory: report-viewer
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/report-viewer-unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: "16"
node-version: "18"

- name: Install and Test 🧪
working-directory: report-viewer
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/report-viewer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: "16"
node-version: "18"

- name: Set version of Report Viewer
shell: bash
Expand Down
3 changes: 2 additions & 1 deletion cli/src/main/java/de/jplag/cli/CLI.java
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,8 @@ public JPlagOptions buildOptionsFromArguments(ParseResult parseResult) throws Cl
JPlagOptions jPlagOptions = new JPlagOptions(loadLanguage(parseResult), this.options.minTokenMatch, submissionDirectories,
oldSubmissionDirectories, null, this.options.advanced.subdirectory, suffixes, this.options.advanced.exclusionFileName,
JPlagOptions.DEFAULT_SIMILARITY_METRIC, this.options.advanced.similarityThreshold, this.options.shownComparisons, clusteringOptions,
this.options.advanced.debug, mergingOptions);
this.options.advanced.debug, mergingOptions, JPlagOptions.DEFAULT_PRE_PARSE_HOOK, JPlagOptions.DEFAULT_PARSE_HOOK,
JPlagOptions.DEFAULT_PRE_COMPARE_HOOK, JPlagOptions.DEFAULT_COMPARE_HOOK);

String baseCodePath = this.options.baseCode;
File baseCodeDirectory = baseCodePath == null ? null : new File(baseCodePath);
Expand Down
2 changes: 1 addition & 1 deletion cli/src/main/java/de/jplag/cli/CliOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public class CliOptions implements Runnable {
"--result-directory"}, description = "Name of the directory in which the comparison results will be stored (default: result)%n")
public String resultFolder = "results";

@ArgGroup(heading = "Advanced%n")
@ArgGroup(heading = "Advanced%n", exclusive = false)
public Advanced advanced = new Advanced();

@ArgGroup(validate = false, heading = "Clustering%n")
Expand Down
23 changes: 23 additions & 0 deletions cli/src/test/java/de/jplag/cli/AdvancedGroupTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package de.jplag.cli;

import static org.junit.jupiter.api.Assertions.assertEquals;

import java.util.Arrays;

import org.junit.jupiter.api.Test;

class AdvancedGroupTest extends CommandLineInterfaceTest {
private static final String SUFFIXES = ".sc,.scala";

private static final double SIMILARITY_THRESHOLD = 0.5;

/**
* Verify that it is possible to set multiple options in the "advanced" options group.
*/
@Test
void testNotExclusive() throws CliException {
buildOptionsFromCLI(defaultArguments().suffixes(SUFFIXES).similarityThreshold(SIMILARITY_THRESHOLD));
assertEquals(Arrays.stream(SUFFIXES.split(",")).toList(), options.fileSuffixes());
assertEquals(0.5, options.similarityThreshold());
}
}
4 changes: 4 additions & 0 deletions core/src/main/java/de/jplag/SubmissionSet.java
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@ private void parseBaseCodeSubmission(Submission baseCode) throws BasecodeExcepti
* Parse all given submissions.
*/
private void parseSubmissions(List<Submission> submissions) {
this.options.preParseHook().accept(submissions);

if (submissions.isEmpty()) {
logger.warn("No submissions to parse!");
return;
Expand Down Expand Up @@ -167,6 +169,8 @@ private void parseSubmissions(List<Submission> submissions) {
} else {
logger.error("ERROR -> Submission {} removed", currentSubmissionName);
}

this.options.parseHook().accept(submission);
}

int validSubmissions = submissions.size() - errors - tooShort;
Expand Down
Loading