From 1b55191195c4258899a57c40d5ff77ee20820559 Mon Sep 17 00:00:00 2001
From: Alexander Vogt <alexander_vogt@outlook.de>
Date: Fri, 28 Jul 2023 14:47:31 +0200
Subject: [PATCH 01/57] tooltip component

---
 .../src/components/ToolTipComponent.vue       | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 report-viewer/src/components/ToolTipComponent.vue

diff --git a/report-viewer/src/components/ToolTipComponent.vue b/report-viewer/src/components/ToolTipComponent.vue
new file mode 100644
index 000000000..8ca1e934d
--- /dev/null
+++ b/report-viewer/src/components/ToolTipComponent.vue
@@ -0,0 +1,69 @@
+<template>
+  <div class="relative inline-block group">
+    <slot></slot>
+    <div
+      class="absolute hidden group-hover:block bg-black bg-opacity-60 px-1 text-sm rounded-md text-white text-center"
+      :style="tooltipPosition"
+    >
+      <slot name="tooltip"></slot>
+      <div class="border-4 border-solid absolute" :style="arrowStyle"><!-- Arrow --></div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, type PropType, type StyleValue } from 'vue'
+
+const props = defineProps({
+  direction: {
+    type: String as PropType<'top' | 'bottom' | 'left' | 'right'>,
+    required: false,
+    default: 'top'
+  }
+})
+
+const tooltipPosition = computed(() => {
+  const style: StyleValue = {}
+
+  if (props.direction == 'left' || props.direction == 'right') {
+    style.top = '50%'
+    style.transform = 'translateY(-50%)'
+    if (props.direction == 'left') {
+      style.right = '120%'
+    } else {
+      style.left = '120%'
+    }
+  } else {
+    style.left = '50%'
+    style.transform = 'translateX(-50%)'
+  }
+
+  return style
+})
+
+const arrowStyle = computed(() => {
+  const style: StyleValue = {}
+  style.content = ' '
+
+  function getBorderColor(current: String, other: String) {
+    return other == current ? 'rgba(0,0,0,0.6)' : 'transparent'
+  }
+
+  style.borderColor = ''
+  for (const dir of ['top', 'right', 'bottom', 'left']) {
+    style.borderColor += getBorderColor(dir, props.direction) + ' '
+  }
+
+  if (props.direction == 'left' || props.direction == 'right') {
+    style.top = '50%'
+    style.marginTop = '-4px'
+  } else {
+    style.left = '50%'
+    style.marginLeft = '-4px'
+  }
+
+  style[props.direction] = '100%'
+
+  return style
+})
+</script>

From 9b9e143c96c391131486afbb9597bf6020edae5c Mon Sep 17 00:00:00 2001
From: Alex | Kronox <alexander_vogt@outlook.de>
Date: Sat, 29 Jul 2023 16:28:37 +0200
Subject: [PATCH 02/57] adjustments to tooltip

---
 .../src/components/ToolTipComponent.vue       | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/report-viewer/src/components/ToolTipComponent.vue b/report-viewer/src/components/ToolTipComponent.vue
index 8ca1e934d..a6f9c4899 100644
--- a/report-viewer/src/components/ToolTipComponent.vue
+++ b/report-viewer/src/components/ToolTipComponent.vue
@@ -1,11 +1,13 @@
 <template>
-  <div class="relative inline-block group">
-    <slot></slot>
+  <div class="relative inline-block group z-10">
+    <slot v-if="!defaultText"></slot>
+    <div v-else>{{ defaultText }}</div>
     <div
-      class="absolute hidden group-hover:block bg-black bg-opacity-60 px-1 text-sm rounded-md text-white text-center"
+      class="absolute hidden group-hover:block bg-black bg-opacity-60 px-1 rounded-md text-white text-center"
       :style="tooltipPosition"
     >
-      <slot name="tooltip"></slot>
+      <slot name="tooltip" v-if="!tooltipText"></slot>
+      <div class="text-sm" v-else>{{ tooltipText }}</div>
       <div class="border-4 border-solid absolute" :style="arrowStyle"><!-- Arrow --></div>
     </div>
   </div>
@@ -19,6 +21,16 @@ const props = defineProps({
     type: String as PropType<'top' | 'bottom' | 'left' | 'right'>,
     required: false,
     default: 'top'
+  },
+  defaultText: {
+    type: String,
+    required: false,
+    default: undefined
+  },
+  tooltipText: {
+    type: String,
+    required: false,
+    default: undefined
   }
 })
 
@@ -29,13 +41,18 @@ const tooltipPosition = computed(() => {
     style.top = '50%'
     style.transform = 'translateY(-50%)'
     if (props.direction == 'left') {
-      style.right = '120%'
+      style.right = '105%'
     } else {
-      style.left = '120%'
+      style.left = '105%'
     }
   } else {
     style.left = '50%'
     style.transform = 'translateX(-50%)'
+    if (props.direction == 'top') {
+      style.bottom = '105%'
+    } else {
+      style.top = '105%'
+    }
   }
 
   return style

From 6e9e2600125651112cbe033453865c1a3c764b28 Mon Sep 17 00:00:00 2001
From: Alex | Kronox <alexander_vogt@outlook.de>
Date: Sat, 29 Jul 2023 19:17:07 +0200
Subject: [PATCH 03/57] overwork options selector

---
 .../components/OptionsSelectorComponent.vue   | 49 -------------
 .../src/components/ToolTipComponent.vue       | 16 +---
 .../optionsSelectors/OptionComponent.vue      | 26 +++++++
 .../OptionsSelectorComponent.vue              | 73 +++++++++++++++++++
 report-viewer/src/views/OverviewView.vue      |  2 +-
 5 files changed, 102 insertions(+), 64 deletions(-)
 delete mode 100644 report-viewer/src/components/OptionsSelectorComponent.vue
 create mode 100644 report-viewer/src/components/optionsSelectors/OptionComponent.vue
 create mode 100644 report-viewer/src/components/optionsSelectors/OptionsSelectorComponent.vue

diff --git a/report-viewer/src/components/OptionsSelectorComponent.vue b/report-viewer/src/components/OptionsSelectorComponent.vue
deleted file mode 100644
index 1227422dc..000000000
--- a/report-viewer/src/components/OptionsSelectorComponent.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
-  Component for selecting one of multiple options.
--->
-<template>
-  <div class="flex flex-row text-xs h-fit items-center text-center">
-    <div v-if="name != ''" class="mr-3 text-base">
-      {{ name }}
-    </div>
-    <Interactable
-      v-for="[index, label] in labels.entries()"
-      :key="label"
-      class="mr-2 px-[12px] w-fit !rounded-2xl flex justify-center items-center text-center box-border h-6 hover:!border-[2px] hover:px-[11px]"
-      :class="{ '!bg-accent !border-accent-dark !bg-opacity-40': index == selected }"
-      @click="select(index)"
-    >
-      {{ label }}
-    </Interactable>
-  </div>
-</template>
-
-<script setup lang="ts">
-import Interactable from './InteractableComponent.vue'
-import { toRef } from 'vue'
-
-const props = defineProps({
-  name: {
-    type: String,
-    required: false,
-    default: ''
-  },
-  labels: {
-    type: Array<string>,
-    required: true
-  },
-  defaultSelected: {
-    type: Number,
-    required: false,
-    default: 0
-  }
-})
-
-const emit = defineEmits(['selectionChanged'])
-const selected = toRef(props.defaultSelected)
-
-function select(index: number) {
-  emit('selectionChanged', index)
-  selected.value = index
-}
-</script>
diff --git a/report-viewer/src/components/ToolTipComponent.vue b/report-viewer/src/components/ToolTipComponent.vue
index a6f9c4899..c175e7cdf 100644
--- a/report-viewer/src/components/ToolTipComponent.vue
+++ b/report-viewer/src/components/ToolTipComponent.vue
@@ -1,13 +1,11 @@
 <template>
   <div class="relative inline-block group z-10">
-    <slot v-if="!defaultText"></slot>
-    <div v-else>{{ defaultText }}</div>
+    <slot></slot>
     <div
       class="absolute hidden group-hover:block bg-black bg-opacity-60 px-1 rounded-md text-white text-center"
       :style="tooltipPosition"
     >
-      <slot name="tooltip" v-if="!tooltipText"></slot>
-      <div class="text-sm" v-else>{{ tooltipText }}</div>
+      <slot name="tooltip"></slot>
       <div class="border-4 border-solid absolute" :style="arrowStyle"><!-- Arrow --></div>
     </div>
   </div>
@@ -21,16 +19,6 @@ const props = defineProps({
     type: String as PropType<'top' | 'bottom' | 'left' | 'right'>,
     required: false,
     default: 'top'
-  },
-  defaultText: {
-    type: String,
-    required: false,
-    default: undefined
-  },
-  tooltipText: {
-    type: String,
-    required: false,
-    default: undefined
   }
 })
 
diff --git a/report-viewer/src/components/optionsSelectors/OptionComponent.vue b/report-viewer/src/components/optionsSelectors/OptionComponent.vue
new file mode 100644
index 000000000..84c1ba40e
--- /dev/null
+++ b/report-viewer/src/components/optionsSelectors/OptionComponent.vue
@@ -0,0 +1,26 @@
+<template>
+  <Interactable
+    class="mr-2 px-[12px] w-fit !rounded-2xl flex justify-center items-center text-center box-border h-6 hover:!border-[2px] hover:px-[11px]"
+    :class="{ '!bg-accent !border-accent-dark !bg-opacity-40': selected }"
+    @click="$emit('click')"
+  >
+    {{ label }}
+  </Interactable>
+</template>
+
+<script setup lang="ts">
+import Interactable from '../InteractableComponent.vue'
+
+defineProps({
+  label: {
+    type: String,
+    required: true
+  },
+  selected: {
+    type: Boolean,
+    required: true
+  }
+})
+
+defineEmits(['click'])
+</script>
diff --git a/report-viewer/src/components/optionsSelectors/OptionsSelectorComponent.vue b/report-viewer/src/components/optionsSelectors/OptionsSelectorComponent.vue
new file mode 100644
index 000000000..5ffbb2a07
--- /dev/null
+++ b/report-viewer/src/components/optionsSelectors/OptionsSelectorComponent.vue
@@ -0,0 +1,73 @@
+<!--
+  Component for selecting one of multiple options.
+-->
+<template>
+  <div class="flex flex-row text-xs h-fit items-center text-center">
+    <div v-if="name != ''" class="mr-3 text-base">
+      {{ name }}
+    </div>
+    <div v-for="[index, label] in labels.entries()" :key="index">
+      <ToolTipComponent
+        v-if="(label as ToolTipLabel).displayValue !== undefined"
+        direction="left"
+        :tooltip-text="(label as ToolTipLabel).tooltip"
+      >
+        <template #default>
+          <OptionComponent
+            :label="(label as ToolTipLabel).displayValue"
+            :selected="index == selected"
+            @click="select(index)"
+          />
+        </template>
+
+        <template #tooltip>
+          <p class="whitespace-nowrap min-h-[1.25rem] flex items-center">
+            {{ (label as ToolTipLabel).tooltip }}
+          </p>
+        </template>
+      </ToolTipComponent>
+      <OptionComponent
+        v-else
+        :label="label as string"
+        :selected="index == selected"
+        @click="select(index)"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { toRef } from 'vue'
+import ToolTipComponent from '../ToolTipComponent.vue'
+import OptionComponent from './OptionComponent.vue'
+
+type ToolTipLabel = {
+  displayValue: string
+  tooltip: string
+}
+
+const props = defineProps({
+  name: {
+    type: String,
+    required: false,
+    default: ''
+  },
+  labels: {
+    type: Array<string | ToolTipLabel>,
+    required: true
+  },
+  defaultSelected: {
+    type: Number,
+    required: false,
+    default: 0
+  }
+})
+
+const emit = defineEmits(['selectionChanged'])
+const selected = toRef(props.defaultSelected)
+
+function select(index: number) {
+  emit('selectionChanged', index)
+  selected.value = index
+}
+</script>
diff --git a/report-viewer/src/views/OverviewView.vue b/report-viewer/src/views/OverviewView.vue
index 5b0334fc8..d04c94715 100644
--- a/report-viewer/src/views/OverviewView.vue
+++ b/report-viewer/src/views/OverviewView.vue
@@ -86,7 +86,7 @@ import MetricType from '@/model/MetricType'
 import SearchBarComponent from '@/components/SearchBarComponent.vue'
 import TextInformation from '@/components/TextInformation.vue'
 import type { ComparisonListElement } from '@/model/ComparisonListElement'
-import OptionsSelector from '@/components/OptionsSelectorComponent.vue'
+import OptionsSelector from '@/components/optionsSelectors/OptionsSelectorComponent.vue'
 
 const overview = OverviewFactory.getOverview()
 

From e695c4548a95a79ff6377458ac4bb47c4a515519 Mon Sep 17 00:00:00 2001
From: Alex | Kronox <alexander_vogt@outlook.de>
Date: Sat, 29 Jul 2023 20:04:11 +0200
Subject: [PATCH 04/57] add metric selector

---
 .../src/components/ToolTipComponent.vue       |  4 +--
 .../optionsSelectors/MetricSelector.vue       | 36 +++++++++++++++++++
 .../OptionsSelectorComponent.vue              | 10 +++---
 report-viewer/src/model/MetricType.ts         | 21 +++++++++++
 report-viewer/src/router/index.ts             |  5 +++
 report-viewer/src/views/OverviewView.vue      | 17 +++++----
 report-viewer/src/views/TestView.vue          | 24 +++++++++++++
 7 files changed, 101 insertions(+), 16 deletions(-)
 create mode 100644 report-viewer/src/components/optionsSelectors/MetricSelector.vue
 create mode 100644 report-viewer/src/views/TestView.vue

diff --git a/report-viewer/src/components/ToolTipComponent.vue b/report-viewer/src/components/ToolTipComponent.vue
index c175e7cdf..32d302346 100644
--- a/report-viewer/src/components/ToolTipComponent.vue
+++ b/report-viewer/src/components/ToolTipComponent.vue
@@ -1,8 +1,8 @@
 <template>
-  <div class="relative inline-block group z-10">
+  <div class="relative inline-block group">
     <slot></slot>
     <div
-      class="absolute hidden group-hover:block bg-black bg-opacity-60 px-1 rounded-md text-white text-center"
+      class="absolute hidden group-hover:block bg-black bg-opacity-60 px-1 rounded-md text-white text-center z-10"
       :style="tooltipPosition"
     >
       <slot name="tooltip"></slot>
diff --git a/report-viewer/src/components/optionsSelectors/MetricSelector.vue b/report-viewer/src/components/optionsSelectors/MetricSelector.vue
new file mode 100644
index 000000000..3831b21e1
--- /dev/null
+++ b/report-viewer/src/components/optionsSelectors/MetricSelector.vue
@@ -0,0 +1,36 @@
+<template>
+  <OptionsSelectorComponent
+    :name="name"
+    :labels="labels"
+    @selection-changed="(i) => $emit('selectionChanged', metrics[i])"
+  />
+</template>
+
+<script setup lang="ts">
+import OptionsSelectorComponent from './OptionsSelectorComponent.vue'
+import MetricType, { metricToolTips } from '@/model/MetricType'
+
+const props = defineProps({
+  metrics: {
+    type: Array<MetricType>,
+    required: false,
+    default: [MetricType.AVERAGE, MetricType.MAXIMUM]
+  },
+  name: {
+    type: String,
+    required: false,
+    default: ''
+  }
+})
+
+defineEmits(['selectionChanged'])
+
+const labels: { displayValue: string; tooltip: string }[] = []
+
+for (const metric of props.metrics) {
+  labels.push({
+    displayValue: metricToolTips[metric].longName,
+    tooltip: metricToolTips[metric].tooltip
+  })
+}
+</script>
diff --git a/report-viewer/src/components/optionsSelectors/OptionsSelectorComponent.vue b/report-viewer/src/components/optionsSelectors/OptionsSelectorComponent.vue
index 5ffbb2a07..207b61276 100644
--- a/report-viewer/src/components/optionsSelectors/OptionsSelectorComponent.vue
+++ b/report-viewer/src/components/optionsSelectors/OptionsSelectorComponent.vue
@@ -3,13 +3,13 @@
 -->
 <template>
   <div class="flex flex-row text-xs h-fit items-center text-center">
-    <div v-if="name != ''" class="mr-3 text-base">
-      {{ name }}
+    <div v-if="title != ''" class="mr-3 text-base">
+      {{ title }}
     </div>
     <div v-for="[index, label] in labels.entries()" :key="index">
       <ToolTipComponent
         v-if="(label as ToolTipLabel).displayValue !== undefined"
-        direction="left"
+        direction="right"
         :tooltip-text="(label as ToolTipLabel).tooltip"
       >
         <template #default>
@@ -21,7 +21,7 @@
         </template>
 
         <template #tooltip>
-          <p class="whitespace-nowrap min-h-[1.25rem] flex items-center">
+          <p class="whitespace-pre min-h-[1.25rem] flex items-center">
             {{ (label as ToolTipLabel).tooltip }}
           </p>
         </template>
@@ -47,7 +47,7 @@ type ToolTipLabel = {
 }
 
 const props = defineProps({
-  name: {
+  title: {
     type: String,
     required: false,
     default: ''
diff --git a/report-viewer/src/model/MetricType.ts b/report-viewer/src/model/MetricType.ts
index dfb93c9f0..0d9a5b375 100644
--- a/report-viewer/src/model/MetricType.ts
+++ b/report-viewer/src/model/MetricType.ts
@@ -7,3 +7,24 @@ enum MetricType {
 }
 
 export default MetricType
+
+type MetricToolTipData = {
+  longName: string
+  shortName: string
+  tooltip: string
+}
+
+export const metricToolTips: Record<MetricType, MetricToolTipData> = {
+  [MetricType.AVERAGE]: {
+    longName: 'Average Similarity',
+    shortName: 'AVG',
+    tooltip:
+      'The average similarity of the two files.\nA high similarity indicates that the programms work in a similar way.'
+  },
+  [MetricType.MAXIMUM]: {
+    longName: 'Maximum Similarity',
+    shortName: 'MAX',
+    tooltip:
+      'The maximum similarity of the two files.\nUsefull if programms are very dfferent in size.'
+  }
+}
diff --git a/report-viewer/src/router/index.ts b/report-viewer/src/router/index.ts
index 4d4212d82..b88420aa8 100644
--- a/report-viewer/src/router/index.ts
+++ b/report-viewer/src/router/index.ts
@@ -43,6 +43,11 @@ const router = createRouter({
       path: '/info',
       name: 'InfoView',
       component: InformationView
+    },
+    {
+      path: '/test',
+      name: 'TestView',
+      component: () => import('@/views/TestView.vue')
     }
   ]
 })
diff --git a/report-viewer/src/views/OverviewView.vue b/report-viewer/src/views/OverviewView.vue
index d04c94715..b92047331 100644
--- a/report-viewer/src/views/OverviewView.vue
+++ b/report-viewer/src/views/OverviewView.vue
@@ -29,13 +29,13 @@
           :distribution="overview.distribution[selectedDistributionDiagramMetric]"
           class="w-full h-2/3"
         />
-        <div class="flex flex-col flex-grow space-y-1">
+        <div class="flex flex-col flex-grow">
           <h3 class="text-lg underline">Options:</h3>
-          <ScrollableComponent class="flex-grow space-y-2">
-            <OptionsSelector
-              name="Metric"
-              :labels="['Average', 'Maximum']"
+          <ScrollableComponent class="flex-grow h-fit">
+            <MetricSelector
+              title="Metric"
               @selection-changed="(i: number) => selectDistributionDiagramMetric(i)"
+              class="mt-2"
             />
           </ScrollableComponent>
         </div>
@@ -57,9 +57,8 @@
             }}
           </Button>
         </div>
-        <OptionsSelector
-          name="Sort By"
-          :labels="['Average Similarity', 'Maximum Similarity']"
+        <MetricSelector
+          title="Sort By"
           @selection-changed="(index) => (comparisonTableSortingMetric = index)"
         />
         <ComparisonsTable
@@ -86,7 +85,7 @@ import MetricType from '@/model/MetricType'
 import SearchBarComponent from '@/components/SearchBarComponent.vue'
 import TextInformation from '@/components/TextInformation.vue'
 import type { ComparisonListElement } from '@/model/ComparisonListElement'
-import OptionsSelector from '@/components/optionsSelectors/OptionsSelectorComponent.vue'
+import MetricSelector from '@/components/optionsSelectors/MetricSelector.vue'
 
 const overview = OverviewFactory.getOverview()
 
diff --git a/report-viewer/src/views/TestView.vue b/report-viewer/src/views/TestView.vue
new file mode 100644
index 000000000..ddd9f6380
--- /dev/null
+++ b/report-viewer/src/views/TestView.vue
@@ -0,0 +1,24 @@
+<template>
+  <div class="w-full grow flex items-center justify-center h-96">
+    <div class="border-1 border-red-500">
+      <MetricSelector />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import ToolTipComponent from '@/components/ToolTipComponent.vue'
+import MetricSelector from '@/components/optionsSelectors/MetricSelector.vue'
+import OptionsSelectorComponent from '@/components/optionsSelectors/OptionsSelectorComponent.vue'
+
+const label = [
+  {
+    displayValue: 'Test',
+    tooltip: 'This is a test'
+  },
+  {
+    displayValue: 'Test2',
+    tooltip: 'This is a test2'
+  }
+]
+</script>

From 97c1222bf0096e64998ecfcd793f75564b5d2360 Mon Sep 17 00:00:00 2001
From: Alex | Kronox <alexander_vogt@outlook.de>
Date: Sat, 29 Jul 2023 20:08:33 +0200
Subject: [PATCH 05/57] replace old tooltip

---
 .../src/components/ComparisonsTable.vue       | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/report-viewer/src/components/ComparisonsTable.vue b/report-viewer/src/components/ComparisonsTable.vue
index 400b67943..363d02b19 100644
--- a/report-viewer/src/components/ComparisonsTable.vue
+++ b/report-viewer/src/components/ComparisonsTable.vue
@@ -98,21 +98,23 @@
                   }"
                   class="w-full tect-center flex justify-center"
                 >
-                  <div class="group relative w-fit">
-                    {{ clusters?.[index].members?.length }}
-                    <FontAwesomeIcon
-                      :icon="['fas', 'user-group']"
-                      :style="{ color: clusterIconColors[index] }"
-                    />
-                    {{ ((clusters?.[index].averageSimilarity as number) * 100).toFixed(2) }}%
-                    <div
-                      class="hidden group-hover:flex absolute z-50 top-0 left-[-400px] text-sm h-full items-center text-white bg-gray-950 bg-opacity-90 px-2 rounded-sm tooltipArrow"
-                    >
-                      {{ clusters?.[index].members?.length }} submissions in cluster with average
-                      similarity of
+                  <ToolTipComponent class="w-fit" direction="left">
+                    <template #default>
+                      {{ clusters?.[index].members?.length }}
+                      <FontAwesomeIcon
+                        :icon="['fas', 'user-group']"
+                        :style="{ color: clusterIconColors[index] }"
+                      />
                       {{ ((clusters?.[index].averageSimilarity as number) * 100).toFixed(2) }}%
-                    </div>
-                  </div>
+                    </template>
+                    <template #tooltip>
+                      <p class="whitespace-nowrap text-sm">
+                        {{ clusters?.[index].members?.length }} submissions in cluster with average
+                        similarity of
+                        {{ ((clusters?.[index].averageSimilarity as number) * 100).toFixed(2) }}%
+                      </p>
+                    </template>
+                  </ToolTipComponent>
                 </RouterLink>
               </div>
             </div>
@@ -133,6 +135,7 @@ import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faUserGroup } from '@fortawesome/free-solid-svg-icons'
 import { generateColors } from '@/utils/ColorUtils'
+import ToolTipComponent from './ToolTipComponent.vue'
 
 library.add(faUserGroup)
 

From 2809704ef41dcf3dd47af5d91c62cc393313f9bf Mon Sep 17 00:00:00 2001
From: Alex | Kronox <alexander_vogt@outlook.de>
Date: Sun, 30 Jul 2023 11:18:25 +0200
Subject: [PATCH 06/57] more tooltips

---
 .../src/components/ComparisonsTable.vue       | 24 +++++++++++++++++--
 .../src/components/ToolTipComponent.vue       | 11 ++++-----
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/report-viewer/src/components/ComparisonsTable.vue b/report-viewer/src/components/ComparisonsTable.vue
index 363d02b19..502e9b395 100644
--- a/report-viewer/src/components/ComparisonsTable.vue
+++ b/report-viewer/src/components/ComparisonsTable.vue
@@ -11,8 +11,27 @@
         <div class="tableCellSimilarity !flex-col">
           <div>Similarity</div>
           <div class="flex flex-row w-full">
-            <div class="flex-1">Average</div>
-            <div class="flex-1">Maximum</div>
+            <ToolTipComponent class="flex-1">
+              <template #default>
+                <p class="w-full text-center">{{ metricToolTips[MetricType.AVERAGE].shortName }}</p>
+              </template>
+              <template #tooltip>
+                <p class="whitespace-pre text-sm">
+                  {{ metricToolTips[MetricType.AVERAGE].tooltip }}
+                </p>
+              </template>
+            </ToolTipComponent>
+
+            <ToolTipComponent class="flex-1">
+              <template #default>
+                <p class="w-full text-center">{{ metricToolTips[MetricType.MAXIMUM].shortName }}</p>
+              </template>
+              <template #tooltip>
+                <p class="whitespace-pre text-sm">
+                  {{ metricToolTips[MetricType.MAXIMUM].tooltip }}
+                </p>
+              </template>
+            </ToolTipComponent>
           </div>
         </div>
         <div class="tableCellCluster items-center" v-if="displayClusters">Cluster</div>
@@ -136,6 +155,7 @@ import { library } from '@fortawesome/fontawesome-svg-core'
 import { faUserGroup } from '@fortawesome/free-solid-svg-icons'
 import { generateColors } from '@/utils/ColorUtils'
 import ToolTipComponent from './ToolTipComponent.vue'
+import MetricType, { metricToolTips } from '@/model/MetricType'
 
 library.add(faUserGroup)
 
diff --git a/report-viewer/src/components/ToolTipComponent.vue b/report-viewer/src/components/ToolTipComponent.vue
index 32d302346..d7d34a0af 100644
--- a/report-viewer/src/components/ToolTipComponent.vue
+++ b/report-viewer/src/components/ToolTipComponent.vue
@@ -2,7 +2,7 @@
   <div class="relative inline-block group">
     <slot></slot>
     <div
-      class="absolute hidden group-hover:block bg-black bg-opacity-60 px-1 rounded-md text-white text-center z-10"
+      class="absolute hidden group-hover:block px-1 rounded-md text-white text-center z-10"
       :style="tooltipPosition"
     >
       <slot name="tooltip"></slot>
@@ -22,6 +22,8 @@ const props = defineProps({
   }
 })
 
+const opacity = 0.8
+
 const tooltipPosition = computed(() => {
   const style: StyleValue = {}
 
@@ -42,6 +44,7 @@ const tooltipPosition = computed(() => {
       style.top = '105%'
     }
   }
+  style.backgroundColor = `rgba(0,0,0,${opacity})`
 
   return style
 })
@@ -50,13 +53,9 @@ const arrowStyle = computed(() => {
   const style: StyleValue = {}
   style.content = ' '
 
-  function getBorderColor(current: String, other: String) {
-    return other == current ? 'rgba(0,0,0,0.6)' : 'transparent'
-  }
-
   style.borderColor = ''
   for (const dir of ['top', 'right', 'bottom', 'left']) {
-    style.borderColor += getBorderColor(dir, props.direction) + ' '
+    style.borderColor += dir == props.direction ? `rgba(0,0,0,${opacity}) ` : 'transparent '
   }
 
   if (props.direction == 'left' || props.direction == 'right') {

From 691b79c46ab2caf6cc9e9f07a638654b6ed79661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20Br=C3=B6del?= <moritz.broedel@gmail.com>
Date: Fri, 25 Aug 2023 14:04:54 +0200
Subject: [PATCH 07/57] Re-write/Fix antlr-utils

---
 .../de/jplag/antlr/AbstractAntlrListener.java | 198 +++++-------------
 .../antlr/AbstractAntlrParserAdapter.java     |  33 ++-
 .../java/de/jplag/antlr/AbstractVisitor.java  | 122 +++++++++++
 .../de/jplag/antlr/ContextTokenBuilder.java   |  53 -----
 .../jplag/antlr/ContextTokenBuilderType.java  |  10 -
 .../java/de/jplag/antlr/ContextVisitor.java   |  98 +++++++++
 .../antlr/InternalListenerException.java      |  15 --
 .../java/de/jplag/antlr/RangeBuilder.java     | 112 ----------
 .../de/jplag/antlr/TerminalTokenBuilder.java  |  29 ---
 .../java/de/jplag/antlr/TerminalVisitor.java  |  21 ++
 .../java/de/jplag/antlr/TokenBuilder.java     | 140 -------------
 .../java/de/jplag/antlr/TokenCollector.java   |  56 ++++-
 .../antlr/testLanguage/TestListener.java      |  19 +-
 .../main/java/de/jplag/cpp2/CPPListener.java  |  80 +++----
 .../java/de/jplag/kotlin/KotlinListener.java  |  86 ++++----
 15 files changed, 452 insertions(+), 620 deletions(-)
 create mode 100644 language-antlr-utils/src/main/java/de/jplag/antlr/AbstractVisitor.java
 delete mode 100644 language-antlr-utils/src/main/java/de/jplag/antlr/ContextTokenBuilder.java
 delete mode 100644 language-antlr-utils/src/main/java/de/jplag/antlr/ContextTokenBuilderType.java
 create mode 100644 language-antlr-utils/src/main/java/de/jplag/antlr/ContextVisitor.java
 delete mode 100644 language-antlr-utils/src/main/java/de/jplag/antlr/InternalListenerException.java
 delete mode 100644 language-antlr-utils/src/main/java/de/jplag/antlr/RangeBuilder.java
 delete mode 100644 language-antlr-utils/src/main/java/de/jplag/antlr/TerminalTokenBuilder.java
 create mode 100644 language-antlr-utils/src/main/java/de/jplag/antlr/TerminalVisitor.java
 delete mode 100644 language-antlr-utils/src/main/java/de/jplag/antlr/TokenBuilder.java

diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java
index b8a38cd28..19c1b00ad 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java
@@ -13,7 +13,6 @@
 import org.antlr.v4.runtime.tree.ParseTreeListener;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
-import de.jplag.TokenType;
 import de.jplag.semantics.VariableRegistry;
 
 /**
@@ -23,15 +22,11 @@
  */
 @SuppressWarnings("unused")
 public class AbstractAntlrListener implements ParseTreeListener {
-    private final List<ContextTokenBuilder<ParserRuleContext>> startMappings;
-    private final List<ContextTokenBuilder<ParserRuleContext>> endMappings;
-
-    private final List<TerminalTokenBuilder> terminalMapping;
-
     private final TokenCollector collector;
     private final File currentFile;
-
-    private VariableRegistry variableRegistry;
+    private final List<ContextVisitor<ParserRuleContext>> contextVisitors;
+    private final List<TerminalVisitor> terminalVisitors;
+    protected final VariableRegistry variableRegistry;
 
     /**
      * New instance
@@ -42,15 +37,9 @@ public class AbstractAntlrListener implements ParseTreeListener {
     public AbstractAntlrListener(TokenCollector collector, File currentFile, boolean extractsSemantics) {
         this.collector = collector;
         this.currentFile = currentFile;
-
-        this.startMappings = new ArrayList<>();
-        this.endMappings = new ArrayList<>();
-
-        this.terminalMapping = new ArrayList<>();
-
-        if (extractsSemantics) {
-            this.variableRegistry = new VariableRegistry();
-        }
+        this.contextVisitors = new ArrayList<>();
+        this.terminalVisitors = new ArrayList<>();
+        this.variableRegistry = new VariableRegistry();
     }
 
     /**
@@ -62,157 +51,70 @@ public AbstractAntlrListener(TokenCollector collector, File currentFile) {
         this(collector, currentFile, false);
     }
 
-    @Override
-    public void visitTerminal(TerminalNode terminalNode) {
-        this.terminalMapping.stream().filter(mapping -> mapping.matches(terminalNode.getSymbol()))
-                .forEach(mapping -> mapping.createToken(terminalNode.getSymbol(), variableRegistry));
-    }
-
-    @Override
-    public void visitErrorNode(ErrorNode errorNode) {
-        // does nothing, because we do not handle error nodes right now.
-    }
-
-    @Override
-    public void enterEveryRule(ParserRuleContext rule) {
-        this.startMappings.stream().filter(mapping -> mapping.matches(rule)).forEach(mapping -> mapping.createToken(rule, variableRegistry));
-    }
-
-    @Override
-    public void exitEveryRule(ParserRuleContext rule) {
-        this.endMappings.stream().filter(mapping -> mapping.matches(rule)).forEach(mapping -> mapping.createToken(rule, variableRegistry));
-    }
-
     /**
-     * Creates a mapping using the start token from antlr as the location
-     * @param antlrType The antlr context type
-     * @param jplagType The Jplag token type
-     * @param <T> The type of {@link ParserRuleContext}
-     * @return The builder for the token
-     */
-    protected <T extends ParserRuleContext> ContextTokenBuilder<T> mapEnter(Class<T> antlrType, TokenType jplagType) {
-        return this.mapEnter(antlrType, jplagType, it -> true);
-    }
-
-    /**
-     * Creates a mapping using the start token from antlr as the location
-     * @param antlrType The antlr context type
-     * @param jplagType The Jplag token type
-     * @param condition The condition under which the mapping applies
-     * @param <T> The type of {@link ParserRuleContext}
-     * @return The builder for the token
+     * Visit the given node.
+     * @param antlrType The antlr type of the node.
+     * @param condition An additional condition for the visit.
+     * @return A visitor for the node.
+     * @param <T> The class of the node.
      */
     @SuppressWarnings("unchecked")
-    protected <T extends ParserRuleContext> ContextTokenBuilder<T> mapEnter(Class<T> antlrType, TokenType jplagType, Predicate<T> condition) {
-        ContextTokenBuilder<T> builder = initTypeBuilder(antlrType, jplagType, condition, ContextTokenBuilderType.START);
-        this.startMappings.add((ContextTokenBuilder<ParserRuleContext>) builder);
-        return builder;
+    public <T extends ParserRuleContext> ContextVisitor<T> visit(Class<T> antlrType, Predicate<T> condition) {
+        ContextVisitor<T> visitor = new ContextVisitor<>(condition.and(rule -> rule.getClass() == antlrType), collector, variableRegistry);
+        contextVisitors.add((ContextVisitor<ParserRuleContext>) visitor);
+        return visitor;
     }
 
     /**
-     * Creates a mapping using the stop token from antlr as the location
-     * @param antlrType The antlr context type
-     * @param jplagType The Jplag token type
-     * @param <T> The type of {@link ParserRuleContext}
-     * @return The builder for the token
+     * Visit the given node.
+     * @param antlrType The antlr type of the node.
+     * @return A visitor for the node.
+     * @param <T> The class of the node.
      */
-    protected <T extends ParserRuleContext> ContextTokenBuilder<T> mapExit(Class<T> antlrType, TokenType jplagType) {
-        return this.mapExit(antlrType, jplagType, it -> true);
+    public <T extends ParserRuleContext> ContextVisitor<T> visit(Class<T> antlrType) {
+        return visit(antlrType, ignore -> true);
     }
 
     /**
-     * Creates a mapping using the stop token from antlr as the location
-     * @param antlrType The antlr context type
-     * @param jplagType The Jplag token type
-     * @param condition The condition under which the mapping applies
-     * @param <T> The type of {@link ParserRuleContext}
-     * @return The builder for the token
+     * Visit the given terminal.
+     * @param terminalType The type of the terminal.
+     * @param condition An additional condition for the visit.
+     * @return A visitor for the node.
      */
-    @SuppressWarnings("unchecked")
-    protected <T extends ParserRuleContext> ContextTokenBuilder<T> mapExit(Class<T> antlrType, TokenType jplagType, Predicate<T> condition) {
-        ContextTokenBuilder<T> builder = initTypeBuilder(antlrType, jplagType, condition, ContextTokenBuilderType.STOP);
-        this.endMappings.add((ContextTokenBuilder<ParserRuleContext>) builder);
-        return builder;
+    public TerminalVisitor visit(int terminalType, Predicate<org.antlr.v4.runtime.Token> condition) {
+        TerminalVisitor visitor = new TerminalVisitor(condition.and(rule -> rule.getType() == terminalType), collector, variableRegistry);
+        terminalVisitors.add(visitor);
+        return visitor;
     }
 
     /**
-     * Creates a mapping using the beginning of the start token as the start location and the distance from the start to the
-     * stop token as the length
-     * @param antlrType The antlr context type
-     * @param jplagType The Jplag token type
-     * @param <T> The type of {@link ParserRuleContext}
-     * @return The builder for the token
+     * Visit the given terminal.
+     * @param terminalType The type of the terminal.
+     * @return A visitor for the node.
      */
-    protected <T extends ParserRuleContext> ContextTokenBuilder<T> mapRange(Class<T> antlrType, TokenType jplagType) {
-        return this.mapRange(antlrType, jplagType, it -> true);
-    }
-
-    /**
-     * Creates a mapping using the beginning of the start token as the start location and the distance from the start to the
-     * stop token as the length
-     * @param antlrType The antlr context type
-     * @param jplagType The Jplag token type
-     * @param condition The condition under which the mapping applies
-     * @param <T> The type of {@link ParserRuleContext}
-     * @return The builder for the token
-     */
-    @SuppressWarnings("unchecked")
-    protected <T extends ParserRuleContext> ContextTokenBuilder<T> mapRange(Class<T> antlrType, TokenType jplagType, Predicate<T> condition) {
-        ContextTokenBuilder<T> builder = initTypeBuilder(antlrType, jplagType, condition, ContextTokenBuilderType.RANGE);
-        this.startMappings.add((ContextTokenBuilder<ParserRuleContext>) builder);
-        return builder;
+    public TerminalVisitor visit(int terminalType) {
+        return visit(terminalType, ignore -> true);
     }
 
-    /**
-     * Creates a start mapping from antlrType to startType and a stop mapping from antlrType to stopType.
-     * @param antlrType The antlr token type
-     * @param startType The token type for the start mapping
-     * @param stopType The token type for the stop mapping
-     * @param <T> The type of {@link ParserRuleContext}
-     * @return The builder for the token
-     */
-    protected <T extends ParserRuleContext> RangeBuilder<T> mapEnterExit(Class<T> antlrType, TokenType startType, TokenType stopType) {
-        return mapEnterExit(antlrType, startType, stopType, it -> true);
+    @Override
+    public void visitTerminal(TerminalNode terminalNode) {
+        this.terminalVisitors.stream().filter(visitor -> visitor.matches(terminalNode.getSymbol()))
+                .forEach(visitor -> visitor.enter(terminalNode.getSymbol()));
     }
 
-    /**
-     * Creates a start mapping from antlrType to startType and a stop mapping from antlrType to stopType.
-     * @param antlrType The antlr token type
-     * @param startType The token type for the start mapping
-     * @param stopType The token type for the stop mapping
-     * @param condition The condition under which the mapping applies
-     * @param <T> The type of {@link ParserRuleContext}
-     * @return The builder for the token
-     */
-    protected <T extends ParserRuleContext> RangeBuilder<T> mapEnterExit(Class<T> antlrType, TokenType startType, TokenType stopType,
-            Predicate<T> condition) {
-        ContextTokenBuilder<T> start = this.mapEnter(antlrType, startType, condition);
-        ContextTokenBuilder<T> end = this.mapExit(antlrType, stopType, condition);
-        return new RangeBuilder<>(start, end);
+    @Override
+    public void visitErrorNode(ErrorNode errorNode) {
+        // does nothing, because we do not handle error nodes right now.
     }
 
-    /**
-     * Creates a mapping for terminal tokens
-     * @param terminalType The type of the terminal node
-     * @param jplagType The jplag token type
-     * @return The builder for the token
-     */
-    protected TerminalTokenBuilder mapTerminal(int terminalType, TokenType jplagType) {
-        return this.mapTerminal(terminalType, jplagType, it -> true);
+    @Override
+    public void enterEveryRule(ParserRuleContext rule) {
+        this.contextVisitors.stream().filter(visitor -> visitor.matches(rule)).forEach(visitor -> visitor.enter(rule));
     }
 
-    /**
-     * Creates a mapping for terminal tokens
-     * @param terminalType The type of the terminal node
-     * @param jplagType The jplag token type
-     * @param condition The condition under which the mapping applies
-     * @return The builder for the token
-     */
-    protected TerminalTokenBuilder mapTerminal(int terminalType, TokenType jplagType, Predicate<org.antlr.v4.runtime.Token> condition) {
-        TerminalTokenBuilder builder = new TerminalTokenBuilder(jplagType, token -> token.getType() == terminalType && condition.test(token),
-                this.collector, this.currentFile);
-        this.terminalMapping.add(builder);
-        return builder;
+    @Override
+    public void exitEveryRule(ParserRuleContext rule) {
+        this.contextVisitors.stream().filter(visitor -> visitor.matches(rule)).forEach(visitor -> visitor.exit(rule));
     }
 
     /**
@@ -280,10 +182,4 @@ protected final <T extends ParserRuleContext> T getDescendant(ParserRuleContext
         }
         return null;
     }
-
-    private <T extends ParserRuleContext> ContextTokenBuilder<T> initTypeBuilder(Class<T> antlrType, TokenType jplagType, Predicate<T> condition,
-            ContextTokenBuilderType type) {
-        return new ContextTokenBuilder<>(jplagType, rule -> rule.getClass() == antlrType && condition.test(antlrType.cast(rule)), this.collector,
-                this.currentFile, type);
-    }
 }
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrParserAdapter.java b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrParserAdapter.java
index c5cdc478f..c2a09fc8e 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrParserAdapter.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrParserAdapter.java
@@ -3,6 +3,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.Reader;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
@@ -25,6 +26,25 @@
  * @param <T> The type of the antlr parser
  */
 public abstract class AbstractAntlrParserAdapter<T extends Parser> extends AbstractParser {
+
+    private final boolean extractsSemantics;
+
+    /**
+     * New instance
+     * @param extractsSemantics If true, the listener will extract semantics along with every token
+     */
+    public AbstractAntlrParserAdapter(boolean extractsSemantics) {
+        super();
+        this.extractsSemantics = extractsSemantics;
+    }
+
+    /**
+     * New instance
+     */
+    public AbstractAntlrParserAdapter() {
+        this(false);
+    }
+
     /**
      * Parsers the set of files
      * @param files The files
@@ -32,12 +52,15 @@ public abstract class AbstractAntlrParserAdapter<T extends Parser> extends Abstr
      * @throws ParsingException If anything goes wrong
      */
     public List<Token> parse(Set<File> files) throws ParsingException {
-        TokenCollector collector = new TokenCollector();
-
-        for (File file : files) {
+        List<File> filesList = new ArrayList<>(files);
+        File firstFile = filesList.remove(0);
+        TokenCollector collector = new TokenCollector(extractsSemantics, firstFile);
+        parseFile(firstFile, collector);
+        for (File file : filesList) {
+            collector.addFileEndToken(file);  // takes the NEXT file
             parseFile(file, collector);
         }
-
+        collector.addFileEndToken(null);
         return collector.getTokens();
     }
 
@@ -54,8 +77,6 @@ private void parseFile(File file, TokenCollector collector) throws ParsingExcept
             for (ParseTree child : entryContext.children) {
                 treeWalker.walk(listener, child);
             }
-
-            collector.addToken(Token.fileEnd(file));
         } catch (IOException exception) {
             throw new ParsingException(file, exception.getMessage(), exception);
         }
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractVisitor.java b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractVisitor.java
new file mode 100644
index 000000000..66621452a
--- /dev/null
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractVisitor.java
@@ -0,0 +1,122 @@
+package de.jplag.antlr;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+import org.antlr.v4.runtime.Token;
+
+import de.jplag.TokenType;
+import de.jplag.semantics.CodeSemantics;
+import de.jplag.semantics.VariableRegistry;
+
+/**
+ * The abstract visitor.
+ * @param <T> The type of the visited entity.
+ */
+public abstract class AbstractVisitor<T> {
+    private final Predicate<T> condition;
+    private final List<Consumer<T>> entryHandlers;
+    private final TokenCollector tokenCollector;
+    private Function<T, CodeSemantics> semanticsSupplier;
+    VariableRegistry variableRegistry;  // used in ContextVisitor
+
+    /**
+     * @param condition The condition for the visit.
+     * @param tokenCollector The used token collector.
+     * @param variableRegistry The used variable registry.
+     */
+    AbstractVisitor(Predicate<T> condition, TokenCollector tokenCollector, VariableRegistry variableRegistry) {
+        this.condition = condition;
+        this.tokenCollector = tokenCollector;
+        this.entryHandlers = new ArrayList<>();
+        this.variableRegistry = variableRegistry;
+    }
+
+    /**
+     * Add an action the visitor runs upon entering the entity.
+     * @param handler The action, takes the entity as parameter.
+     * @return Self
+     */
+    public AbstractVisitor<T> onEnter(Consumer<T> handler) {
+        this.entryHandlers.add(handler);
+        return this;
+    }
+
+    /**
+     * Tell the visitor that it should generate a token upon entering the entity. Should only be invoked once per visitor.
+     * @param tokenType The type of the token.
+     * @return Self
+     */
+    public AbstractVisitor<T> mapEnter(TokenType tokenType) {
+        map(entryHandlers, tokenType, this::extractEnterToken);
+        return this;
+    }
+
+    /**
+     * Tell the visitor that it should generate a token upon entering the entity. Should only be invoked once per visitor.
+     * Alias for {@link #mapEnter(TokenType)}.
+     * @param tokenType The type of the token.
+     * @return Self
+     */
+    public AbstractVisitor<T> map(TokenType tokenType) {
+        mapEnter(tokenType);
+        return this;
+    }
+
+    /**
+     * Tell the visitor that if it generates a token upon entering the entity, it should have semantics. If it doesn't
+     * generate a token, the semantics are discarded. This is not checked and does not lead to a warning.
+     * @param semanticsSupplier A function that takes the entity and returns the semantics.
+     * @return Self
+     */
+    public AbstractVisitor<T> withSemantics(Function<T, CodeSemantics> semanticsSupplier) {
+        this.semanticsSupplier = semanticsSupplier;
+        return this;
+    }
+
+    /**
+     * Tell the visitor that if it generates a token upon entering the entity, it should have semantics. If it doesn't
+     * generate a token, the semantics are discarded. This is not checked and does not lead to a warning.
+     * @param semanticsSupplier A function that returns the semantics.
+     * @return Self
+     */
+    public AbstractVisitor<T> withSemantics(Supplier<CodeSemantics> semanticsSupplier) {
+        this.semanticsSupplier = ignore -> semanticsSupplier.get();
+        return this;
+    }
+
+    /**
+     * Tell the visitor that if it generates a token upon entering the entity, it should have semantics of type control. If
+     * it doesn't generate a token, the semantics are discarded. This is not checked and does not lead to a warning.
+     * @return Self
+     */
+    public AbstractVisitor<T> withControlSemantics() {
+        this.semanticsSupplier = ignore -> CodeSemantics.createControl();
+        return this;
+    }
+
+    /**
+     * @param entity The entity to check.
+     * @return Whether the visitor should be visited.
+     */
+    boolean matches(T entity) {
+        return this.condition.test(entity);
+    }
+
+    void enter(T entity) {
+        entryHandlers.forEach(handler -> handler.accept(entity));
+    }
+
+    void exit(T entity) {
+    }
+
+    void map(List<Consumer<T>> handlers, TokenType tokenType, Function<T, Token> extractToken) {
+        handlers.add(0, value -> tokenCollector.addToken(tokenType, semanticsSupplier, value, extractToken, variableRegistry));
+    }
+
+    abstract Token extractEnterToken(T entity);
+}
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/ContextTokenBuilder.java b/language-antlr-utils/src/main/java/de/jplag/antlr/ContextTokenBuilder.java
deleted file mode 100644
index c48ffc678..000000000
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/ContextTokenBuilder.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package de.jplag.antlr;
-
-import java.io.File;
-import java.util.function.Function;
-import java.util.function.Predicate;
-
-import org.antlr.v4.runtime.ParserRuleContext;
-
-import de.jplag.TokenType;
-import de.jplag.semantics.VariableScope;
-
-/**
- * Builds tokens for {@link ParserRuleContext}s.
- * @param <T> The type of context
- */
-public class ContextTokenBuilder<T extends ParserRuleContext> extends TokenBuilder<T> {
-    private final ContextTokenBuilderType type;
-
-    ContextTokenBuilder(TokenType tokenType, Predicate<T> condition, TokenCollector collector, File file, ContextTokenBuilderType type) {
-        super(tokenType, condition, collector, file);
-        this.type = type;
-    }
-
-    /**
-     * Adds this builder as a variable to the variable registry
-     * @param scope The scope of the variable
-     * @param mutable true, if the variable is mutable
-     * @param nameGetter The getter for the name, from the current {@link ParserRuleContext}
-     * @return Self
-     */
-    public ContextTokenBuilder<T> addAsVariable(VariableScope scope, boolean mutable, Function<T, String> nameGetter) {
-        addSemanticsHandler((registry, rule) -> registry.registerVariable(nameGetter.apply(rule), scope, mutable));
-        return this;
-    }
-
-    @Override
-    protected org.antlr.v4.runtime.Token getAntlrToken(T antlrContent) {
-        if (this.type != ContextTokenBuilderType.STOP) {
-            return antlrContent.getStart();
-        } else {
-            return antlrContent.getStop();
-        }
-    }
-
-    @Override
-    protected int getLength(T antlrContent) {
-        if (this.type != ContextTokenBuilderType.RANGE) {
-            return super.getLength(antlrContent);
-        } else {
-            return antlrContent.getStop().getStopIndex() - antlrContent.getStart().getStartIndex() + 1;
-        }
-    }
-}
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/ContextTokenBuilderType.java b/language-antlr-utils/src/main/java/de/jplag/antlr/ContextTokenBuilderType.java
deleted file mode 100644
index ab7d9231c..000000000
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/ContextTokenBuilderType.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package de.jplag.antlr;
-
-/**
- * The types of context token builder. Either start, stop or range. Should only be used internally.
- */
-enum ContextTokenBuilderType {
-    START,
-    STOP,
-    RANGE
-}
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/ContextVisitor.java b/language-antlr-utils/src/main/java/de/jplag/antlr/ContextVisitor.java
new file mode 100644
index 000000000..1d2350f28
--- /dev/null
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/ContextVisitor.java
@@ -0,0 +1,98 @@
+package de.jplag.antlr;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.Token;
+
+import de.jplag.TokenType;
+import de.jplag.semantics.VariableRegistry;
+
+/**
+ * The visitor for nodes, or contexts.
+ * @param <T> The antlr type of the node.
+ */
+public class ContextVisitor<T extends ParserRuleContext> extends AbstractVisitor<T> {
+    private final List<Consumer<T>> exitHandlers;
+
+    ContextVisitor(Predicate<T> condition, TokenCollector tokenCollector, VariableRegistry variableRegistry) {
+        super(condition, tokenCollector, variableRegistry);
+        this.exitHandlers = new ArrayList<>();
+    }
+
+    /**
+     * Add an action the visitor runs upon exiting the entity.
+     * @param handler The action, takes the entity as parameter.
+     * @return Self
+     */
+    public AbstractVisitor<T> onExit(Consumer<T> handler) {
+        this.exitHandlers.add(handler);
+        return this;
+    }
+
+    /**
+     * Tell the visitor that it should generate a token upon exiting the entity. Should only be invoked once per visitor.
+     * @param tokenType The type of the token.
+     * @return Self
+     */
+    public ContextVisitor<T> mapExit(TokenType tokenType) {
+        map(exitHandlers, tokenType, ParserRuleContext::getStop);
+        return this;
+    }
+
+    /**
+     * Tell the visitor that it should generate a token upon entering and one upon exiting the entity. Should only be
+     * invoked once per visitor.
+     * @param enterTokenType The type of the token generated on enter.
+     * @param exitTokenType The type of the token generated on exit.
+     * @return Self
+     */
+    public ContextVisitor<T> mapEnterExit(TokenType enterTokenType, TokenType exitTokenType) {
+        mapEnter(enterTokenType);
+        mapExit(exitTokenType);
+        return this;
+    }
+
+    /**
+     * Tell the visitor that it should generate a token upon entering and one upon exiting the entity. Should only be
+     * invoked once per visitor. Alias for {@link #mapEnterExit(TokenType, TokenType)}.
+     * @param enterTokenType The type of the token generated on enter.
+     * @param exitTokenType The type of the token generated on exit.
+     * @return Self
+     */
+    public ContextVisitor<T> map(TokenType enterTokenType, TokenType exitTokenType) {
+        mapEnterExit(enterTokenType, exitTokenType);
+        return this;
+    }
+
+    /**
+     * Tell the visitor that the entity represents a local scope.
+     * @return Self
+     */
+    public ContextVisitor<T> addLocalScope() {
+        onEnter(ignore -> variableRegistry.enterLocalScope());
+        onExit(ignore -> variableRegistry.exitLocalScope());
+        return this;
+    }
+
+    /**
+     * Tell the visitor that the entity represents a class scope.
+     * @return Self
+     */
+    public ContextVisitor<T> addClassScope() {
+        onEnter(ignore -> variableRegistry.enterClass());
+        onExit(ignore -> variableRegistry.exitClass());
+        return this;
+    }
+
+    void exit(T entity) {
+        exitHandlers.forEach(handler -> handler.accept(entity));
+    }
+
+    Token extractEnterToken(T entity) {
+        return entity.getStart();
+    }
+}
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/InternalListenerException.java b/language-antlr-utils/src/main/java/de/jplag/antlr/InternalListenerException.java
deleted file mode 100644
index 70422ee29..000000000
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/InternalListenerException.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package de.jplag.antlr;
-
-/**
- * Exception type used internally within the antlr utils. Has to be a {@link RuntimeException}, because it is thrown
- * within the antlr listener methods. Should not be thrown outside the antlr utils.
- */
-public class InternalListenerException extends RuntimeException {
-    /**
-     * New instance
-     * @param message The message of the exception
-     */
-    public InternalListenerException(String message) {
-        super(message);
-    }
-}
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/RangeBuilder.java b/language-antlr-utils/src/main/java/de/jplag/antlr/RangeBuilder.java
deleted file mode 100644
index ea84cf3bd..000000000
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/RangeBuilder.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package de.jplag.antlr;
-
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-import org.antlr.v4.runtime.ParserRuleContext;
-
-import de.jplag.semantics.CodeSemantics;
-import de.jplag.semantics.VariableRegistry;
-import de.jplag.semantics.VariableScope;
-
-/**
- * Builder for semantics on range mappings
- * @param <T> The type of rule
- */
-@SuppressWarnings("unused")
-public class RangeBuilder<T extends ParserRuleContext> {
-    private final ContextTokenBuilder<T> start;
-    private final ContextTokenBuilder<T> end;
-
-    /**
-     * New instance
-     * @param start The builder for the start token
-     * @param end The builder for the end token
-     */
-    RangeBuilder(ContextTokenBuilder<T> start, ContextTokenBuilder<T> end) {
-        this.start = start;
-        this.end = end;
-    }
-
-    /**
-     * Adds a class context to the variable registry
-     * @return Self
-     */
-    public RangeBuilder<T> addClassContext() {
-        this.start.addSemanticsHandler(VariableRegistry::enterClass);
-        this.end.addSemanticsHandler(VariableRegistry::exitClass);
-        return this;
-    }
-
-    /**
-     * Adds a local scope to the variable registry
-     * @return Self
-     */
-    public RangeBuilder<T> addLocalScope() {
-        this.start.addSemanticsHandler(VariableRegistry::enterLocalScope);
-        this.end.addSemanticsHandler(VariableRegistry::exitLocalScope);
-        return this;
-    }
-
-    /**
-     * Adds a semantics handler to the start token builder
-     * @param handler The handler
-     * @return Self
-     */
-    public RangeBuilder<T> addStartSemanticHandler(Consumer<VariableRegistry> handler) {
-        this.start.addSemanticsHandler(handler);
-        return this;
-    }
-
-    /**
-     * Adds a semantic handler to the end token builder
-     * @param handler The handler
-     * @return Self
-     */
-    public RangeBuilder<T> addEndSemanticHandler(Consumer<VariableRegistry> handler) {
-        this.end.addSemanticsHandler(handler);
-        return this;
-    }
-
-    /**
-     * Adds the start token as a variable when it is extracted
-     * @param scope The scope for the variable
-     * @param mutable true if the variable is mutable
-     * @param nameGetter The getter for the name
-     * @return Self
-     */
-    public RangeBuilder<T> addAsVariableOnStart(VariableScope scope, boolean mutable, Function<T, String> nameGetter) {
-        this.start.addAsVariable(scope, mutable, nameGetter);
-        return this;
-    }
-
-    /**
-     * Sets the given semantic for the start token
-     * @param semantics The semantic
-     * @return Self
-     */
-    public RangeBuilder<T> withStartSemantics(CodeSemantics semantics) {
-        this.start.withSemantics(semantics);
-        return this;
-    }
-
-    /**
-     * Sets the given semantic for the end token
-     * @param semantics The semantic
-     * @return Self
-     */
-    public RangeBuilder<T> withEndSemantics(CodeSemantics semantics) {
-        this.end.withSemantics(semantics);
-        return this;
-    }
-
-    /**
-     * Sets a control semantics for both tokens
-     * @return Self
-     */
-    public RangeBuilder<T> withControlSemantics() {
-        this.start.withControlSemantics();
-        this.end.withControlSemantics();
-        return this;
-    }
-}
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/TerminalTokenBuilder.java b/language-antlr-utils/src/main/java/de/jplag/antlr/TerminalTokenBuilder.java
deleted file mode 100644
index 3f074e6ad..000000000
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/TerminalTokenBuilder.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package de.jplag.antlr;
-
-import java.io.File;
-import java.util.function.Predicate;
-
-import org.antlr.v4.runtime.Token;
-
-import de.jplag.TokenType;
-
-/**
- * Builds tokens from terminal antlr nodes
- */
-public class TerminalTokenBuilder extends TokenBuilder<Token> {
-    /**
-     * New instance
-     * @param tokenType The token type
-     * @param condition The condition
-     * @param collector The token collector for the listener
-     * @param file The file the listener is for
-     */
-    TerminalTokenBuilder(TokenType tokenType, Predicate<Token> condition, TokenCollector collector, File file) {
-        super(tokenType, condition, collector, file);
-    }
-
-    @Override
-    protected Token getAntlrToken(Token antlrContent) {
-        return antlrContent;
-    }
-}
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/TerminalVisitor.java b/language-antlr-utils/src/main/java/de/jplag/antlr/TerminalVisitor.java
new file mode 100644
index 000000000..e63cbd9b8
--- /dev/null
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/TerminalVisitor.java
@@ -0,0 +1,21 @@
+package de.jplag.antlr;
+
+import java.util.function.Predicate;
+
+import org.antlr.v4.runtime.Token;
+
+import de.jplag.semantics.VariableRegistry;
+
+/**
+ * The visitor for terminals.
+ */
+public class TerminalVisitor extends AbstractVisitor<Token> {
+
+    TerminalVisitor(Predicate<org.antlr.v4.runtime.Token> condition, TokenCollector tokenCollector, VariableRegistry variableRegistry) {
+        super(condition, tokenCollector, variableRegistry);
+    }
+
+    Token extractEnterToken(Token token) {
+        return token;
+    }
+}
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/TokenBuilder.java b/language-antlr-utils/src/main/java/de/jplag/antlr/TokenBuilder.java
deleted file mode 100644
index 08e393ef7..000000000
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/TokenBuilder.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package de.jplag.antlr;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.*;
-import java.util.logging.Logger;
-
-import de.jplag.Token;
-import de.jplag.TokenType;
-import de.jplag.semantics.CodeSemantics;
-import de.jplag.semantics.VariableRegistry;
-
-/**
- * Handles the extraction of tokens. Contains information on the appropriate antlr types, the conditions under which the
- * token should be extracted and semantics information.
- * @param <T> The antlr type being mapped
- */
-public abstract class TokenBuilder<T> {
-    private static final Logger logger = Logger.getLogger(TokenBuilder.class.getName());
-    private static final String UNEXPECTED_SEMANTICS = "The listener %s indicates, it does not extract semantics. But the token (%s) has semantics information";
-    private static final String MISSING_SEMANTICS = "Tokens should contain semantics, but none were supplied";
-
-    private final Predicate<T> condition;
-    protected final TokenType tokenType;
-
-    private Function<T, CodeSemantics> semanticsSupplier = null;
-    private final List<BiConsumer<VariableRegistry, T>> semanticsHandler;
-
-    protected final TokenCollector tokenCollector;
-    protected final File file;
-
-    /**
-     * New instance
-     * @param tokenType The token type
-     * @param condition The condition
-     * @param collector The token collector for the listener
-     * @param file The file the listener is for
-     */
-    TokenBuilder(TokenType tokenType, Predicate<T> condition, TokenCollector collector, File file) {
-        this.condition = condition;
-        this.tokenType = tokenType;
-        this.tokenCollector = collector;
-        this.file = file;
-
-        this.semanticsHandler = new ArrayList<>();
-    }
-
-    /**
-     * Checks if the token should be extracted for this node.
-     * @param value The node to check
-     * @return true, if the token should be extracted
-     */
-    boolean matches(T value) {
-        return this.condition.test(value);
-    }
-
-    /**
-     * Sets the given semantics for the token
-     * @param semantics The semantics
-     * @return Self
-     */
-    public TokenBuilder<T> withSemantics(CodeSemantics semantics) {
-        this.semanticsSupplier = ignore -> semantics;
-        return this;
-    }
-
-    /**
-     * Uses the given function to build the token semantics from the antlr node
-     * @param function The function
-     * @return Self
-     */
-    public TokenBuilder<T> withSemantics(Function<T, CodeSemantics> function) {
-        this.semanticsSupplier = function;
-        return this;
-    }
-
-    /**
-     * Sets control semantics for the token
-     * @return Self
-     */
-    public TokenBuilder<T> withControlSemantics() {
-        withSemantics(CodeSemantics.createControl());
-        return this;
-    }
-
-    /**
-     * Adds a semantics handler to this builder. This can be used to perform additional operation like calling methods in
-     * the {@link de.jplag.semantics.VariableRegistry}.
-     * @param handler The handler function
-     * @return Self
-     */
-    public TokenBuilder<T> addSemanticsHandler(Consumer<VariableRegistry> handler) {
-        this.semanticsHandler.add((semantics, rule) -> handler.accept(semantics));
-        return this;
-    }
-
-    /**
-     * Adds a semantics handler, that can perform additional operations required for semantics using the Semantics context
-     * objects and the antlr node.
-     * @param handler The handler
-     * @return Self
-     */
-    public TokenBuilder<T> addSemanticsHandler(BiConsumer<VariableRegistry, T> handler) {
-        this.semanticsHandler.add(handler);
-        return this;
-    }
-
-    void createToken(T antlrContent, VariableRegistry semantics) {
-        org.antlr.v4.runtime.Token antlrToken = getAntlrToken(antlrContent);
-
-        int line = antlrToken.getLine();
-        int column = antlrToken.getCharPositionInLine() + 1;
-        int length = getLength(antlrContent);
-
-        Token token;
-        if (semantics != null) {
-            if (semanticsSupplier == null) {
-                throw new IllegalStateException(MISSING_SEMANTICS);
-            }
-
-            this.semanticsHandler.forEach(it -> it.accept(semantics, antlrContent));
-            token = new Token(this.tokenType, this.file, line, column, length, semanticsSupplier.apply(antlrContent));
-        } else {
-            if (semanticsSupplier != null) {
-                logger.warning(() -> String.format(UNEXPECTED_SEMANTICS, this.getClass().getName(), this.tokenType.getDescription()));
-            }
-
-            token = new Token(this.tokenType, this.file, line, column, length);
-        }
-
-        this.tokenCollector.addToken(token);
-    }
-
-    protected abstract org.antlr.v4.runtime.Token getAntlrToken(T antlrContent);
-
-    protected int getLength(T antlrContent) {
-        return getAntlrToken(antlrContent).getText().length();
-    }
-}
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/TokenCollector.java b/language-antlr-utils/src/main/java/de/jplag/antlr/TokenCollector.java
index 30ab0ce78..a56b8f35a 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/TokenCollector.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/TokenCollector.java
@@ -1,36 +1,74 @@
 package de.jplag.antlr;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.function.Function;
+import java.util.logging.Logger;
 
 import de.jplag.Token;
+import de.jplag.TokenType;
+import de.jplag.semantics.CodeSemantics;
+import de.jplag.semantics.VariableRegistry;
 
 /**
  * Collects the tokens during parsing.
  */
 public class TokenCollector {
+    private static final Logger logger = Logger.getLogger(TokenCollector.class.getName());
     private final List<Token> collected;
+    private final boolean extractsSemantics;
+    private File file;
 
     /**
-     * New instance
+     * @param extractsSemantics If semantics are extracted
      */
-    public TokenCollector() {
+    TokenCollector(boolean extractsSemantics, File initialFile) {
         this.collected = new ArrayList<>();
+        this.extractsSemantics = extractsSemantics;
+        this.file = initialFile;
     }
 
     /**
-     * Adds a token to the collector
-     * @param token The token to add
+     * @return All collected tokens
      */
-    public void addToken(Token token) {
-        this.collected.add(token);
+    List<Token> getTokens() {
+        return Collections.unmodifiableList(this.collected);
+    }
+
+    <T> void addToken(TokenType jplagType, Function<T, CodeSemantics> semanticsSupplier, T entity,
+            Function<T, org.antlr.v4.runtime.Token> extractToken, VariableRegistry variableRegistry) {
+        org.antlr.v4.runtime.Token antlrToken = extractToken.apply(entity);
+        int line = antlrToken.getLine();
+        int column = antlrToken.getCharPositionInLine() + 1;
+        int length = antlrToken.getText().length();
+        Token token;
+        if (extractsSemantics) {
+            if (semanticsSupplier == null)
+                throw new IllegalStateException(String.format("Expected semantics bud did not receive any for token %s", jplagType.getDescription()));
+            CodeSemantics semantics = semanticsSupplier.apply(entity);
+            token = new Token(jplagType, this.file, line, column, length, semantics);
+            variableRegistry.updateSemantics(semantics);
+        } else {
+            if (semanticsSupplier != null)
+                logger.warning(() -> String.format("Received semantics for token %s despite not expecting any", jplagType.getDescription()));
+            token = new Token(jplagType, this.file, line, column, length);
+        }
+        addToken(token);
     }
 
     /**
-     * @return All collected tokens
+     * Add a file end token.
+     * @param newFile The next file, null if there isn't one.
      */
-    public List<Token> getTokens() {
-        return Collections.unmodifiableList(this.collected);
+    void addFileEndToken(File newFile) {
+        addToken(extractsSemantics ? Token.semanticFileEnd(file) : Token.fileEnd(file));
+        // don't need to update semantics because variable registry is new for every file
+        this.file = newFile;
+    }
+
+    private void addToken(Token token) {
+        this.collected.add(token);
     }
 }
diff --git a/language-antlr-utils/src/test/java/de/jplag/antlr/testLanguage/TestListener.java b/language-antlr-utils/src/test/java/de/jplag/antlr/testLanguage/TestListener.java
index 49d30b023..51afe2896 100644
--- a/language-antlr-utils/src/test/java/de/jplag/antlr/testLanguage/TestListener.java
+++ b/language-antlr-utils/src/test/java/de/jplag/antlr/testLanguage/TestListener.java
@@ -19,17 +19,12 @@ public class TestListener extends AbstractAntlrListener {
      */
     public TestListener(TokenCollector collector, File currentFile) {
         super(collector, currentFile, true);
-
-        mapEnter(VarDefContext.class, VARDEF).addAsVariable(VariableScope.FILE, false, rule -> rule.VAR_NAME().getText())
-                .withSemantics(CodeSemantics.createKeep());
-
-        mapRange(CalcExpressionContext.class, ADDITION, rule -> rule.operator() != null && rule.operator().PLUS() != null).withControlSemantics();
-        mapRange(OperatorContext.class, SUBTRACTION, rule -> rule.MINUS() != null).withControlSemantics();
-        mapEnterExit(SubExpressionContext.class, SUB_EXPRESSION_BEGIN, SUB_EXPRESSION_END)
-                // .addEndSemanticHandler(registry -> registry.addAllNonLocalVariablesAsReads())
-                // does not work here, because there is no class context. Is still here as an example.
-                .addLocalScope().withControlSemantics();
-        mapTerminal(TestParser.NUMBER, NUMBER).withSemantics(CodeSemantics.createKeep());
-        mapEnter(VarRefContext.class, VARREF).withSemantics(CodeSemantics.createKeep());
+        visit(VarDefContext.class).map(VARDEF).withSemantics(CodeSemantics::createKeep)
+                .onEnter(rule -> variableRegistry.registerVariable(rule.VAR_NAME().getText(), VariableScope.FILE, false));
+        visit(CalcExpressionContext.class, rule -> rule.operator() != null && rule.operator().PLUS() != null).map(ADDITION).withControlSemantics();
+        visit(OperatorContext.class, rule -> rule.MINUS() != null).map(SUBTRACTION).withControlSemantics();
+        visit(SubExpressionContext.class).map(SUB_EXPRESSION_BEGIN, SUB_EXPRESSION_END).addLocalScope().withControlSemantics();
+        visit(TestParser.NUMBER).map(NUMBER).withSemantics(CodeSemantics::createKeep);
+        visit(VarDefContext.class).map(VARDEF).withSemantics(CodeSemantics::createKeep);
     }
 }
diff --git a/languages/cpp2/src/main/java/de/jplag/cpp2/CPPListener.java b/languages/cpp2/src/main/java/de/jplag/cpp2/CPPListener.java
index 90ef46b3b..bc2438f7d 100644
--- a/languages/cpp2/src/main/java/de/jplag/cpp2/CPPListener.java
+++ b/languages/cpp2/src/main/java/de/jplag/cpp2/CPPListener.java
@@ -24,50 +24,50 @@ public class CPPListener extends AbstractAntlrListener {
     public CPPListener(TokenCollector collector, File currentFile) {
         super(collector, currentFile);
 
-        mapEnterExit(ClassSpecifierContext.class, UNION_BEGIN, UNION_END, rule -> rule.classHead().Union() != null);
-        mapEnterExit(ClassSpecifierContext.class, CLASS_BEGIN, CLASS_END,
-                rule -> rule.classHead().classKey() != null && rule.classHead().classKey().Class() != null);
-        mapEnterExit(ClassSpecifierContext.class, STRUCT_BEGIN, STRUCT_END,
-                rule -> rule.classHead().classKey() != null && rule.classHead().classKey().Struct() != null);
-        mapEnterExit(EnumSpecifierContext.class, ENUM_BEGIN, ENUM_END);
+        visit(ClassSpecifierContext.class, rule -> rule.classHead().Union() != null).map(UNION_BEGIN, UNION_END);
+        visit(ClassSpecifierContext.class, rule -> rule.classHead().classKey() != null && rule.classHead().classKey().Class() != null)
+                .map(CLASS_BEGIN, CLASS_END);
+        visit(ClassSpecifierContext.class, rule -> rule.classHead().classKey() != null && rule.classHead().classKey().Struct() != null)
+                .map(STRUCT_BEGIN, STRUCT_END);
+        visit(EnumSpecifierContext.class).map(ENUM_BEGIN, ENUM_END);
 
-        mapEnterExit(FunctionDefinitionContext.class, FUNCTION_BEGIN, FUNCTION_END);
+        visit(FunctionDefinitionContext.class).map(FUNCTION_BEGIN, FUNCTION_END);
 
-        mapEnterExit(IterationStatementContext.class, DO_BEGIN, DO_END, rule -> rule.Do() != null);
-        mapEnterExit(IterationStatementContext.class, FOR_BEGIN, FOR_END, rule -> rule.For() != null);
-        mapEnterExit(IterationStatementContext.class, WHILE_BEGIN, WHILE_END, rule -> rule.While() != null && rule.Do() == null);
+        visit(IterationStatementContext.class, rule -> rule.Do() != null).map(DO_BEGIN, DO_END);
+        visit(IterationStatementContext.class, rule -> rule.For() != null).map(FOR_BEGIN, FOR_END);
+        visit(IterationStatementContext.class, rule -> rule.While() != null && rule.Do() == null).map(WHILE_BEGIN, WHILE_END);
 
-        mapEnterExit(SelectionStatementContext.class, SWITCH_BEGIN, SWITCH_END, rule -> rule.Switch() != null);
-        mapEnterExit(SelectionStatementContext.class, IF_BEGIN, IF_END, rule -> rule.If() != null);
-        mapTerminal(CPP14Parser.Else, ELSE);
+        visit(SelectionStatementContext.class, rule -> rule.Switch() != null).map(SWITCH_BEGIN, SWITCH_END);
+        visit(SelectionStatementContext.class, rule -> rule.If() != null).map(IF_BEGIN, IF_END);
+        visit(CPP14Parser.Else).map(ELSE);
 
-        mapEnter(LabeledStatementContext.class, CASE, rule -> rule.Case() != null);
-        mapEnter(LabeledStatementContext.class, DEFAULT, rule -> rule.Default() != null);
+        visit(LabeledStatementContext.class, rule -> rule.Case() != null).map(CASE);
+        visit(LabeledStatementContext.class, rule -> rule.Default() != null).map(DEFAULT);
 
-        mapEnter(TryBlockContext.class, TRY);
-        mapEnterExit(HandlerContext.class, CATCH_BEGIN, CATCH_END);
+        visit(TryBlockContext.class).map(TRY);
+        visit(HandlerContext.class).map(CATCH_BEGIN, CATCH_END);
 
-        mapEnter(JumpStatementContext.class, BREAK, rule -> rule.Break() != null);
-        mapEnter(JumpStatementContext.class, CONTINUE, rule -> rule.Continue() != null);
-        mapEnter(JumpStatementContext.class, GOTO, rule -> rule.Goto() != null);
-        mapEnter(JumpStatementContext.class, RETURN, rule -> rule.Return() != null);
+        visit(JumpStatementContext.class, rule -> rule.Break() != null).map(BREAK);
+        visit(JumpStatementContext.class, rule -> rule.Continue() != null).map(CONTINUE);
+        visit(JumpStatementContext.class, rule -> rule.Goto() != null).map(GOTO);
+        visit(JumpStatementContext.class, rule -> rule.Return() != null).map(RETURN);
 
-        mapEnter(ThrowExpressionContext.class, THROW);
+        visit(ThrowExpressionContext.class).map(THROW);
 
-        mapEnter(NewExpressionContext.class, NEWCLASS, rule -> rule.newInitializer() != null);
-        mapEnter(NewExpressionContext.class, NEWARRAY, rule -> rule.newInitializer() == null);
+        visit(NewExpressionContext.class, rule -> rule.newInitializer() != null).map(NEWCLASS);
+        visit(NewExpressionContext.class, rule -> rule.newInitializer() == null).map(NEWARRAY);
 
-        mapEnter(TemplateDeclarationContext.class, GENERIC);
+        visit(TemplateDeclarationContext.class).map(GENERIC);
 
-        mapEnter(AssignmentOperatorContext.class, ASSIGN);
-        mapEnter(BraceOrEqualInitializerContext.class, ASSIGN, rule -> rule.Assign() != null);
-        mapEnter(UnaryExpressionContext.class, ASSIGN, rule -> rule.PlusPlus() != null || rule.MinusMinus() != null);
+        visit(AssignmentOperatorContext.class).map(ASSIGN);
+        visit(BraceOrEqualInitializerContext.class, rule -> rule.Assign() != null).map(ASSIGN);
+        visit(UnaryExpressionContext.class, rule -> rule.PlusPlus() != null || rule.MinusMinus() != null).map(ASSIGN);
 
-        mapEnter(StaticAssertDeclarationContext.class, STATIC_ASSERT);
-        mapEnter(EnumeratorDefinitionContext.class, VARDEF);
-        mapEnterExit(BracedInitListContext.class, BRACED_INIT_BEGIN, BRACED_INIT_END);
+        visit(StaticAssertDeclarationContext.class).map(STATIC_ASSERT);
+        visit(EnumeratorDefinitionContext.class).map(VARDEF);
+        visit(BracedInitListContext.class).map(BRACED_INIT_BEGIN, BRACED_INIT_END);
 
-        mapEnter(SimpleTypeSpecifierContext.class, VARDEF, rule -> {
+        visit(SimpleTypeSpecifierContext.class, rule -> {
             if (hasAncestor(rule, MemberdeclarationContext.class, FunctionDefinitionContext.class)) {
                 return true;
             }
@@ -80,23 +80,23 @@ public CPPListener(TokenCollector collector, File currentFile) {
             }
 
             return false;
-        });
+        }).map(VARDEF);
 
-        mapEnter(SimpleDeclarationContext.class, APPLY, rule -> {
+        visit(SimpleDeclarationContext.class, rule -> {
             if (!hasAncestor(rule, FunctionBodyContext.class)) {
                 return false;
             }
 
             NoPointerDeclaratorContext noPointerDecl = getDescendant(rule, NoPointerDeclaratorContext.class);
             return noPointerInFunctionCallContext(noPointerDecl);
-        });
+        }).map(APPLY);
 
-        mapEnter(InitDeclaratorContext.class, APPLY, rule -> rule.initializer() != null && rule.initializer().LeftParen() != null);
-        mapEnter(ParameterDeclarationContext.class, VARDEF);
-        mapEnter(ConditionalExpressionContext.class, QUESTIONMARK, rule -> rule.Question() != null);
+        visit(InitDeclaratorContext.class, rule -> rule.initializer() != null && rule.initializer().LeftParen() != null).map(APPLY);
+        visit(ParameterDeclarationContext.class).map(VARDEF);
+        visit(ConditionalExpressionContext.class, rule -> rule.Question() != null).map(QUESTIONMARK);
 
-        mapEnter(PostfixExpressionContext.class, APPLY, rule -> rule.LeftParen() != null);
-        mapEnter(PostfixExpressionContext.class, ASSIGN, rule -> rule.PlusPlus() != null || rule.MinusMinus() != null);
+        visit(PostfixExpressionContext.class, rule -> rule.LeftParen() != null).map(APPLY);
+        visit(PostfixExpressionContext.class, rule -> rule.PlusPlus() != null || rule.MinusMinus() != null).map(ASSIGN);
     }
 
     /**
diff --git a/languages/kotlin/src/main/java/de/jplag/kotlin/KotlinListener.java b/languages/kotlin/src/main/java/de/jplag/kotlin/KotlinListener.java
index bb308df61..9728ec889 100644
--- a/languages/kotlin/src/main/java/de/jplag/kotlin/KotlinListener.java
+++ b/languages/kotlin/src/main/java/de/jplag/kotlin/KotlinListener.java
@@ -103,49 +103,49 @@ public class KotlinListener extends AbstractAntlrListener {
     public KotlinListener(TokenCollector collector, File currentFile) {
         super(collector, currentFile);
 
-        this.mapRange(PackageHeaderContext.class, PACKAGE);
-        this.mapRange(ImportHeaderContext.class, IMPORT);
-        this.mapEnter(ClassDeclarationContext.class, CLASS_DECLARATION);
-        this.mapRange(ObjectDeclarationContext.class, OBJECT_DECLARATION);
-        this.mapRange(CompanionObjectContext.class, COMPANION_DECLARATION);
-        this.mapRange(TypeParameterContext.class, TYPE_PARAMETER);
-        this.mapRange(PrimaryConstructorContext.class, CONSTRUCTOR);
-        this.mapRange(ClassParameterContext.class, PROPERTY_DECLARATION);
-        this.mapEnterExit(ClassBodyContext.class, CLASS_BODY_BEGIN, CLASS_BODY_END);
-        this.mapEnterExit(EnumClassBodyContext.class, ENUM_CLASS_BODY_BEGIN, ENUM_CLASS_BODY_END);
-        this.mapEnter(EnumEntryContext.class, ENUM_ENTRY);
-        this.mapRange(SecondaryConstructorContext.class, CONSTRUCTOR);
-        this.mapEnter(PropertyDeclarationContext.class, PROPERTY_DECLARATION);
-        this.mapEnter(AnonymousInitializerContext.class, INITIALIZER);
-        this.mapEnterExit(InitBlockContext.class, INITIALIZER_BODY_START, INITIALIZER_BODY_END);
-        this.mapEnter(FunctionDeclarationContext.class, FUNCTION);
-        this.mapEnter(GetterContext.class, GETTER);
-        this.mapEnter(SetterContext.class, SETTER);
-        this.mapRange(FunctionValueParameterContext.class, FUNCTION_PARAMETER);
-        this.mapEnterExit(FunctionBodyContext.class, FUNCTION_BODY_BEGIN, FUNCTION_BODY_END);
-        this.mapEnterExit(FunctionLiteralContext.class, FUNCTION_LITERAL_BEGIN, FUNCTION_LITERAL_END);
-        this.mapEnterExit(ForExpressionContext.class, FOR_EXPRESSION_BEGIN, FOR_EXPRESSION_END);
-        this.mapEnterExit(IfExpressionContext.class, IF_EXPRESSION_BEGIN, IF_EXPRESSION_END);
-        this.mapEnterExit(WhileExpressionContext.class, WHILE_EXPRESSION_START, WHILE_EXPRESSION_END);
-        this.mapEnterExit(DoWhileExpressionContext.class, DO_WHILE_EXPRESSION_START, DO_WHILE_EXPRESSION_END);
-        this.mapEnter(TryExpressionContext.class, TRY_EXPRESSION);
-        this.mapEnterExit(TryBodyContext.class, TRY_BODY_START, TRY_BODY_END);
-        this.mapEnter(CatchStatementContext.class, CATCH);
-        this.mapEnterExit(CatchBodyContext.class, CATCH_BODY_START, CATCH_BODY_END);
-        this.mapEnter(FinallyStatementContext.class, FINALLY);
-        this.mapEnterExit(FinallyBodyContext.class, FINALLY_BODY_START, FINALLY_BODY_END);
-        this.mapEnterExit(WhenExpressionContext.class, WHEN_EXPRESSION_START, WHEN_EXPRESSION_END);
-        this.mapEnter(WhenConditionContext.class, WHEN_CONDITION);
-        this.mapEnterExit(ControlStructureBodyContext.class, CONTROL_STRUCTURE_BODY_START, CONTROL_STRUCTURE_BODY_END);
-        this.mapEnter(VariableDeclarationContext.class, VARIABLE_DECLARATION);
-        this.mapRange(ConstructorInvocationContext.class, CREATE_OBJECT);
-        this.mapRange(CallSuffixContext.class, FUNCTION_INVOCATION);
-        this.mapEnter(AssignmentOperatorContext.class, ASSIGNMENT);
+        visit(PackageHeaderContext.class).map(PACKAGE);
+        visit(ImportHeaderContext.class).map(IMPORT);
+        visit(ClassDeclarationContext.class).map(CLASS_DECLARATION);
+        visit(ObjectDeclarationContext.class).map(OBJECT_DECLARATION);
+        visit(CompanionObjectContext.class).map(COMPANION_DECLARATION);
+        visit(TypeParameterContext.class).map(TYPE_PARAMETER);
+        visit(PrimaryConstructorContext.class).map(CONSTRUCTOR);
+        visit(ClassParameterContext.class).map(PROPERTY_DECLARATION);
+        visit(ClassBodyContext.class).map(CLASS_BODY_BEGIN, CLASS_BODY_END);
+        visit(EnumClassBodyContext.class).map(ENUM_CLASS_BODY_BEGIN, ENUM_CLASS_BODY_END);
+        visit(EnumEntryContext.class).map(ENUM_ENTRY);
+        visit(SecondaryConstructorContext.class).map(CONSTRUCTOR);
+        visit(PropertyDeclarationContext.class).map(PROPERTY_DECLARATION);
+        visit(AnonymousInitializerContext.class).map(INITIALIZER);
+        visit(InitBlockContext.class).map(INITIALIZER_BODY_START, INITIALIZER_BODY_END);
+        visit(FunctionDeclarationContext.class).map(FUNCTION);
+        visit(GetterContext.class).map(GETTER);
+        visit(SetterContext.class).map(SETTER);
+        visit(FunctionValueParameterContext.class).map(FUNCTION_PARAMETER);
+        visit(FunctionBodyContext.class).map(FUNCTION_BODY_BEGIN, FUNCTION_BODY_END);
+        visit(FunctionLiteralContext.class).map(FUNCTION_LITERAL_BEGIN, FUNCTION_LITERAL_END);
+        visit(ForExpressionContext.class).map(FOR_EXPRESSION_BEGIN, FOR_EXPRESSION_END);
+        visit(IfExpressionContext.class).map(IF_EXPRESSION_BEGIN, IF_EXPRESSION_END);
+        visit(WhileExpressionContext.class).map(WHILE_EXPRESSION_START, WHILE_EXPRESSION_END);
+        visit(DoWhileExpressionContext.class).map(DO_WHILE_EXPRESSION_START, DO_WHILE_EXPRESSION_END);
+        visit(TryExpressionContext.class).map(TRY_EXPRESSION);
+        visit(TryBodyContext.class).map(TRY_BODY_START, TRY_BODY_END);
+        visit(CatchStatementContext.class).map(CATCH);
+        visit(CatchBodyContext.class).map(CATCH_BODY_START, CATCH_BODY_END);
+        visit(FinallyStatementContext.class).map(FINALLY);
+        visit(FinallyBodyContext.class).map(FINALLY_BODY_START, FINALLY_BODY_END);
+        visit(WhenExpressionContext.class).map(WHEN_EXPRESSION_START, WHEN_EXPRESSION_END);
+        visit(WhenConditionContext.class).map(WHEN_CONDITION);
+        visit(ControlStructureBodyContext.class).map(CONTROL_STRUCTURE_BODY_START, CONTROL_STRUCTURE_BODY_END);
+        visit(VariableDeclarationContext.class).map(VARIABLE_DECLARATION);
+        visit(ConstructorInvocationContext.class).map(CREATE_OBJECT);
+        visit(CallSuffixContext.class).map(FUNCTION_INVOCATION);
+        visit(AssignmentOperatorContext.class).map(ASSIGNMENT);
 
-        this.mapTerminal(KotlinParser.THROW, THROW);
-        this.mapTerminal(KotlinParser.RETURN, RETURN);
-        this.mapTerminal(KotlinParser.CONTINUE, CONTINUE);
-        this.mapTerminal(KotlinParser.BREAK, BREAK);
-        this.mapTerminal(KotlinParser.BREAK_AT, BREAK);
+        visit(KotlinParser.THROW).map(THROW);
+        visit(KotlinParser.RETURN).map(RETURN);
+        visit(KotlinParser.CONTINUE).map(CONTINUE);
+        visit(KotlinParser.BREAK).map(BREAK);
+        visit(KotlinParser.BREAK_AT).map(BREAK);
     }
 }

From ef9dce36bbe943a897c057952cd5f1a198538488 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20Br=C3=B6del?= <moritz.broedel@gmail.com>
Date: Fri, 25 Aug 2023 14:37:22 +0200
Subject: [PATCH 08/57] Fix errors

---
 .../main/java/de/jplag/antlr/AbstractAntlrListener.java  | 9 ++++++---
 .../java/de/jplag/antlr/AbstractAntlrParserAdapter.java  | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java
index 19c1b00ad..e0e136f57 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java
@@ -8,6 +8,7 @@
 import java.util.function.Predicate;
 
 import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.ErrorNode;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.ParseTreeListener;
@@ -60,7 +61,8 @@ public AbstractAntlrListener(TokenCollector collector, File currentFile) {
      */
     @SuppressWarnings("unchecked")
     public <T extends ParserRuleContext> ContextVisitor<T> visit(Class<T> antlrType, Predicate<T> condition) {
-        ContextVisitor<T> visitor = new ContextVisitor<>(condition.and(rule -> rule.getClass() == antlrType), collector, variableRegistry);
+        Predicate<T> typeCheck = rule -> rule.getClass() == antlrType;
+        ContextVisitor<T> visitor = new ContextVisitor<>(typeCheck.and(condition), collector, variableRegistry);
         contextVisitors.add((ContextVisitor<ParserRuleContext>) visitor);
         return visitor;
     }
@@ -81,8 +83,9 @@ public <T extends ParserRuleContext> ContextVisitor<T> visit(Class<T> antlrType)
      * @param condition An additional condition for the visit.
      * @return A visitor for the node.
      */
-    public TerminalVisitor visit(int terminalType, Predicate<org.antlr.v4.runtime.Token> condition) {
-        TerminalVisitor visitor = new TerminalVisitor(condition.and(rule -> rule.getType() == terminalType), collector, variableRegistry);
+    public TerminalVisitor visit(int terminalType, Predicate<Token> condition) {
+        Predicate<Token> typeCheck = rule -> rule.getType() == terminalType;
+        TerminalVisitor visitor = new TerminalVisitor(typeCheck.and(condition), collector, variableRegistry);
         terminalVisitors.add(visitor);
         return visitor;
     }
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrParserAdapter.java b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrParserAdapter.java
index c2a09fc8e..8bd9c56ff 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrParserAdapter.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrParserAdapter.java
@@ -53,6 +53,8 @@ public AbstractAntlrParserAdapter() {
      */
     public List<Token> parse(Set<File> files) throws ParsingException {
         List<File> filesList = new ArrayList<>(files);
+        if (files.isEmpty())
+            return new ArrayList<>();
         File firstFile = filesList.remove(0);
         TokenCollector collector = new TokenCollector(extractsSemantics, firstFile);
         parseFile(firstFile, collector);

From bb8a13930b7c3a715e933f68b22c27a2e5133da6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20Br=C3=B6del?= <moritz.broedel@gmail.com>
Date: Fri, 25 Aug 2023 15:09:21 +0200
Subject: [PATCH 09/57] Adjust llvmir listener

---
 .../java/de/jplag/llvmir/LLVMIRListener.java  | 216 +++++++++---------
 1 file changed, 108 insertions(+), 108 deletions(-)

diff --git a/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRListener.java b/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRListener.java
index ed0efc65f..3a6dfad43 100644
--- a/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRListener.java
+++ b/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRListener.java
@@ -130,113 +130,113 @@ public class LLVMIRListener extends AbstractAntlrListener {
     public LLVMIRListener(TokenCollector collector, File currentFile) {
         super(collector, currentFile);
 
-        this.mapEnter(SourceFilenameContext.class, FILENAME);
-        this.mapRange(ModuleAsmContext.class, ASSEMBLY);
-        this.mapEnter(TypeDefContext.class, TYPE_DEFINITION);
-        this.mapRange(GlobalDeclContext.class, GLOBAL_VARIABLE);
-        this.mapRange(GlobalDefContext.class, GLOBAL_VARIABLE);
-        this.mapRange(FuncDeclContext.class, FUNCTION_DECLARATION);
-        this.mapRange(FuncDefContext.class, FUNCTION_DEFINITION);
-        this.mapEnterExit(FuncBodyContext.class, FUNCTION_BODY_BEGIN, FUNCTION_BODY_END);
-        this.mapEnterExit(BasicBlockContext.class, BASIC_BLOCK_BEGIN, BASIC_BLOCK_END);
-        this.mapRange(RetTermContext.class, RETURN);
-        this.mapRange(BrTermContext.class, BRANCH);
-        this.mapRange(CondBrTermContext.class, CONDITIONAL_BRANCH);
-        this.mapRange(SwitchTermContext.class, SWITCH);
-        this.mapRange(IndirectBrTermContext.class, BRANCH);
-        this.mapRange(ResumeTermContext.class, RESUME);
-        this.mapRange(CatchRetTermContext.class, CATCH_RETURN);
-        this.mapRange(CleanupRetTermContext.class, CLEAN_UP_RETURN);
-        this.mapRange(InvokeTermContext.class, INVOKE);
-        this.mapRange(CallBrTermContext.class, CALL_BRANCH);
-        this.mapRange(CatchSwitchTermContext.class, CATCH_SWITCH);
-        this.mapRange(Case_Context.class, CASE);
-        this.mapRange(StructConstContext.class, STRUCTURE);
-        this.mapRange(ArrayConstContext.class, ARRAY);
-        this.mapRange(VectorConstContext.class, VECTOR);
-        this.mapRange(InlineAsmContext.class, ASSEMBLY);
-        this.mapRange(BitCastExprContext.class, BITCAST);
-        this.mapRange(GetElementPtrExprContext.class, GET_ELEMENT_POINTER);
-        this.mapEnter(AddrSpaceCastExprContext.class, CONVERSION);
-        this.mapEnter(IntToPtrExprContext.class, CONVERSION);
-        this.mapRange(ICmpExprContext.class, COMPARISON);
-        this.mapRange(FCmpExprContext.class, COMPARISON);
-        this.mapRange(SelectExprContext.class, SELECT);
-        this.mapEnter(TruncExprContext.class, CONVERSION);
-        this.mapEnter(ZExtExprContext.class, CONVERSION);
-        this.mapEnter(SExtExprContext.class, CONVERSION);
-        this.mapEnter(FpTruncExprContext.class, CONVERSION);
-        this.mapEnter(FpExtExprContext.class, CONVERSION);
-        this.mapEnter(FpToUiExprContext.class, CONVERSION);
-        this.mapEnter(FpToSiExprContext.class, CONVERSION);
-        this.mapEnter(UiToFpExprContext.class, CONVERSION);
-        this.mapEnter(SiToFpExprContext.class, CONVERSION);
-        this.mapEnter(PtrToIntExprContext.class, CONVERSION);
-        this.mapEnter(ExtractElementExprContext.class, EXTRACT_ELEMENT);
-        this.mapEnter(InsertElementExprContext.class, INSERT_ELEMENT);
-        this.mapEnter(ShuffleVectorExprContext.class, SHUFFLE_VECTOR);
-        this.mapRange(ShlExprContext.class, SHIFT);
-        this.mapRange(LShrExprContext.class, SHIFT);
-        this.mapRange(AShrExprContext.class, SHIFT);
-        this.mapRange(AndExprContext.class, AND);
-        this.mapRange(OrExprContext.class, OR);
-        this.mapRange(XorExprContext.class, XOR);
-        this.mapRange(AddExprContext.class, ADDITION);
-        this.mapRange(SubExprContext.class, SUBTRACTION);
-        this.mapRange(MulExprContext.class, MULTIPLICATION);
-        this.mapRange(StoreInstContext.class, STORE);
-        this.mapRange(FenceInstContext.class, FENCE);
-        this.mapRange(AddInstContext.class, ADDITION);
-        this.mapRange(FAddInstContext.class, ADDITION);
-        this.mapRange(SubInstContext.class, SUBTRACTION);
-        this.mapRange(FSubInstContext.class, SUBTRACTION);
-        this.mapRange(MulInstContext.class, MULTIPLICATION);
-        this.mapRange(FMulInstContext.class, MULTIPLICATION);
-        this.mapRange(UDivInstContext.class, DIVISION);
-        this.mapRange(SDivInstContext.class, DIVISION);
-        this.mapRange(FDivInstContext.class, DIVISION);
-        this.mapRange(URemInstContext.class, REMAINDER);
-        this.mapRange(SRemInstContext.class, REMAINDER);
-        this.mapRange(FRemInstContext.class, REMAINDER);
-        this.mapRange(ShlInstContext.class, SHIFT);
-        this.mapRange(LShrInstContext.class, SHIFT);
-        this.mapRange(AShrInstContext.class, SHIFT);
-        this.mapRange(AndInstContext.class, AND);
-        this.mapRange(OrInstContext.class, OR);
-        this.mapRange(XorInstContext.class, XOR);
-        this.mapEnter(ExtractElementInstContext.class, EXTRACT_ELEMENT);
-        this.mapEnter(InsertElementInstContext.class, INSERT_ELEMENT);
-        this.mapEnter(ShuffleVectorInstContext.class, SHUFFLE_VECTOR);
-        this.mapRange(ExtractValueInstContext.class, EXTRACT_VALUE);
-        this.mapRange(InsertValueInstContext.class, INSERT_VALUE);
-        this.mapRange(AllocaInstContext.class, ALLOCATION);
-        this.mapRange(LoadInstContext.class, LOAD);
-        this.mapRange(CmpXchgInstContext.class, COMPARE_EXCHANGE);
-        this.mapRange(AtomicRMWInstContext.class, ATOMIC_READ_MODIFY_WRITE);
-        this.mapRange(GetElementPtrInstContext.class, GET_ELEMENT_POINTER);
-        this.mapEnter(TruncInstContext.class, CONVERSION);
-        this.mapEnter(ZExtInstContext.class, CONVERSION);
-        this.mapEnter(SExtInstContext.class, CONVERSION);
-        this.mapEnter(FpTruncInstContext.class, CONVERSION);
-        this.mapEnter(FpExtInstContext.class, CONVERSION);
-        this.mapEnter(FpToUiInstContext.class, CONVERSION);
-        this.mapEnter(FpToSiInstContext.class, CONVERSION);
-        this.mapEnter(UiToFpInstContext.class, CONVERSION);
-        this.mapEnter(SiToFpInstContext.class, CONVERSION);
-        this.mapEnter(PtrToIntInstContext.class, CONVERSION);
-        this.mapEnter(IntToPtrInstContext.class, CONVERSION);
-        this.mapRange(BitCastInstContext.class, BITCAST);
-        this.mapEnter(AddrSpaceCastInstContext.class, CONVERSION);
-        this.mapRange(ICmpInstContext.class, COMPARISON);
-        this.mapRange(FCmpInstContext.class, COMPARISON);
-        this.mapRange(PhiInstContext.class, PHI);
-        this.mapRange(SelectInstContext.class, SELECT);
-        this.mapRange(CallInstContext.class, CALL);
-        this.mapRange(VaargInstContext.class, VARIABLE_ARGUMENT);
-        this.mapRange(LandingPadInstContext.class, LANDING_PAD);
-        this.mapRange(CatchPadInstContext.class, CATCH_PAD);
-        this.mapRange(CleanupPadInstContext.class, CLEAN_UP_PAD);
-        this.mapRange(ClauseContext.class, CLAUSE);
-        this.mapRange(AtomicOrderingContext.class, ATOMIC_ORDERING);
+        visit(SourceFilenameContext.class).map(FILENAME);
+        visit(ModuleAsmContext.class).map(ASSEMBLY);
+        visit(TypeDefContext.class).map(TYPE_DEFINITION);
+        visit(GlobalDeclContext.class).map(GLOBAL_VARIABLE);
+        visit(GlobalDefContext.class).map(GLOBAL_VARIABLE);
+        visit(FuncDeclContext.class).map(FUNCTION_DECLARATION);
+        visit(FuncDefContext.class).map(FUNCTION_DEFINITION);
+        visit(FuncBodyContext.class).map(FUNCTION_BODY_BEGIN, FUNCTION_BODY_END);
+        visit(BasicBlockContext.class).map(BASIC_BLOCK_BEGIN, BASIC_BLOCK_END);
+        visit(RetTermContext.class).map(RETURN);
+        visit(BrTermContext.class).map(BRANCH);
+        visit(CondBrTermContext.class).map(CONDITIONAL_BRANCH);
+        visit(SwitchTermContext.class).map(SWITCH);
+        visit(IndirectBrTermContext.class).map(BRANCH);
+        visit(ResumeTermContext.class).map(RESUME);
+        visit(CatchRetTermContext.class).map(CATCH_RETURN);
+        visit(CleanupRetTermContext.class).map(CLEAN_UP_RETURN);
+        visit(InvokeTermContext.class).map(INVOKE);
+        visit(CallBrTermContext.class).map(CALL_BRANCH);
+        visit(CatchSwitchTermContext.class).map(CATCH_SWITCH);
+        visit(Case_Context.class).map(CASE);
+        visit(StructConstContext.class).map(STRUCTURE);
+        visit(ArrayConstContext.class).map(ARRAY);
+        visit(VectorConstContext.class).map(VECTOR);
+        visit(InlineAsmContext.class).map(ASSEMBLY);
+        visit(BitCastExprContext.class).map(BITCAST);
+        visit(GetElementPtrExprContext.class).map(GET_ELEMENT_POINTER);
+        visit(AddrSpaceCastExprContext.class).map(CONVERSION);
+        visit(IntToPtrExprContext.class).map(CONVERSION);
+        visit(ICmpExprContext.class).map(COMPARISON);
+        visit(FCmpExprContext.class).map(COMPARISON);
+        visit(SelectExprContext.class).map(SELECT);
+        visit(TruncExprContext.class).map(CONVERSION);
+        visit(ZExtExprContext.class).map(CONVERSION);
+        visit(SExtExprContext.class).map(CONVERSION);
+        visit(FpTruncExprContext.class).map(CONVERSION);
+        visit(FpExtExprContext.class).map(CONVERSION);
+        visit(FpToUiExprContext.class).map(CONVERSION);
+        visit(FpToSiExprContext.class).map(CONVERSION);
+        visit(UiToFpExprContext.class).map(CONVERSION);
+        visit(SiToFpExprContext.class).map(CONVERSION);
+        visit(PtrToIntExprContext.class).map(CONVERSION);
+        visit(ExtractElementExprContext.class).map(EXTRACT_ELEMENT);
+        visit(InsertElementExprContext.class).map(INSERT_ELEMENT);
+        visit(ShuffleVectorExprContext.class).map(SHUFFLE_VECTOR);
+        visit(ShlExprContext.class).map(SHIFT);
+        visit(LShrExprContext.class).map(SHIFT);
+        visit(AShrExprContext.class).map(SHIFT);
+        visit(AndExprContext.class).map(AND);
+        visit(OrExprContext.class).map(OR);
+        visit(XorExprContext.class).map(XOR);
+        visit(AddExprContext.class).map(ADDITION);
+        visit(SubExprContext.class).map(SUBTRACTION);
+        visit(MulExprContext.class).map(MULTIPLICATION);
+        visit(StoreInstContext.class).map(STORE);
+        visit(FenceInstContext.class).map(FENCE);
+        visit(AddInstContext.class).map(ADDITION);
+        visit(FAddInstContext.class).map(ADDITION);
+        visit(SubInstContext.class).map(SUBTRACTION);
+        visit(FSubInstContext.class).map(SUBTRACTION);
+        visit(MulInstContext.class).map(MULTIPLICATION);
+        visit(FMulInstContext.class).map(MULTIPLICATION);
+        visit(UDivInstContext.class).map(DIVISION);
+        visit(SDivInstContext.class).map(DIVISION);
+        visit(FDivInstContext.class).map(DIVISION);
+        visit(URemInstContext.class).map(REMAINDER);
+        visit(SRemInstContext.class).map(REMAINDER);
+        visit(FRemInstContext.class).map(REMAINDER);
+        visit(ShlInstContext.class).map(SHIFT);
+        visit(LShrInstContext.class).map(SHIFT);
+        visit(AShrInstContext.class).map(SHIFT);
+        visit(AndInstContext.class).map(AND);
+        visit(OrInstContext.class).map(OR);
+        visit(XorInstContext.class).map(XOR);
+        visit(ExtractElementInstContext.class).map(EXTRACT_ELEMENT);
+        visit(InsertElementInstContext.class).map(INSERT_ELEMENT);
+        visit(ShuffleVectorInstContext.class).map(SHUFFLE_VECTOR);
+        visit(ExtractValueInstContext.class).map(EXTRACT_VALUE);
+        visit(InsertValueInstContext.class).map(INSERT_VALUE);
+        visit(AllocaInstContext.class).map(ALLOCATION);
+        visit(LoadInstContext.class).map(LOAD);
+        visit(CmpXchgInstContext.class).map(COMPARE_EXCHANGE);
+        visit(AtomicRMWInstContext.class).map(ATOMIC_READ_MODIFY_WRITE);
+        visit(GetElementPtrInstContext.class).map(GET_ELEMENT_POINTER);
+        visit(TruncInstContext.class).map(CONVERSION);
+        visit(ZExtInstContext.class).map(CONVERSION);
+        visit(SExtInstContext.class).map(CONVERSION);
+        visit(FpTruncInstContext.class).map(CONVERSION);
+        visit(FpExtInstContext.class).map(CONVERSION);
+        visit(FpToUiInstContext.class).map(CONVERSION);
+        visit(FpToSiInstContext.class).map(CONVERSION);
+        visit(UiToFpInstContext.class).map(CONVERSION);
+        visit(SiToFpInstContext.class).map(CONVERSION);
+        visit(PtrToIntInstContext.class).map(CONVERSION);
+        visit(IntToPtrInstContext.class).map(CONVERSION);
+        visit(BitCastInstContext.class).map(BITCAST);
+        visit(AddrSpaceCastInstContext.class).map(CONVERSION);
+        visit(ICmpInstContext.class).map(COMPARISON);
+        visit(FCmpInstContext.class).map(COMPARISON);
+        visit(PhiInstContext.class).map(PHI);
+        visit(SelectInstContext.class).map(SELECT);
+        visit(CallInstContext.class).map(CALL);
+        visit(VaargInstContext.class).map(VARIABLE_ARGUMENT);
+        visit(LandingPadInstContext.class).map(LANDING_PAD);
+        visit(CatchPadInstContext.class).map(CATCH_PAD);
+        visit(CleanupPadInstContext.class).map(CLEAN_UP_PAD);
+        visit(ClauseContext.class).map(CLAUSE);
+        visit(AtomicOrderingContext.class).map(ATOMIC_ORDERING);
     }
 }

From 6b7758843c7e565c439fcfe97fe649f9875086f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20Br=C3=B6del?= <moritz.broedel@gmail.com>
Date: Fri, 25 Aug 2023 16:41:54 +0200
Subject: [PATCH 10/57] Fix code smells

---
 .../main/java/de/jplag/antlr/AbstractAntlrParserAdapter.java  | 4 ++--
 .../src/main/java/de/jplag/antlr/ContextVisitor.java          | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrParserAdapter.java b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrParserAdapter.java
index 8bd9c56ff..172aa45fd 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrParserAdapter.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrParserAdapter.java
@@ -33,7 +33,7 @@ public abstract class AbstractAntlrParserAdapter<T extends Parser> extends Abstr
      * New instance
      * @param extractsSemantics If true, the listener will extract semantics along with every token
      */
-    public AbstractAntlrParserAdapter(boolean extractsSemantics) {
+    protected AbstractAntlrParserAdapter(boolean extractsSemantics) {
         super();
         this.extractsSemantics = extractsSemantics;
     }
@@ -41,7 +41,7 @@ public AbstractAntlrParserAdapter(boolean extractsSemantics) {
     /**
      * New instance
      */
-    public AbstractAntlrParserAdapter() {
+    protected AbstractAntlrParserAdapter() {
         this(false);
     }
 
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/ContextVisitor.java b/language-antlr-utils/src/main/java/de/jplag/antlr/ContextVisitor.java
index 1d2350f28..baf8f971d 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/ContextVisitor.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/ContextVisitor.java
@@ -88,6 +88,7 @@ public ContextVisitor<T> addClassScope() {
         return this;
     }
 
+    @Override
     void exit(T entity) {
         exitHandlers.forEach(handler -> handler.accept(entity));
     }

From 2337898700ef4368eac4e18dc4ea1726ee4ce42c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20Br=C3=B6del?= <moritz.broedel@gmail.com>
Date: Sat, 26 Aug 2023 13:41:39 +0200
Subject: [PATCH 11/57] Create language listeners statically

---
 .../de/jplag/antlr/AbstractAntlrListener.java | 72 +++++--------------
 .../antlr/AbstractAntlrParserAdapter.java     | 11 +--
 .../java/de/jplag/antlr/AbstractVisitor.java  | 44 ++++++------
 .../java/de/jplag/antlr/ContextVisitor.java   | 35 ++++++---
 .../main/java/de/jplag/antlr/HandlerData.java |  9 +++
 .../java/de/jplag/antlr/InternalListener.java | 48 +++++++++++++
 .../java/de/jplag/antlr/TerminalVisitor.java  |  6 +-
 .../antlr/testLanguage/TestListener.java      | 18 ++---
 .../antlr/testLanguage/TestParserAdapter.java |  8 +--
 .../main/java/de/jplag/cpp2/CPPListener.java  |  9 +--
 .../java/de/jplag/cpp2/CPPParserAdapter.java  |  9 ++-
 .../java/de/jplag/kotlin/KotlinListener.java  |  7 +-
 .../de/jplag/kotlin/KotlinParserAdapter.java  |  9 ++-
 .../java/de/jplag/llvmir/LLVMIRListener.java  |  9 +--
 .../de/jplag/llvmir/LLVMIRParserAdapter.java  |  9 ++-
 15 files changed, 153 insertions(+), 150 deletions(-)
 create mode 100644 language-antlr-utils/src/main/java/de/jplag/antlr/HandlerData.java
 create mode 100644 language-antlr-utils/src/main/java/de/jplag/antlr/InternalListener.java

diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java
index e0e136f57..db254c61a 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java
@@ -1,6 +1,5 @@
 package de.jplag.antlr;
 
-import java.io.File;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.List;
@@ -9,47 +8,19 @@
 
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.Token;
-import org.antlr.v4.runtime.tree.ErrorNode;
 import org.antlr.v4.runtime.tree.ParseTree;
-import org.antlr.v4.runtime.tree.ParseTreeListener;
-import org.antlr.v4.runtime.tree.TerminalNode;
-
-import de.jplag.semantics.VariableRegistry;
 
 /**
- * Base class for Antlr listeners. You can use the create*Mapping functions to map antlr tokens to jplag tokens.
- * <p>
- * You should create a constructor matching one of the constructors and create your mapping after calling super.
+ * Base class for Antlr listeners. This is a quasi-static class that is only created once per language. Use by
+ * overwriting the constructor, calling super(), and then calling the visit methods.
  */
-@SuppressWarnings("unused")
-public class AbstractAntlrListener implements ParseTreeListener {
-    private final TokenCollector collector;
-    private final File currentFile;
+public abstract class AbstractAntlrListener {
     private final List<ContextVisitor<ParserRuleContext>> contextVisitors;
     private final List<TerminalVisitor> terminalVisitors;
-    protected final VariableRegistry variableRegistry;
 
-    /**
-     * New instance
-     * @param collector The token collector
-     * @param currentFile The currently processed file
-     * @param extractsSemantics If true, the listener will extract semantics along with every token
-     */
-    public AbstractAntlrListener(TokenCollector collector, File currentFile, boolean extractsSemantics) {
-        this.collector = collector;
-        this.currentFile = currentFile;
-        this.contextVisitors = new ArrayList<>();
-        this.terminalVisitors = new ArrayList<>();
-        this.variableRegistry = new VariableRegistry();
-    }
-
-    /**
-     * Creates a new AbstractAntlrListener, that does not collect semantics information
-     * @param collector The collector, obtained by the parser
-     * @param currentFile The current file, obtained by the parser
-     */
-    public AbstractAntlrListener(TokenCollector collector, File currentFile) {
-        this(collector, currentFile, false);
+    public AbstractAntlrListener() {
+        contextVisitors = new ArrayList<>();
+        terminalVisitors = new ArrayList<>();
     }
 
     /**
@@ -62,7 +33,7 @@ public AbstractAntlrListener(TokenCollector collector, File currentFile) {
     @SuppressWarnings("unchecked")
     public <T extends ParserRuleContext> ContextVisitor<T> visit(Class<T> antlrType, Predicate<T> condition) {
         Predicate<T> typeCheck = rule -> rule.getClass() == antlrType;
-        ContextVisitor<T> visitor = new ContextVisitor<>(typeCheck.and(condition), collector, variableRegistry);
+        ContextVisitor<T> visitor = new ContextVisitor<>(typeCheck.and(condition));
         contextVisitors.add((ContextVisitor<ParserRuleContext>) visitor);
         return visitor;
     }
@@ -85,7 +56,7 @@ public <T extends ParserRuleContext> ContextVisitor<T> visit(Class<T> antlrType)
      */
     public TerminalVisitor visit(int terminalType, Predicate<Token> condition) {
         Predicate<Token> typeCheck = rule -> rule.getType() == terminalType;
-        TerminalVisitor visitor = new TerminalVisitor(typeCheck.and(condition), collector, variableRegistry);
+        TerminalVisitor visitor = new TerminalVisitor(typeCheck.and(condition));
         terminalVisitors.add(visitor);
         return visitor;
     }
@@ -99,25 +70,16 @@ public TerminalVisitor visit(int terminalType) {
         return visit(terminalType, ignore -> true);
     }
 
-    @Override
-    public void visitTerminal(TerminalNode terminalNode) {
-        this.terminalVisitors.stream().filter(visitor -> visitor.matches(terminalNode.getSymbol()))
-                .forEach(visitor -> visitor.enter(terminalNode.getSymbol()));
-    }
-
-    @Override
-    public void visitErrorNode(ErrorNode errorNode) {
-        // does nothing, because we do not handle error nodes right now.
+    void visitTerminal(HandlerData<Token> handlerData) {
+        this.terminalVisitors.stream().filter(visitor -> visitor.matches(handlerData.entity())).forEach(visitor -> visitor.enter(handlerData));
     }
 
-    @Override
-    public void enterEveryRule(ParserRuleContext rule) {
-        this.contextVisitors.stream().filter(visitor -> visitor.matches(rule)).forEach(visitor -> visitor.enter(rule));
+    void enterEveryRule(HandlerData<ParserRuleContext> handlerData) {
+        this.contextVisitors.stream().filter(visitor -> visitor.matches(handlerData.entity())).forEach(visitor -> visitor.enter(handlerData));
     }
 
-    @Override
-    public void exitEveryRule(ParserRuleContext rule) {
-        this.contextVisitors.stream().filter(visitor -> visitor.matches(rule)).forEach(visitor -> visitor.exit(rule));
+    void exitEveryRule(HandlerData<ParserRuleContext> handlerData) {
+        this.contextVisitors.stream().filter(visitor -> visitor.matches(handlerData.entity())).forEach(visitor -> visitor.exit(handlerData));
     }
 
     /**
@@ -129,7 +91,7 @@ public void exitEveryRule(ParserRuleContext rule) {
      * @return an ancestor of the specified type, or null if not found.
      */
     @SafeVarargs
-    protected final <T extends ParserRuleContext> T getAncestor(ParserRuleContext context, Class<T> ancestor,
+    protected static <T extends ParserRuleContext> T getAncestor(ParserRuleContext context, Class<T> ancestor,
             Class<? extends ParserRuleContext>... stops) {
         ParserRuleContext currentContext = context;
         Set<Class<? extends ParserRuleContext>> forbidden = Set.of(stops);
@@ -156,7 +118,7 @@ protected final <T extends ParserRuleContext> T getAncestor(ParserRuleContext co
      * @see #getAncestor(ParserRuleContext, Class, Class[])
      */
     @SafeVarargs
-    protected final boolean hasAncestor(ParserRuleContext context, Class<? extends ParserRuleContext> parent,
+    protected static boolean hasAncestor(ParserRuleContext context, Class<? extends ParserRuleContext> parent,
             Class<? extends ParserRuleContext>... stops) {
         return getAncestor(context, parent, stops) != null;
     }
@@ -168,7 +130,7 @@ protected final boolean hasAncestor(ParserRuleContext context, Class<? extends P
      * @param <T> the type to search for.
      * @return the first appearance of an element of the given type in the subtree, or null if no such element exists.
      */
-    protected final <T extends ParserRuleContext> T getDescendant(ParserRuleContext context, Class<T> descendant) {
+    protected static <T extends ParserRuleContext> T getDescendant(ParserRuleContext context, Class<T> descendant) {
         // simple iterative bfs
         ArrayDeque<ParserRuleContext> queue = new ArrayDeque<>();
         queue.add(context);
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrParserAdapter.java b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrParserAdapter.java
index 172aa45fd..21f0d516f 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrParserAdapter.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrParserAdapter.java
@@ -71,11 +71,9 @@ private void parseFile(File file, TokenCollector collector) throws ParsingExcept
             Lexer lexer = this.createLexer(CharStreams.fromReader(reader));
             CommonTokenStream tokenStream = new CommonTokenStream(lexer);
             T parser = this.createParser(tokenStream);
-
             ParserRuleContext entryContext = this.getEntryContext(parser);
             ParseTreeWalker treeWalker = new ParseTreeWalker();
-
-            AbstractAntlrListener listener = this.createListener(collector, file);
+            InternalListener listener = new InternalListener(this.getListener(), collector);
             for (ParseTree child : entryContext.children) {
                 treeWalker.walk(listener, child);
             }
@@ -106,10 +104,7 @@ private void parseFile(File file, TokenCollector collector) throws ParsingExcept
     protected abstract ParserRuleContext getEntryContext(T parser);
 
     /**
-     * Creates the listener
-     * @param collector The token collector
-     * @param currentFile The current file
-     * @return The parser
+     * @return The listener. Should be created once statically since it never changes.
      */
-    protected abstract AbstractAntlrListener createListener(TokenCollector collector, File currentFile);
+    protected abstract AbstractAntlrListener getListener();
 }
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractVisitor.java b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractVisitor.java
index 66621452a..32e318ebe 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractVisitor.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractVisitor.java
@@ -2,10 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
+import java.util.function.*;
 
 import org.antlr.v4.runtime.Token;
 
@@ -19,21 +16,25 @@
  */
 public abstract class AbstractVisitor<T> {
     private final Predicate<T> condition;
-    private final List<Consumer<T>> entryHandlers;
-    private final TokenCollector tokenCollector;
+    private final List<Consumer<HandlerData<T>>> entryHandlers;
     private Function<T, CodeSemantics> semanticsSupplier;
-    VariableRegistry variableRegistry;  // used in ContextVisitor
 
     /**
      * @param condition The condition for the visit.
-     * @param tokenCollector The used token collector.
-     * @param variableRegistry The used variable registry.
      */
-    AbstractVisitor(Predicate<T> condition, TokenCollector tokenCollector, VariableRegistry variableRegistry) {
+    AbstractVisitor(Predicate<T> condition) {
         this.condition = condition;
-        this.tokenCollector = tokenCollector;
         this.entryHandlers = new ArrayList<>();
-        this.variableRegistry = variableRegistry;
+    }
+
+    /**
+     * Add an action the visitor runs upon entering the entity.
+     * @param handler The action, takes the entity and the variable registry as parameter.
+     * @return Self
+     */
+    public AbstractVisitor<T> onEnter(BiConsumer<T, VariableRegistry> handler) {
+        entryHandlers.add(handlerData -> handler.accept(handlerData.entity(), handlerData.variableRegistry()));
+        return this;
     }
 
     /**
@@ -42,7 +43,7 @@ public abstract class AbstractVisitor<T> {
      * @return Self
      */
     public AbstractVisitor<T> onEnter(Consumer<T> handler) {
-        this.entryHandlers.add(handler);
+        entryHandlers.add(handlerData -> handler.accept(handlerData.entity()));
         return this;
     }
 
@@ -101,21 +102,22 @@ public AbstractVisitor<T> withControlSemantics() {
 
     /**
      * @param entity The entity to check.
-     * @return Whether the visitor should be visited.
+     * @return Whether to visit the entity.
      */
     boolean matches(T entity) {
         return this.condition.test(entity);
     }
 
-    void enter(T entity) {
-        entryHandlers.forEach(handler -> handler.accept(entity));
-    }
-
-    void exit(T entity) {
+    /**
+     * Enter a given entity, injecting the needed dependencies.
+     */
+    void enter(HandlerData<T> handlerData) {
+        entryHandlers.forEach(handler -> handler.accept(handlerData));
     }
 
-    void map(List<Consumer<T>> handlers, TokenType tokenType, Function<T, Token> extractToken) {
-        handlers.add(0, value -> tokenCollector.addToken(tokenType, semanticsSupplier, value, extractToken, variableRegistry));
+    void map(List<Consumer<HandlerData<T>>> handlers, TokenType tokenType, Function<T, Token> extractToken) {
+        handlers.add(0, handlerData -> handlerData.collector().addToken(tokenType, semanticsSupplier, handlerData.entity(), extractToken,
+                handlerData.variableRegistry()));
     }
 
     abstract Token extractEnterToken(T entity);
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/ContextVisitor.java b/language-antlr-utils/src/main/java/de/jplag/antlr/ContextVisitor.java
index baf8f971d..e860684e8 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/ContextVisitor.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/ContextVisitor.java
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
@@ -16,20 +17,30 @@
  * @param <T> The antlr type of the node.
  */
 public class ContextVisitor<T extends ParserRuleContext> extends AbstractVisitor<T> {
-    private final List<Consumer<T>> exitHandlers;
+    private final List<Consumer<HandlerData<T>>> exitHandlers;
 
-    ContextVisitor(Predicate<T> condition, TokenCollector tokenCollector, VariableRegistry variableRegistry) {
-        super(condition, tokenCollector, variableRegistry);
+    ContextVisitor(Predicate<T> condition) {
+        super(condition);
         this.exitHandlers = new ArrayList<>();
     }
 
+    /**
+     * Add an action the visitor runs upon exiting the entity.
+     * @param handler The action, takes the entity and the variable registry as parameter.
+     * @return Self
+     */
+    public AbstractVisitor<T> onExit(BiConsumer<T, VariableRegistry> handler) {
+        exitHandlers.add(handlerData -> handler.accept(handlerData.entity(), handlerData.variableRegistry()));
+        return this;
+    }
+
     /**
      * Add an action the visitor runs upon exiting the entity.
      * @param handler The action, takes the entity as parameter.
      * @return Self
      */
     public AbstractVisitor<T> onExit(Consumer<T> handler) {
-        this.exitHandlers.add(handler);
+        exitHandlers.add(handlerData -> handler.accept(handlerData.entity()));
         return this;
     }
 
@@ -73,8 +84,8 @@ public ContextVisitor<T> map(TokenType enterTokenType, TokenType exitTokenType)
      * @return Self
      */
     public ContextVisitor<T> addLocalScope() {
-        onEnter(ignore -> variableRegistry.enterLocalScope());
-        onExit(ignore -> variableRegistry.exitLocalScope());
+        onEnter((ignore, variableRegistry) -> variableRegistry.enterLocalScope());
+        onExit((ignore, variableRegistry) -> variableRegistry.exitLocalScope());
         return this;
     }
 
@@ -83,14 +94,16 @@ public ContextVisitor<T> addLocalScope() {
      * @return Self
      */
     public ContextVisitor<T> addClassScope() {
-        onEnter(ignore -> variableRegistry.enterClass());
-        onExit(ignore -> variableRegistry.exitClass());
+        onEnter((ignore, variableRegistry) -> variableRegistry.enterClass());
+        onExit((ignore, variableRegistry) -> variableRegistry.exitClass());
         return this;
     }
 
-    @Override
-    void exit(T entity) {
-        exitHandlers.forEach(handler -> handler.accept(entity));
+    /**
+     * Exit a given entity, injecting the needed dependencies.
+     */
+    void exit(HandlerData<T> handlerData) {
+        exitHandlers.forEach(handler -> handler.accept(handlerData));
     }
 
     Token extractEnterToken(T entity) {
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/HandlerData.java b/language-antlr-utils/src/main/java/de/jplag/antlr/HandlerData.java
new file mode 100644
index 000000000..6c1bb4095
--- /dev/null
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/HandlerData.java
@@ -0,0 +1,9 @@
+package de.jplag.antlr;
+
+import de.jplag.semantics.VariableRegistry;
+
+/**
+ * Holds the data passed to the (quasi-static) listeners.
+ */
+record HandlerData<T>(T entity, VariableRegistry variableRegistry, TokenCollector collector) {
+}
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/InternalListener.java b/language-antlr-utils/src/main/java/de/jplag/antlr/InternalListener.java
new file mode 100644
index 000000000..39178e0fb
--- /dev/null
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/InternalListener.java
@@ -0,0 +1,48 @@
+package de.jplag.antlr;
+
+import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.tree.ErrorNode;
+import org.antlr.v4.runtime.tree.ParseTreeListener;
+import org.antlr.v4.runtime.tree.TerminalNode;
+
+import de.jplag.semantics.VariableRegistry;
+
+/**
+ * Internal listener that implements pre-existing antlr methods that are called automatically. This listener is created
+ * for every file.
+ */
+class InternalListener implements ParseTreeListener {
+    private final AbstractAntlrListener listener;
+    private final TokenCollector collector;
+    protected final VariableRegistry variableRegistry;
+
+    InternalListener(AbstractAntlrListener listener, TokenCollector collector) {
+        this.listener = listener;
+        this.collector = collector;
+        this.variableRegistry = new VariableRegistry();
+    }
+
+    @Override
+    public void visitTerminal(TerminalNode terminalNode) {
+        listener.visitTerminal(getHandlerData(terminalNode.getSymbol()));
+    }
+
+    @Override
+    public void enterEveryRule(ParserRuleContext rule) {
+        listener.enterEveryRule(getHandlerData(rule));
+    }
+
+    @Override
+    public void exitEveryRule(ParserRuleContext rule) {
+        listener.exitEveryRule(getHandlerData(rule));
+    }
+
+    @Override
+    public void visitErrorNode(ErrorNode errorNode) {
+        // does nothing, because we do not handle error nodes right now.
+    }
+
+    private <T> HandlerData<T> getHandlerData(T entity) {
+        return new HandlerData<>(entity, variableRegistry, collector);
+    }
+}
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/TerminalVisitor.java b/language-antlr-utils/src/main/java/de/jplag/antlr/TerminalVisitor.java
index e63cbd9b8..170f5d627 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/TerminalVisitor.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/TerminalVisitor.java
@@ -4,15 +4,13 @@
 
 import org.antlr.v4.runtime.Token;
 
-import de.jplag.semantics.VariableRegistry;
-
 /**
  * The visitor for terminals.
  */
 public class TerminalVisitor extends AbstractVisitor<Token> {
 
-    TerminalVisitor(Predicate<org.antlr.v4.runtime.Token> condition, TokenCollector tokenCollector, VariableRegistry variableRegistry) {
-        super(condition, tokenCollector, variableRegistry);
+    TerminalVisitor(Predicate<org.antlr.v4.runtime.Token> condition) {
+        super(condition);
     }
 
     Token extractEnterToken(Token token) {
diff --git a/language-antlr-utils/src/test/java/de/jplag/antlr/testLanguage/TestListener.java b/language-antlr-utils/src/test/java/de/jplag/antlr/testLanguage/TestListener.java
index 51afe2896..6a949d4ab 100644
--- a/language-antlr-utils/src/test/java/de/jplag/antlr/testLanguage/TestListener.java
+++ b/language-antlr-utils/src/test/java/de/jplag/antlr/testLanguage/TestListener.java
@@ -2,25 +2,17 @@
 
 import static de.jplag.antlr.testLanguage.TestTokenType.*;
 
-import java.io.File;
-
-import de.jplag.antlr.AbstractAntlrListener;
-import de.jplag.antlr.TestParser;
+import de.jplag.antlr.*;
 import de.jplag.antlr.TestParser.*;
-import de.jplag.antlr.TokenCollector;
 import de.jplag.semantics.CodeSemantics;
 import de.jplag.semantics.VariableScope;
 
 public class TestListener extends AbstractAntlrListener {
-    /**
-     * New instance
-     * @param collector The token collector
-     * @param currentFile The currently processed file
-     */
-    public TestListener(TokenCollector collector, File currentFile) {
-        super(collector, currentFile, true);
+
+    public TestListener() {
+        super();
         visit(VarDefContext.class).map(VARDEF).withSemantics(CodeSemantics::createKeep)
-                .onEnter(rule -> variableRegistry.registerVariable(rule.VAR_NAME().getText(), VariableScope.FILE, false));
+                .onEnter((rule, variableRegistry) -> variableRegistry.registerVariable(rule.VAR_NAME().getText(), VariableScope.FILE, false));
         visit(CalcExpressionContext.class, rule -> rule.operator() != null && rule.operator().PLUS() != null).map(ADDITION).withControlSemantics();
         visit(OperatorContext.class, rule -> rule.MINUS() != null).map(SUBTRACTION).withControlSemantics();
         visit(SubExpressionContext.class).map(SUB_EXPRESSION_BEGIN, SUB_EXPRESSION_END).addLocalScope().withControlSemantics();
diff --git a/language-antlr-utils/src/test/java/de/jplag/antlr/testLanguage/TestParserAdapter.java b/language-antlr-utils/src/test/java/de/jplag/antlr/testLanguage/TestParserAdapter.java
index 5b292e18d..2f6eb7aca 100644
--- a/language-antlr-utils/src/test/java/de/jplag/antlr/testLanguage/TestParserAdapter.java
+++ b/language-antlr-utils/src/test/java/de/jplag/antlr/testLanguage/TestParserAdapter.java
@@ -1,7 +1,5 @@
 package de.jplag.antlr.testLanguage;
 
-import java.io.File;
-
 import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.Lexer;
@@ -10,6 +8,8 @@
 import de.jplag.antlr.*;
 
 public class TestParserAdapter extends AbstractAntlrParserAdapter<TestParser> {
+    private static final TestListener testListener = new TestListener();
+
     @Override
     protected Lexer createLexer(CharStream input) {
         return new TestLexer(input);
@@ -26,7 +26,7 @@ protected ParserRuleContext getEntryContext(TestParser parser) {
     }
 
     @Override
-    protected AbstractAntlrListener createListener(TokenCollector collector, File currentFile) {
-        return new TestListener(collector, currentFile);
+    protected AbstractAntlrListener getListener() {
+        return testListener;
     }
 }
diff --git a/languages/cpp2/src/main/java/de/jplag/cpp2/CPPListener.java b/languages/cpp2/src/main/java/de/jplag/cpp2/CPPListener.java
index bc2438f7d..acef7b2f1 100644
--- a/languages/cpp2/src/main/java/de/jplag/cpp2/CPPListener.java
+++ b/languages/cpp2/src/main/java/de/jplag/cpp2/CPPListener.java
@@ -2,10 +2,7 @@
 
 import static de.jplag.cpp2.CPPTokenType.*;
 
-import java.io.File;
-
 import de.jplag.antlr.AbstractAntlrListener;
-import de.jplag.antlr.TokenCollector;
 import de.jplag.cpp2.grammar.CPP14Parser;
 import de.jplag.cpp2.grammar.CPP14Parser.*;
 
@@ -18,11 +15,9 @@
 public class CPPListener extends AbstractAntlrListener {
     /**
      * New instance
-     * @param collector The token collector the token will be added to
-     * @param currentFile The currently processed file
      */
-    public CPPListener(TokenCollector collector, File currentFile) {
-        super(collector, currentFile);
+    public CPPListener() {
+        super();
 
         visit(ClassSpecifierContext.class, rule -> rule.classHead().Union() != null).map(UNION_BEGIN, UNION_END);
         visit(ClassSpecifierContext.class, rule -> rule.classHead().classKey() != null && rule.classHead().classKey().Class() != null)
diff --git a/languages/cpp2/src/main/java/de/jplag/cpp2/CPPParserAdapter.java b/languages/cpp2/src/main/java/de/jplag/cpp2/CPPParserAdapter.java
index fc73e2b11..c876023ee 100644
--- a/languages/cpp2/src/main/java/de/jplag/cpp2/CPPParserAdapter.java
+++ b/languages/cpp2/src/main/java/de/jplag/cpp2/CPPParserAdapter.java
@@ -1,7 +1,5 @@
 package de.jplag.cpp2;
 
-import java.io.File;
-
 import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.Lexer;
@@ -10,7 +8,6 @@
 import de.jplag.AbstractParser;
 import de.jplag.antlr.AbstractAntlrListener;
 import de.jplag.antlr.AbstractAntlrParserAdapter;
-import de.jplag.antlr.TokenCollector;
 import de.jplag.cpp2.grammar.CPP14Lexer;
 import de.jplag.cpp2.grammar.CPP14Parser;
 
@@ -18,6 +15,8 @@
  * The adapter between {@link AbstractParser} and the ANTLR based parser of this language module.
  */
 public class CPPParserAdapter extends AbstractAntlrParserAdapter<CPP14Parser> {
+    private static final CPPListener listener = new CPPListener();
+
     @Override
     protected Lexer createLexer(CharStream input) {
         return new CPP14Lexer(input);
@@ -34,7 +33,7 @@ protected ParserRuleContext getEntryContext(CPP14Parser parser) {
     }
 
     @Override
-    protected AbstractAntlrListener createListener(TokenCollector collector, File currentFile) {
-        return new CPPListener(collector, currentFile);
+    protected AbstractAntlrListener getListener() {
+        return listener;
     }
 }
diff --git a/languages/kotlin/src/main/java/de/jplag/kotlin/KotlinListener.java b/languages/kotlin/src/main/java/de/jplag/kotlin/KotlinListener.java
index 9728ec889..b6231b446 100644
--- a/languages/kotlin/src/main/java/de/jplag/kotlin/KotlinListener.java
+++ b/languages/kotlin/src/main/java/de/jplag/kotlin/KotlinListener.java
@@ -93,15 +93,12 @@
 import static de.jplag.kotlin.grammar.KotlinParser.WhenExpressionContext;
 import static de.jplag.kotlin.grammar.KotlinParser.WhileExpressionContext;
 
-import java.io.File;
-
 import de.jplag.antlr.AbstractAntlrListener;
-import de.jplag.antlr.TokenCollector;
 import de.jplag.kotlin.grammar.KotlinParser;
 
 public class KotlinListener extends AbstractAntlrListener {
-    public KotlinListener(TokenCollector collector, File currentFile) {
-        super(collector, currentFile);
+    public KotlinListener() {
+        super();
 
         visit(PackageHeaderContext.class).map(PACKAGE);
         visit(ImportHeaderContext.class).map(IMPORT);
diff --git a/languages/kotlin/src/main/java/de/jplag/kotlin/KotlinParserAdapter.java b/languages/kotlin/src/main/java/de/jplag/kotlin/KotlinParserAdapter.java
index 49537918d..0fed85032 100644
--- a/languages/kotlin/src/main/java/de/jplag/kotlin/KotlinParserAdapter.java
+++ b/languages/kotlin/src/main/java/de/jplag/kotlin/KotlinParserAdapter.java
@@ -1,16 +1,15 @@
 package de.jplag.kotlin;
 
-import java.io.File;
-
 import org.antlr.v4.runtime.*;
 
 import de.jplag.antlr.AbstractAntlrListener;
 import de.jplag.antlr.AbstractAntlrParserAdapter;
-import de.jplag.antlr.TokenCollector;
 import de.jplag.kotlin.grammar.KotlinLexer;
 import de.jplag.kotlin.grammar.KotlinParser;
 
 public class KotlinParserAdapter extends AbstractAntlrParserAdapter<KotlinParser> {
+    private static final KotlinListener listener = new KotlinListener();
+
     @Override
     protected Lexer createLexer(CharStream input) {
         return new KotlinLexer(input);
@@ -27,7 +26,7 @@ protected ParserRuleContext getEntryContext(KotlinParser parser) {
     }
 
     @Override
-    protected AbstractAntlrListener createListener(TokenCollector collector, File currentFile) {
-        return new KotlinListener(collector, currentFile);
+    protected AbstractAntlrListener getListener() {
+        return listener;
     }
 }
diff --git a/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRListener.java b/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRListener.java
index 3a6dfad43..8b247be02 100644
--- a/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRListener.java
+++ b/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRListener.java
@@ -110,10 +110,7 @@
 import static de.jplag.llvmir.grammar.LLVMIRParser.ZExtExprContext;
 import static de.jplag.llvmir.grammar.LLVMIRParser.ZExtInstContext;
 
-import java.io.File;
-
 import de.jplag.antlr.AbstractAntlrListener;
-import de.jplag.antlr.TokenCollector;
 
 /**
  * Extracts tokens from the ANTLR parse tree. The token abstraction includes nesting tokens for functions and basic
@@ -124,11 +121,9 @@ public class LLVMIRListener extends AbstractAntlrListener {
 
     /**
      * New instance
-     * @param collector The token collector the token will be added to
-     * @param currentFile The currently processed file
      */
-    public LLVMIRListener(TokenCollector collector, File currentFile) {
-        super(collector, currentFile);
+    public LLVMIRListener() {
+        super();
 
         visit(SourceFilenameContext.class).map(FILENAME);
         visit(ModuleAsmContext.class).map(ASSEMBLY);
diff --git a/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRParserAdapter.java b/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRParserAdapter.java
index 0d96e301e..edbe94148 100644
--- a/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRParserAdapter.java
+++ b/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRParserAdapter.java
@@ -1,13 +1,10 @@
 package de.jplag.llvmir;
 
-import java.io.File;
-
 import org.antlr.v4.runtime.*;
 
 import de.jplag.AbstractParser;
 import de.jplag.antlr.AbstractAntlrListener;
 import de.jplag.antlr.AbstractAntlrParserAdapter;
-import de.jplag.antlr.TokenCollector;
 import de.jplag.llvmir.grammar.LLVMIRLexer;
 import de.jplag.llvmir.grammar.LLVMIRParser;
 
@@ -15,6 +12,8 @@
  * The adapter between {@link AbstractParser} and the ANTLR based parser of this language module.
  */
 public class LLVMIRParserAdapter extends AbstractAntlrParserAdapter<LLVMIRParser> {
+    private static final LLVMIRListener listener = new LLVMIRListener();
+
     @Override
     protected Lexer createLexer(CharStream input) {
         return new LLVMIRLexer(input);
@@ -31,7 +30,7 @@ protected ParserRuleContext getEntryContext(LLVMIRParser parser) {
     }
 
     @Override
-    protected AbstractAntlrListener createListener(TokenCollector collector, File currentFile) {
-        return new LLVMIRListener(collector, currentFile);
+    protected AbstractAntlrListener getListener() {
+        return listener;
     }
 }

From 889f178f83939561cd03dfc8f3a88a4f425e203b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20Br=C3=B6del?= <moritz.broedel@gmail.com>
Date: Sat, 26 Aug 2023 14:07:20 +0200
Subject: [PATCH 12/57] Fix code smell

---
 .../src/main/java/de/jplag/antlr/AbstractAntlrListener.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java
index db254c61a..c8a2f2931 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java
@@ -18,7 +18,7 @@ public abstract class AbstractAntlrListener {
     private final List<ContextVisitor<ParserRuleContext>> contextVisitors;
     private final List<TerminalVisitor> terminalVisitors;
 
-    public AbstractAntlrListener() {
+    protected AbstractAntlrListener() {
         contextVisitors = new ArrayList<>();
         terminalVisitors = new ArrayList<>();
     }

From 5bcd1edd271d2081ff45a7f53e6d3f133500d6d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20Br=C3=B6del?= <moritz.broedel@gmail.com>
Date: Sat, 26 Aug 2023 14:18:38 +0200
Subject: [PATCH 13/57] Make language listeners package-private

---
 .../java/de/jplag/antlr/testLanguage/TestListener.java    | 5 +++--
 .../cpp2/src/main/java/de/jplag/cpp2/CPPListener.java     | 8 +++-----
 .../src/main/java/de/jplag/kotlin/KotlinListener.java     | 5 +++--
 .../src/main/java/de/jplag/llvmir/LLVMIRListener.java     | 7 ++-----
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/language-antlr-utils/src/test/java/de/jplag/antlr/testLanguage/TestListener.java b/language-antlr-utils/src/test/java/de/jplag/antlr/testLanguage/TestListener.java
index 6a949d4ab..c87e50128 100644
--- a/language-antlr-utils/src/test/java/de/jplag/antlr/testLanguage/TestListener.java
+++ b/language-antlr-utils/src/test/java/de/jplag/antlr/testLanguage/TestListener.java
@@ -7,10 +7,11 @@
 import de.jplag.semantics.CodeSemantics;
 import de.jplag.semantics.VariableScope;
 
-public class TestListener extends AbstractAntlrListener {
+class TestListener extends AbstractAntlrListener {
 
-    public TestListener() {
+    TestListener() {
         super();
+
         visit(VarDefContext.class).map(VARDEF).withSemantics(CodeSemantics::createKeep)
                 .onEnter((rule, variableRegistry) -> variableRegistry.registerVariable(rule.VAR_NAME().getText(), VariableScope.FILE, false));
         visit(CalcExpressionContext.class, rule -> rule.operator() != null && rule.operator().PLUS() != null).map(ADDITION).withControlSemantics();
diff --git a/languages/cpp2/src/main/java/de/jplag/cpp2/CPPListener.java b/languages/cpp2/src/main/java/de/jplag/cpp2/CPPListener.java
index acef7b2f1..c9710635f 100644
--- a/languages/cpp2/src/main/java/de/jplag/cpp2/CPPListener.java
+++ b/languages/cpp2/src/main/java/de/jplag/cpp2/CPPListener.java
@@ -12,11 +12,9 @@
  * <p>
  * Those cases are covered by {@link SimpleTypeSpecifierContext} and {@link SimpleDeclarationContext}
  */
-public class CPPListener extends AbstractAntlrListener {
-    /**
-     * New instance
-     */
-    public CPPListener() {
+class CPPListener extends AbstractAntlrListener {
+
+    CPPListener() {
         super();
 
         visit(ClassSpecifierContext.class, rule -> rule.classHead().Union() != null).map(UNION_BEGIN, UNION_END);
diff --git a/languages/kotlin/src/main/java/de/jplag/kotlin/KotlinListener.java b/languages/kotlin/src/main/java/de/jplag/kotlin/KotlinListener.java
index b6231b446..eaa8c43e2 100644
--- a/languages/kotlin/src/main/java/de/jplag/kotlin/KotlinListener.java
+++ b/languages/kotlin/src/main/java/de/jplag/kotlin/KotlinListener.java
@@ -96,8 +96,9 @@
 import de.jplag.antlr.AbstractAntlrListener;
 import de.jplag.kotlin.grammar.KotlinParser;
 
-public class KotlinListener extends AbstractAntlrListener {
-    public KotlinListener() {
+class KotlinListener extends AbstractAntlrListener {
+
+    KotlinListener() {
         super();
 
         visit(PackageHeaderContext.class).map(PACKAGE);
diff --git a/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRListener.java b/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRListener.java
index 8b247be02..6c4988db6 100644
--- a/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRListener.java
+++ b/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRListener.java
@@ -117,12 +117,9 @@
  * blocks and separate tokens for different elements. These include binary and bitwise instructions, memory operations,
  * terminator instructions, conversions, global variables, type definitions, constants, and others.
  */
-public class LLVMIRListener extends AbstractAntlrListener {
+class LLVMIRListener extends AbstractAntlrListener {
 
-    /**
-     * New instance
-     */
-    public LLVMIRListener() {
+    LLVMIRListener() {
         super();
 
         visit(SourceFilenameContext.class).map(FILENAME);

From a1f34b25c2414937e45ced8096f24ba9d3a92c8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20Br=C3=B6del?= <moritz.broedel@gmail.com>
Date: Sat, 26 Aug 2023 14:50:15 +0200
Subject: [PATCH 14/57] Add withLoopSemantics

---
 .../java/de/jplag/antlr/AbstractVisitor.java  | 14 ++++----
 .../java/de/jplag/antlr/ContextVisitor.java   | 34 ++++++++++++++++---
 2 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractVisitor.java b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractVisitor.java
index 32e318ebe..88edba2eb 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractVisitor.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractVisitor.java
@@ -17,7 +17,7 @@
 public abstract class AbstractVisitor<T> {
     private final Predicate<T> condition;
     private final List<Consumer<HandlerData<T>>> entryHandlers;
-    private Function<T, CodeSemantics> semanticsSupplier;
+    private Function<T, CodeSemantics> entrySemantics;
 
     /**
      * @param condition The condition for the visit.
@@ -53,7 +53,7 @@ public AbstractVisitor<T> onEnter(Consumer<T> handler) {
      * @return Self
      */
     public AbstractVisitor<T> mapEnter(TokenType tokenType) {
-        map(entryHandlers, tokenType, this::extractEnterToken);
+        map(entryHandlers, tokenType, entrySemantics, this::extractEnterToken);
         return this;
     }
 
@@ -75,7 +75,7 @@ public AbstractVisitor<T> map(TokenType tokenType) {
      * @return Self
      */
     public AbstractVisitor<T> withSemantics(Function<T, CodeSemantics> semanticsSupplier) {
-        this.semanticsSupplier = semanticsSupplier;
+        this.entrySemantics = semanticsSupplier;
         return this;
     }
 
@@ -86,7 +86,7 @@ public AbstractVisitor<T> withSemantics(Function<T, CodeSemantics> semanticsSupp
      * @return Self
      */
     public AbstractVisitor<T> withSemantics(Supplier<CodeSemantics> semanticsSupplier) {
-        this.semanticsSupplier = ignore -> semanticsSupplier.get();
+        this.entrySemantics = ignore -> semanticsSupplier.get();
         return this;
     }
 
@@ -96,7 +96,7 @@ public AbstractVisitor<T> withSemantics(Supplier<CodeSemantics> semanticsSupplie
      * @return Self
      */
     public AbstractVisitor<T> withControlSemantics() {
-        this.semanticsSupplier = ignore -> CodeSemantics.createControl();
+        withSemantics(CodeSemantics::createControl);
         return this;
     }
 
@@ -115,8 +115,8 @@ void enter(HandlerData<T> handlerData) {
         entryHandlers.forEach(handler -> handler.accept(handlerData));
     }
 
-    void map(List<Consumer<HandlerData<T>>> handlers, TokenType tokenType, Function<T, Token> extractToken) {
-        handlers.add(0, handlerData -> handlerData.collector().addToken(tokenType, semanticsSupplier, handlerData.entity(), extractToken,
+    void map(List<Consumer<HandlerData<T>>> handlers, TokenType tokenType, Function<T, CodeSemantics> semantics, Function<T, Token> extractToken) {
+        handlers.add(0, handlerData -> handlerData.collector().addToken(tokenType, semantics, handlerData.entity(), extractToken,
                 handlerData.variableRegistry()));
     }
 
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/ContextVisitor.java b/language-antlr-utils/src/main/java/de/jplag/antlr/ContextVisitor.java
index e860684e8..2f8a7d1a0 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/ContextVisitor.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/ContextVisitor.java
@@ -2,14 +2,13 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
+import java.util.function.*;
 
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.Token;
 
 import de.jplag.TokenType;
+import de.jplag.semantics.CodeSemantics;
 import de.jplag.semantics.VariableRegistry;
 
 /**
@@ -18,6 +17,7 @@
  */
 public class ContextVisitor<T extends ParserRuleContext> extends AbstractVisitor<T> {
     private final List<Consumer<HandlerData<T>>> exitHandlers;
+    private Function<T, CodeSemantics> exitSemantics;
 
     ContextVisitor(Predicate<T> condition) {
         super(condition);
@@ -50,7 +50,7 @@ public AbstractVisitor<T> onExit(Consumer<T> handler) {
      * @return Self
      */
     public ContextVisitor<T> mapExit(TokenType tokenType) {
-        map(exitHandlers, tokenType, ParserRuleContext::getStop);
+        map(exitHandlers, tokenType, exitSemantics, ParserRuleContext::getStop);
         return this;
     }
 
@@ -79,6 +79,32 @@ public ContextVisitor<T> map(TokenType enterTokenType, TokenType exitTokenType)
         return this;
     }
 
+    @Override
+    public ContextVisitor<T> withSemantics(Function<T, CodeSemantics> semantics) {
+        super.withSemantics(semantics);
+        this.exitSemantics = semantics;
+        return this;
+    }
+
+    @Override
+    public ContextVisitor<T> withSemantics(Supplier<CodeSemantics> semantics) {
+        super.withSemantics(semantics);
+        this.exitSemantics = ignore -> semantics.get();
+        return this;
+    }
+
+    /**
+     * Tell the visitor that if it generates a token upon entering the entity, it should have semantics of type loop begin,
+     * same for the exit and loop end. If it doesn't generate a token, the semantics are discarded. This is not checked and
+     * does not lead to a warning.
+     * @return Self
+     */
+    public ContextVisitor<T> withLoopSemantics() {
+        super.withSemantics(CodeSemantics::createLoopBegin);
+        this.exitSemantics = ignore -> CodeSemantics.createLoopEnd();
+        return this;
+    }
+
     /**
      * Tell the visitor that the entity represents a local scope.
      * @return Self

From 468dfd6eb430c830fad0000c25bb51ac2978b9ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20Br=C3=B6del?= <moritz.broedel@gmail.com>
Date: Sat, 26 Aug 2023 15:01:44 +0200
Subject: [PATCH 15/57] Add tokens directly instead of using a handler

---
 .../java/de/jplag/antlr/AbstractAntlrListener.java  | 12 ++++++------
 .../main/java/de/jplag/antlr/AbstractVisitor.java   | 13 +++++++------
 .../main/java/de/jplag/antlr/ContextVisitor.java    |  8 +++++---
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java
index c8a2f2931..fc6a2d11f 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java
@@ -70,16 +70,16 @@ public TerminalVisitor visit(int terminalType) {
         return visit(terminalType, ignore -> true);
     }
 
-    void visitTerminal(HandlerData<Token> handlerData) {
-        this.terminalVisitors.stream().filter(visitor -> visitor.matches(handlerData.entity())).forEach(visitor -> visitor.enter(handlerData));
+    void visitTerminal(HandlerData<Token> data) {
+        this.terminalVisitors.stream().filter(visitor -> visitor.matches(data.entity())).forEach(visitor -> visitor.enter(data));
     }
 
-    void enterEveryRule(HandlerData<ParserRuleContext> handlerData) {
-        this.contextVisitors.stream().filter(visitor -> visitor.matches(handlerData.entity())).forEach(visitor -> visitor.enter(handlerData));
+    void enterEveryRule(HandlerData<ParserRuleContext> data) {
+        this.contextVisitors.stream().filter(visitor -> visitor.matches(data.entity())).forEach(visitor -> visitor.enter(data));
     }
 
-    void exitEveryRule(HandlerData<ParserRuleContext> handlerData) {
-        this.contextVisitors.stream().filter(visitor -> visitor.matches(handlerData.entity())).forEach(visitor -> visitor.exit(handlerData));
+    void exitEveryRule(HandlerData<ParserRuleContext> data) {
+        this.contextVisitors.stream().filter(visitor -> visitor.matches(data.entity())).forEach(visitor -> visitor.exit(data));
     }
 
     /**
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractVisitor.java b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractVisitor.java
index 88edba2eb..839180227 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractVisitor.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractVisitor.java
@@ -17,6 +17,7 @@
 public abstract class AbstractVisitor<T> {
     private final Predicate<T> condition;
     private final List<Consumer<HandlerData<T>>> entryHandlers;
+    private TokenType entryTokenType;
     private Function<T, CodeSemantics> entrySemantics;
 
     /**
@@ -53,7 +54,7 @@ public AbstractVisitor<T> onEnter(Consumer<T> handler) {
      * @return Self
      */
     public AbstractVisitor<T> mapEnter(TokenType tokenType) {
-        map(entryHandlers, tokenType, entrySemantics, this::extractEnterToken);
+        entryTokenType = tokenType;
         return this;
     }
 
@@ -111,13 +112,13 @@ boolean matches(T entity) {
     /**
      * Enter a given entity, injecting the needed dependencies.
      */
-    void enter(HandlerData<T> handlerData) {
-        entryHandlers.forEach(handler -> handler.accept(handlerData));
+    void enter(HandlerData<T> data) {
+        addToken(data, entryTokenType, entrySemantics, this::extractEnterToken);
+        entryHandlers.forEach(handler -> handler.accept(data));
     }
 
-    void map(List<Consumer<HandlerData<T>>> handlers, TokenType tokenType, Function<T, CodeSemantics> semantics, Function<T, Token> extractToken) {
-        handlers.add(0, handlerData -> handlerData.collector().addToken(tokenType, semantics, handlerData.entity(), extractToken,
-                handlerData.variableRegistry()));
+    void addToken(HandlerData<T> data, TokenType tokenType, Function<T, CodeSemantics> semantics, Function<T, Token> extractToken) {
+        data.collector().addToken(tokenType, semantics, data.entity(), extractToken, data.variableRegistry());
     }
 
     abstract Token extractEnterToken(T entity);
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/ContextVisitor.java b/language-antlr-utils/src/main/java/de/jplag/antlr/ContextVisitor.java
index 2f8a7d1a0..5a0060aa7 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/ContextVisitor.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/ContextVisitor.java
@@ -17,6 +17,7 @@
  */
 public class ContextVisitor<T extends ParserRuleContext> extends AbstractVisitor<T> {
     private final List<Consumer<HandlerData<T>>> exitHandlers;
+    private TokenType exitToken;
     private Function<T, CodeSemantics> exitSemantics;
 
     ContextVisitor(Predicate<T> condition) {
@@ -50,7 +51,7 @@ public AbstractVisitor<T> onExit(Consumer<T> handler) {
      * @return Self
      */
     public ContextVisitor<T> mapExit(TokenType tokenType) {
-        map(exitHandlers, tokenType, exitSemantics, ParserRuleContext::getStop);
+        exitToken = tokenType;
         return this;
     }
 
@@ -128,8 +129,9 @@ public ContextVisitor<T> addClassScope() {
     /**
      * Exit a given entity, injecting the needed dependencies.
      */
-    void exit(HandlerData<T> handlerData) {
-        exitHandlers.forEach(handler -> handler.accept(handlerData));
+    void exit(HandlerData<T> data) {
+        addToken(data, exitToken, exitSemantics, ParserRuleContext::getStop);
+        exitHandlers.forEach(handler -> handler.accept(data));
     }
 
     Token extractEnterToken(T entity) {

From 3dad69d3ed6a0b9cac9d4a68f8dbba893c98e783 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20Br=C3=B6del?= <moritz.broedel@gmail.com>
Date: Mon, 28 Aug 2023 11:46:26 +0200
Subject: [PATCH 16/57] Fix bug, add warning

---
 .../java/de/jplag/antlr/AbstractAntlrListener.java     | 10 ++++++++++
 .../src/main/java/de/jplag/antlr/AbstractVisitor.java  |  9 +++------
 .../src/main/java/de/jplag/antlr/ContextVisitor.java   |  3 +--
 .../src/main/java/de/jplag/antlr/TokenCollector.java   |  5 +++++
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java
index fc6a2d11f..a1ea6ebdb 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java
@@ -9,6 +9,7 @@
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.ParseTree;
+import org.antlr.v4.runtime.tree.TerminalNode;
 
 /**
  * Base class for Antlr listeners. This is a quasi-static class that is only created once per language. Use by
@@ -70,14 +71,23 @@ public TerminalVisitor visit(int terminalType) {
         return visit(terminalType, ignore -> true);
     }
 
+    /**
+     * Called by {@link InternalListener#visitTerminal(TerminalNode)} as part of antlr framework.
+     */
     void visitTerminal(HandlerData<Token> data) {
         this.terminalVisitors.stream().filter(visitor -> visitor.matches(data.entity())).forEach(visitor -> visitor.enter(data));
     }
 
+    /**
+     * Called by {@link InternalListener#enterEveryRule(ParserRuleContext)} as part of antlr framework.
+     */
     void enterEveryRule(HandlerData<ParserRuleContext> data) {
         this.contextVisitors.stream().filter(visitor -> visitor.matches(data.entity())).forEach(visitor -> visitor.enter(data));
     }
 
+    /**
+     * Called by {@link InternalListener#exitEveryRule(ParserRuleContext)} as part of antlr framework.
+     */
     void exitEveryRule(HandlerData<ParserRuleContext> data) {
         this.contextVisitors.stream().filter(visitor -> visitor.matches(data.entity())).forEach(visitor -> visitor.exit(data));
     }
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractVisitor.java b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractVisitor.java
index 839180227..cad061e19 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractVisitor.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractVisitor.java
@@ -70,8 +70,7 @@ public AbstractVisitor<T> map(TokenType tokenType) {
     }
 
     /**
-     * Tell the visitor that if it generates a token upon entering the entity, it should have semantics. If it doesn't
-     * generate a token, the semantics are discarded. This is not checked and does not lead to a warning.
+     * Tell the visitor that if it generates a token upon entering the entity, it should have semantics.
      * @param semanticsSupplier A function that takes the entity and returns the semantics.
      * @return Self
      */
@@ -81,8 +80,7 @@ public AbstractVisitor<T> withSemantics(Function<T, CodeSemantics> semanticsSupp
     }
 
     /**
-     * Tell the visitor that if it generates a token upon entering the entity, it should have semantics. If it doesn't
-     * generate a token, the semantics are discarded. This is not checked and does not lead to a warning.
+     * Tell the visitor that if it generates a token upon entering the entity, it should have semantics.
      * @param semanticsSupplier A function that returns the semantics.
      * @return Self
      */
@@ -92,8 +90,7 @@ public AbstractVisitor<T> withSemantics(Supplier<CodeSemantics> semanticsSupplie
     }
 
     /**
-     * Tell the visitor that if it generates a token upon entering the entity, it should have semantics of type control. If
-     * it doesn't generate a token, the semantics are discarded. This is not checked and does not lead to a warning.
+     * Tell the visitor that if it generates a token upon entering the entity, it should have semantics of type control.
      * @return Self
      */
     public AbstractVisitor<T> withControlSemantics() {
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/ContextVisitor.java b/language-antlr-utils/src/main/java/de/jplag/antlr/ContextVisitor.java
index 5a0060aa7..92dd4ae79 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/ContextVisitor.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/ContextVisitor.java
@@ -96,8 +96,7 @@ public ContextVisitor<T> withSemantics(Supplier<CodeSemantics> semantics) {
 
     /**
      * Tell the visitor that if it generates a token upon entering the entity, it should have semantics of type loop begin,
-     * same for the exit and loop end. If it doesn't generate a token, the semantics are discarded. This is not checked and
-     * does not lead to a warning.
+     * same for the exit and loop end.
      * @return Self
      */
     public ContextVisitor<T> withLoopSemantics() {
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/TokenCollector.java b/language-antlr-utils/src/main/java/de/jplag/antlr/TokenCollector.java
index a56b8f35a..d9b063f1c 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/TokenCollector.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/TokenCollector.java
@@ -39,6 +39,11 @@ List<Token> getTokens() {
 
     <T> void addToken(TokenType jplagType, Function<T, CodeSemantics> semanticsSupplier, T entity,
             Function<T, org.antlr.v4.runtime.Token> extractToken, VariableRegistry variableRegistry) {
+        if (jplagType == null) {
+            if (semanticsSupplier != null)
+                logger.warning("Received semantics, but no token type, so no token was generated and the semantics discarded");
+            return;
+        }
         org.antlr.v4.runtime.Token antlrToken = extractToken.apply(entity);
         int line = antlrToken.getLine();
         int column = antlrToken.getCharPositionInLine() + 1;

From cc156ec676febeb388ce981271135f2ba79ae427 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20Br=C3=B6del?= <moritz.broedel@gmail.com>
Date: Mon, 28 Aug 2023 17:19:35 +0200
Subject: [PATCH 17/57] Simplify token collector file update

---
 .../de/jplag/antlr/AbstractAntlrParserAdapter.java | 14 ++++----------
 .../main/java/de/jplag/antlr/TokenCollector.java   | 14 ++++++--------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrParserAdapter.java b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrParserAdapter.java
index 21f0d516f..d6582b793 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrParserAdapter.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrParserAdapter.java
@@ -3,7 +3,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.Reader;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
@@ -52,21 +51,15 @@ protected AbstractAntlrParserAdapter() {
      * @throws ParsingException If anything goes wrong
      */
     public List<Token> parse(Set<File> files) throws ParsingException {
-        List<File> filesList = new ArrayList<>(files);
-        if (files.isEmpty())
-            return new ArrayList<>();
-        File firstFile = filesList.remove(0);
-        TokenCollector collector = new TokenCollector(extractsSemantics, firstFile);
-        parseFile(firstFile, collector);
-        for (File file : filesList) {
-            collector.addFileEndToken(file);  // takes the NEXT file
+        TokenCollector collector = new TokenCollector(extractsSemantics);
+        for (File file : files) {
             parseFile(file, collector);
         }
-        collector.addFileEndToken(null);
         return collector.getTokens();
     }
 
     private void parseFile(File file, TokenCollector collector) throws ParsingException {
+        collector.enterFile(file);
         try (Reader reader = FileUtils.openFileReader(file)) {
             Lexer lexer = this.createLexer(CharStreams.fromReader(reader));
             CommonTokenStream tokenStream = new CommonTokenStream(lexer);
@@ -80,6 +73,7 @@ private void parseFile(File file, TokenCollector collector) throws ParsingExcept
         } catch (IOException exception) {
             throw new ParsingException(file, exception.getMessage(), exception);
         }
+        collector.addFileEndToken();
     }
 
     /**
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/TokenCollector.java b/language-antlr-utils/src/main/java/de/jplag/antlr/TokenCollector.java
index d9b063f1c..d82e30155 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/TokenCollector.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/TokenCollector.java
@@ -24,10 +24,9 @@ public class TokenCollector {
     /**
      * @param extractsSemantics If semantics are extracted
      */
-    TokenCollector(boolean extractsSemantics, File initialFile) {
+    TokenCollector(boolean extractsSemantics) {
         this.collected = new ArrayList<>();
         this.extractsSemantics = extractsSemantics;
-        this.file = initialFile;
     }
 
     /**
@@ -63,14 +62,13 @@ <T> void addToken(TokenType jplagType, Function<T, CodeSemantics> semanticsSuppl
         addToken(token);
     }
 
-    /**
-     * Add a file end token.
-     * @param newFile The next file, null if there isn't one.
-     */
-    void addFileEndToken(File newFile) {
+    void enterFile(File newFile) {
+        this.file = newFile;
+    }
+
+    void addFileEndToken() {
         addToken(extractsSemantics ? Token.semanticFileEnd(file) : Token.fileEnd(file));
         // don't need to update semantics because variable registry is new for every file
-        this.file = newFile;
     }
 
     private void addToken(Token token) {

From 5e6e60d2d8b86fe112c0b9f5b3c533720f55e436 Mon Sep 17 00:00:00 2001
From: Alex | Kronox <alexander_vogt@outlook.de>
Date: Sat, 2 Sep 2023 15:49:07 +0200
Subject: [PATCH 18/57] update file handling

---
 report-viewer/src/stores/state.ts             |   1 -
 report-viewer/src/stores/store.ts             |   8 +-
 .../src/utils/fileHandling/FileHandler.ts     |  10 +
 .../src/utils/fileHandling/JsonFileHandler.ts |  24 +++
 .../src/utils/fileHandling/ZipFileHandler.ts  | 106 +++++++++++
 report-viewer/src/views/FileUploadView.vue    | 172 +++---------------
 6 files changed, 174 insertions(+), 147 deletions(-)
 create mode 100644 report-viewer/src/utils/fileHandling/FileHandler.ts
 create mode 100644 report-viewer/src/utils/fileHandling/JsonFileHandler.ts
 create mode 100644 report-viewer/src/utils/fileHandling/ZipFileHandler.ts

diff --git a/report-viewer/src/stores/state.ts b/report-viewer/src/stores/state.ts
index 3aefba738..38bdcd685 100644
--- a/report-viewer/src/stores/state.ts
+++ b/report-viewer/src/stores/state.ts
@@ -59,7 +59,6 @@ export interface LoadConfiguration {
   local: boolean
   zip: boolean
   single: boolean
-  fileString: string
 }
 
 export interface UIState {
diff --git a/report-viewer/src/stores/store.ts b/report-viewer/src/stores/store.ts
index d6df2b4c2..dc4190379 100644
--- a/report-viewer/src/stores/store.ts
+++ b/report-viewer/src/stores/store.ts
@@ -153,7 +153,13 @@ const store = defineStore('store', {
       this.state.localModeUsed = payload.local
       this.state.zipModeUsed = payload.zip
       this.state.singleModeUsed = payload.single
-      this.state.singleFillRawContent = payload.fileString
+    },
+    /**
+     * Sets the raw content of the single file mode
+     * @param payload Raw content of the single file mode
+     */
+    setSingleFileRawContent(payload: string) {
+      this.state.singleFillRawContent = payload
     },
     /**
      * Switches whether darkMode is being used for the UI
diff --git a/report-viewer/src/utils/fileHandling/FileHandler.ts b/report-viewer/src/utils/fileHandling/FileHandler.ts
new file mode 100644
index 000000000..bd55ed100
--- /dev/null
+++ b/report-viewer/src/utils/fileHandling/FileHandler.ts
@@ -0,0 +1,10 @@
+/**
+ * Abstract base class for handling files.
+ */
+export abstract class FileHandler {
+  /**
+   * Loads the content of the given file and stores it in the store.
+   * @param file File to handle
+   */
+  public abstract handleFile(file: Blob): Promise<any>
+}
diff --git a/report-viewer/src/utils/fileHandling/JsonFileHandler.ts b/report-viewer/src/utils/fileHandling/JsonFileHandler.ts
new file mode 100644
index 000000000..a7fe0965f
--- /dev/null
+++ b/report-viewer/src/utils/fileHandling/JsonFileHandler.ts
@@ -0,0 +1,24 @@
+import { store } from '@/stores/store'
+import { FileHandler } from './FileHandler'
+
+/**
+ * Class for handling single json files.
+ */
+export class JsonFileHandler extends FileHandler {
+  public async handleFile(
+    file: Blob
+  ): Promise<{ fileType: 'overview' } | { fileType: 'comparison'; id1: string; id2: string }> {
+    const content = await file.text()
+    console.log(content)
+    const json = JSON.parse(content)
+
+    store().setSingleFileRawContent(content)
+    if (json['submission_folder_path']) {
+      return { fileType: 'overview' }
+    } else if (json['id1'] && json['id2']) {
+      return { fileType: 'comparison', id1: json['id1'], id2: json['id2'] }
+    } else {
+      throw new Error(`Invalid JSON: ${json}`)
+    }
+  }
+}
diff --git a/report-viewer/src/utils/fileHandling/ZipFileHandler.ts b/report-viewer/src/utils/fileHandling/ZipFileHandler.ts
new file mode 100644
index 000000000..38efa840d
--- /dev/null
+++ b/report-viewer/src/utils/fileHandling/ZipFileHandler.ts
@@ -0,0 +1,106 @@
+import { store } from '@/stores/store'
+import jszip from 'jszip'
+import slash from 'slash'
+import { FileHandler } from './FileHandler'
+
+/**
+ * Class for handling zip files.
+ */
+export class ZipFileHandler extends FileHandler {
+  public async handleFile(file: Blob): Promise<void> {
+    console.log('Start handling zip file and storing necessary data...')
+    return jszip.loadAsync(file).then(async (zip) => {
+      for (const originalFileName of Object.keys(zip.files)) {
+        const unixFileName = slash(originalFileName)
+        if (
+          /((.+\/)*)(files|submissions)\/(.+)\/(.+)/.test(unixFileName) &&
+          !/^__MACOSX\//.test(unixFileName)
+        ) {
+          const directoryPath = unixFileName.substring(0, unixFileName.lastIndexOf('/'))
+          const fileBase = unixFileName.substring(unixFileName.lastIndexOf('/') + 1)
+
+          const submissionFileName = this.extractSubmissionFileName(directoryPath)
+          const fullPathFileName = this.extractFileNameWithFullPath(
+            directoryPath,
+            fileBase,
+            originalFileName
+          )
+          await zip.files[originalFileName].async('string').then((data) => {
+            store().saveSubmissionFile({
+              name: slash(submissionFileName),
+              file: { fileName: slash(fullPathFileName), data: data }
+            })
+          })
+        } else {
+          await zip.files[originalFileName].async('string').then((data) => {
+            store().saveFile({ fileName: unixFileName, data: data })
+          })
+        }
+      }
+    })
+  }
+
+  /**
+   * Extracts the submission file name from the given directory path.
+   * @param directoryPath Path to extract the submission file name from.
+   */
+  private extractSubmissionFileName(directoryPath: string) {
+    const folders = directoryPath.split('/')
+    const rootName = folders[0]
+    let submissionFolderIndex = -1
+    if (rootName === 'files') {
+      submissionFolderIndex = folders.findIndex((folder) => folder === 'files')
+    } else {
+      submissionFolderIndex = folders.findIndex((folder) => folder === 'submissions')
+    }
+    return folders[submissionFolderIndex + 1]
+  }
+
+  /**
+   * Gets the full path of the file
+   * @param directoryPath Path to the file
+   * @param fileBase Name of the file
+   * @param originalFileName Original name of the file
+   */
+  private extractFileNameWithFullPath(
+    directoryPath: string,
+    fileBase: string,
+    originalFileName: string
+  ) {
+    let fullPath = ''
+    const rootName = this.extractRootName(directoryPath)
+    const filesOrSubmissionsIndex_filePath = directoryPath.indexOf(
+      rootName === 'files' ? 'files' : 'submissions'
+    )
+    const filesOrSubmissionsIndex_originalFileName = originalFileName.indexOf(
+      rootName === 'files' ? 'files' : 'submissions'
+    )
+    const unixSubfolderPathAfterSubmissions = directoryPath.substring(
+      filesOrSubmissionsIndex_filePath +
+        (rootName === 'files' ? 'files'.length : 'submissions'.length) +
+        1
+    )
+    const originalPathWithoutSubmissions = originalFileName.substring(
+      filesOrSubmissionsIndex_originalFileName +
+        (rootName === 'files' ? 'files'.length : 'submissions'.length)
+    )
+    if (originalPathWithoutSubmissions.charAt(0) === '\\') {
+      fullPath = unixSubfolderPathAfterSubmissions + '\\' + fileBase
+      while (fullPath.includes('/')) {
+        fullPath = fullPath.replace('/', '\\')
+      }
+    } else {
+      fullPath = unixSubfolderPathAfterSubmissions + '/' + fileBase
+    }
+    return fullPath
+  }
+
+  /**
+   * Gets the root name of the given directory path.
+   * @param directoryPath Path to extract the root name from.
+   */
+  private extractRootName(directoryPath: string) {
+    const folders = directoryPath.split('/')
+    return folders[0]
+  }
+}
diff --git a/report-viewer/src/views/FileUploadView.vue b/report-viewer/src/views/FileUploadView.vue
index be693d572..51e6a0d8e 100644
--- a/report-viewer/src/views/FileUploadView.vue
+++ b/report-viewer/src/views/FileUploadView.vue
@@ -50,14 +50,12 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 import { useRoute } from 'vue-router'
-import jszip from 'jszip'
 import { router } from '@/router'
 import { store } from '@/stores/store'
-import slash from 'slash'
 import Button from '@/components/ButtonComponent.vue'
 import VersionInfoComponent from '@/components/VersionInfoComponent.vue'
-
-class LoadError extends Error {}
+import { JsonFileHandler } from '@/utils/fileHandling/JsonFileHandler'
+import { ZipFileHandler } from '@/utils/fileHandling/ZipFileHandler'
 
 store().clearStore()
 const hasLocalFile = ref(false)
@@ -102,138 +100,21 @@ function navigateToComparisonView(firstId: string, secondId: string) {
   })
 }
 
-/**
- * Gets the root name of the given directory path.
- * @param directoryPath Path to extract the root name from.
- */
-function extractRootName(directoryPath: string) {
-  const folders = directoryPath.split('/')
-  return folders[0]
-}
-
-/**
- * Extracts the submission file name from the given directory path.
- * @param directoryPath Path to extract the submission file name from.
- */
-function extractSubmissionFileName(directoryPath: string) {
-  const folders = directoryPath.split('/')
-  const rootName = folders[0]
-  let submissionFolderIndex = -1
-  if (rootName === 'files') {
-    submissionFolderIndex = folders.findIndex((folder) => folder === 'files')
-  } else {
-    submissionFolderIndex = folders.findIndex((folder) => folder === 'submissions')
-  }
-  return folders[submissionFolderIndex + 1]
-}
-
-/**
- * Gets the full path of the file
- * @param directoryPath Path to the file
- * @param fileBase Name of the file
- * @param originalFileName Original name of the file
- */
-function extractFileNameWithFullPath(
-  directoryPath: string,
-  fileBase: string,
-  originalFileName: string
-) {
-  let fullPath = ''
-  const rootName = extractRootName(directoryPath)
-  const filesOrSubmissionsIndex_filePath = directoryPath.indexOf(
-    rootName === 'files' ? 'files' : 'submissions'
-  )
-  const filesOrSubmissionsIndex_originalFileName = originalFileName.indexOf(
-    rootName === 'files' ? 'files' : 'submissions'
-  )
-  const unixSubfolderPathAfterSubmissions = directoryPath.substring(
-    filesOrSubmissionsIndex_filePath +
-      (rootName === 'files' ? 'files'.length : 'submissions'.length) +
-      1
-  )
-  const originalPathWithoutSubmissions = originalFileName.substring(
-    filesOrSubmissionsIndex_originalFileName +
-      (rootName === 'files' ? 'files'.length : 'submissions'.length)
-  )
-  if (originalPathWithoutSubmissions.charAt(0) === '\\') {
-    fullPath = unixSubfolderPathAfterSubmissions + '\\' + fileBase
-    while (fullPath.includes('/')) {
-      fullPath = fullPath.replace('/', '\\')
-    }
-  } else {
-    fullPath = unixSubfolderPathAfterSubmissions + '/' + fileBase
-  }
-  return fullPath
-}
-
-/**
- * Handles zip file on drop. It extracts the zip and saves each file in the store.
- * @param file Zip file to handle
- */
-async function handleZipFile(file: Blob) {
-  console.log('Start handling zip file and storing necessary data...')
-  return jszip.loadAsync(file).then(async (zip) => {
-    for (const originalFileName of Object.keys(zip.files)) {
-      const unixFileName = slash(originalFileName)
-      if (
-        /((.+\/)*)(files|submissions)\/(.+)\/(.+)/.test(unixFileName) &&
-        !/^__MACOSX\//.test(unixFileName)
-      ) {
-        const directoryPath = unixFileName.substring(0, unixFileName.lastIndexOf('/'))
-        const fileBase = unixFileName.substring(unixFileName.lastIndexOf('/') + 1)
-
-        const submissionFileName = extractSubmissionFileName(directoryPath)
-        const fullPathFileName = extractFileNameWithFullPath(
-          directoryPath,
-          fileBase,
-          originalFileName
-        )
-        await zip.files[originalFileName].async('string').then((data) => {
-          store().saveSubmissionFile({
-            name: slash(submissionFileName),
-            file: { fileName: slash(fullPathFileName), data: data }
-          })
-        })
-      } else {
-        await zip.files[originalFileName].async('string').then((data) => {
-          store().saveFile({ fileName: unixFileName, data: data })
-        })
-      }
-    }
-    store().setLoadingType({
-      local: false,
-      zip: true,
-      single: false,
-      fileString: ''
-    })
-    navigateToOverview()
-  })
-}
-
 /**
  * Handles a json file on drop. It read the file and passes the file string to next window.
- * @param str Content of the json file
+ * @param file The json file to handle
  */
-function handleJsonFile(str: string) {
-  let json = JSON.parse(str)
-  if (json['submission_folder_path']) {
-    store().setLoadingType({
-      local: false,
-      zip: false,
-      single: true,
-      fileString: str
-    })
+async function handleJsonFile(file: Blob) {
+  store().setLoadingType({
+    local: false,
+    zip: false,
+    single: true
+  })
+  const fileContentType = await new JsonFileHandler().handleFile(file)
+  if (fileContentType.fileType === 'overview') {
     navigateToOverview()
-  } else if (json['id1'] && json['id2']) {
-    store().setLoadingType({
-      local: false,
-      zip: false,
-      single: true,
-      fileString: str
-    })
-    navigateToComparisonView(json['id1'], json['id2'])
-  } else {
-    throw new LoadError(`Invalid JSON: ${json}`)
+  } else if (fileContentType.fileType === 'comparison') {
+    navigateToComparisonView(fileContentType.id1, fileContentType.id2)
   }
 }
 
@@ -248,11 +129,17 @@ async function handleFile(file: Blob) {
     case 'application/zip-compressed':
     case 'application/x-zip-compressed':
     case 'application/x-zip':
-      return handleZipFile(file)
+      store().setLoadingType({
+        local: false,
+        zip: true,
+        single: false
+      })
+      await new ZipFileHandler().handleFile(file)
+      return navigateToOverview()
     case 'application/json':
-      return file.text().then(handleJsonFile)
+      return await handleJsonFile(file)
     default:
-      throw new LoadError(`Unknown MIME type '${file.type}'`)
+      throw new Error(`Unknown MIME type '${file.type}'`)
   }
 }
 
@@ -266,15 +153,11 @@ async function uploadFileOnDrag(e: DragEvent) {
     if (dropped?.length === 1) {
       await handleFile(dropped[0])
     } else {
-      throw new LoadError('Not exactly one file')
+      throw new Error('Not exactly one file')
     }
   } catch (e) {
-    if (e instanceof LoadError) {
-      console.warn(e)
-      alert(e.message)
-    } else {
-      throw e
-    }
+    alert((e as Error).message)
+    throw e
   }
 }
 
@@ -304,7 +187,7 @@ async function loadQueryFile(url: URL) {
   try {
     const response = await fetch(url)
     if (!response.ok) {
-      throw new LoadError('Response not OK')
+      throw new Error('Response not OK')
     }
     await handleFile(await response.blob())
   } catch (e) {
@@ -320,8 +203,7 @@ function continueWithLocal() {
   store().setLoadingType({
     local: true,
     zip: false,
-    single: false,
-    fileString: ''
+    single: false
   })
   navigateToOverview()
 }

From c7575677fe866b40fab2b5cfe6543a06eb12c4d4 Mon Sep 17 00:00:00 2001
From: Alex | Kronox <alexander_vogt@outlook.de>
Date: Sat, 2 Sep 2023 17:33:51 +0200
Subject: [PATCH 19/57] local zip loading

---
 report-viewer/src/App.vue                     |  5 ++-
 .../src/model/factories/BaseFactory.ts        | 41 +++++++++++--------
 .../src/model/factories/ComparisonFactory.ts  | 22 +++++-----
 .../src/model/factories/OverviewFactory.ts    |  4 +-
 .../src/utils/fileHandling/JsonFileHandler.ts |  1 -
 report-viewer/src/views/ClusterView.vue       |  2 +-
 report-viewer/src/views/ComparisonView.vue    |  8 ++--
 report-viewer/src/views/FileUploadView.vue    | 23 ++++++++---
 report-viewer/src/views/InformationView.vue   |  2 +-
 report-viewer/src/views/OverviewView.vue      |  2 +-
 10 files changed, 67 insertions(+), 43 deletions(-)

diff --git a/report-viewer/src/App.vue b/report-viewer/src/App.vue
index 475091218..988799c65 100644
--- a/report-viewer/src/App.vue
+++ b/report-viewer/src/App.vue
@@ -3,7 +3,10 @@
     <div
       class="max-w-screen max-h-fit min-h-screen bg-backgorund-light text-black dark:bg-backgorund-dark dark:text-amber-50"
     >
-      <RouterView class="max-h-screen overflow-hidden" />
+      <Suspense>
+        <RouterView class="max-h-screen overflow-hidden" />
+      </Suspense>
+
       <Button
         class="absolute bottom-2 right-2 flex h-12 w-12 items-center justify-center text-center"
         @click="store().changeUseDarkMode()"
diff --git a/report-viewer/src/model/factories/BaseFactory.ts b/report-viewer/src/model/factories/BaseFactory.ts
index 078a022da..4dc31d8a0 100644
--- a/report-viewer/src/model/factories/BaseFactory.ts
+++ b/report-viewer/src/model/factories/BaseFactory.ts
@@ -1,4 +1,5 @@
 import { store } from '@/stores/store'
+import { ZipFileHandler } from '@/utils/fileHandling/ZipFileHandler'
 
 /**
  * This class provides some basic functionality for the factories.
@@ -10,39 +11,45 @@ export class BaseFactory {
    * @return Content of the file
    * @throws Error if the file could not be found
    */
-  protected static getFile(path: string): string {
+  protected static async getFile(path: string): Promise<string> {
     if (store().state.localModeUsed) {
-      return this.getLocalFile(path)
-    } else if (store().state.zipModeUsed) {
-      const index = Object.keys(store().state.files).find((name) => name.endsWith(path))
-      if (index == undefined) {
-        throw new Error(`Could not find ${path} in zip file.`)
-      }
-      const file = store().state.files[index]
-      if (file == undefined) {
-        throw new Error(`Could not load ${path}.`)
+      if (store().state.zipModeUsed) {
+        await new ZipFileHandler().handleFile(await this.getLocalFile('results.zip'))
+        return this.getFileFromStore(path)
+      } else {
+        return await (await this.getLocalFile(`/files/${path}`)).text()
       }
-      return file
+    } else if (store().state.zipModeUsed) {
+      return this.getFileFromStore(path)
     } else if (store().state.singleModeUsed) {
       return store().state.singleFillRawContent
     }
-
     throw new Error('No loading type specified')
   }
 
+  private static getFileFromStore(path: string): string {
+    const index = Object.keys(store().state.files).find((name) => name.endsWith(path))
+    if (index == undefined) {
+      throw new Error(`Could not find ${path} in zip file.`)
+    }
+    const file = store().state.files[index]
+    if (file == undefined) {
+      throw new Error(`Could not load ${path}.`)
+    }
+    return file
+  }
+
   /**
    * Returns the content of a file from the local files.
    * @param path - Path to the file
    * @return Content of the file
    * @throws Error if the file could not be found
    */
-  protected static getLocalFile(path: string): string {
-    const request = new XMLHttpRequest()
-    request.open('GET', `/files/${path}`, false)
-    request.send()
+  protected static async getLocalFile(path: string): Promise<Blob> {
+    const request = await fetch(path)
 
     if (request.status == 200) {
-      return request.response
+      return request.blob()
     } else {
       throw new Error(`Could not find ${path} in local files.`)
     }
diff --git a/report-viewer/src/model/factories/ComparisonFactory.ts b/report-viewer/src/model/factories/ComparisonFactory.ts
index e558f791a..33a045031 100644
--- a/report-viewer/src/model/factories/ComparisonFactory.ts
+++ b/report-viewer/src/model/factories/ComparisonFactory.ts
@@ -11,13 +11,13 @@ import { MetricType } from '../MetricType'
  * Factory class for creating Comparison objects
  */
 export class ComparisonFactory extends BaseFactory {
-  public static getComparison(id1: string, id2: string) {
+  public static async getComparison(id1: string, id2: string): Promise<Comparison> {
     const filePath = store().getComparisonFileName(id1, id2)
     if (!filePath) {
       throw new Error('Comparison file not specified')
     }
 
-    return this.extractComparison(JSON.parse(this.getFile(filePath)))
+    return this.extractComparison(JSON.parse(await this.getFile(filePath)))
   }
 
   /**
@@ -27,9 +27,9 @@ export class ComparisonFactory extends BaseFactory {
   private static extractComparison(json: Record<string, unknown>): Comparison {
     const firstSubmissionId = json.id1 as string
     const secondSubmissionId = json.id2 as string
-    if (store().state.localModeUsed) {
+    if (store().state.localModeUsed && !store().state.zipModeUsed) {
       this.loadSubmissionFilesFromLocal(firstSubmissionId)
-      this.loadSubmissionFilesFromLocal(json.id2 as string)
+      this.loadSubmissionFilesFromLocal(secondSubmissionId)
     }
     const filesOfFirstSubmission = store().filesOfSubmission(firstSubmissionId)
     const filesOfSecondSubmission = store().filesOfSubmission(secondSubmissionId)
@@ -103,21 +103,21 @@ export class ComparisonFactory extends BaseFactory {
     return map
   }
 
-  private static getSubmissionFileListFromLocal(submissionId: string): string[] {
-    return JSON.parse(this.getLocalFile(`submissionFileIndex.json`)).submission_file_indexes[
-      submissionId
-    ].map((file: string) => slash(file))
+  private static async getSubmissionFileListFromLocal(submissionId: string): Promise<string[]> {
+    return JSON.parse(
+      await this.getLocalFile(`submissionFileIndex.json`).then((file) => file.text())
+    ).submission_file_indexes[submissionId].map((file: string) => slash(file))
   }
 
-  private static loadSubmissionFilesFromLocal(submissionId: string) {
+  private static async loadSubmissionFilesFromLocal(submissionId: string) {
     try {
-      const fileList = this.getSubmissionFileListFromLocal(submissionId)
+      const fileList = await this.getSubmissionFileListFromLocal(submissionId)
       for (const filePath of fileList) {
         store().saveSubmissionFile({
           name: submissionId,
           file: {
             fileName: slash(filePath),
-            data: this.getLocalFile(`files/${filePath}`)
+            data: await this.getLocalFile(`files/${filePath}`).then((file) => file.text())
           }
         })
       }
diff --git a/report-viewer/src/model/factories/OverviewFactory.ts b/report-viewer/src/model/factories/OverviewFactory.ts
index 3504f4bf5..66991846c 100644
--- a/report-viewer/src/model/factories/OverviewFactory.ts
+++ b/report-viewer/src/model/factories/OverviewFactory.ts
@@ -22,8 +22,8 @@ export class OverviewFactory extends BaseFactory {
   /**
    * Gets the overview file based on the used mode (zip, local, single).
    */
-  public static getOverview(): Overview {
-    return this.extractOverview(JSON.parse(this.getFile('overview.json')))
+  public static async getOverview(): Promise<Overview> {
+    return this.extractOverview(JSON.parse(await this.getFile('overview.json')))
   }
 
   /**
diff --git a/report-viewer/src/utils/fileHandling/JsonFileHandler.ts b/report-viewer/src/utils/fileHandling/JsonFileHandler.ts
index a7fe0965f..1d3dce180 100644
--- a/report-viewer/src/utils/fileHandling/JsonFileHandler.ts
+++ b/report-viewer/src/utils/fileHandling/JsonFileHandler.ts
@@ -9,7 +9,6 @@ export class JsonFileHandler extends FileHandler {
     file: Blob
   ): Promise<{ fileType: 'overview' } | { fileType: 'comparison'; id1: string; id2: string }> {
     const content = await file.text()
-    console.log(content)
     const json = JSON.parse(content)
 
     store().setSingleFileRawContent(content)
diff --git a/report-viewer/src/views/ClusterView.vue b/report-viewer/src/views/ClusterView.vue
index 82782c485..d8e254631 100644
--- a/report-viewer/src/views/ClusterView.vue
+++ b/report-viewer/src/views/ClusterView.vue
@@ -40,7 +40,7 @@ const props = defineProps({
   }
 })
 
-const overview = OverviewFactory.getOverview()
+const overview = await OverviewFactory.getOverview()
 const cluster = overview.clusters[props.clusterIndex]
 const comparisons = [] as Array<ComparisonListElement>
 const clusterMemberList = new Map() as ClusterListElementMember
diff --git a/report-viewer/src/views/ComparisonView.vue b/report-viewer/src/views/ComparisonView.vue
index 79ad95016..52923abbf 100644
--- a/report-viewer/src/views/ComparisonView.vue
+++ b/report-viewer/src/views/ComparisonView.vue
@@ -90,10 +90,12 @@ const props = defineProps({
   }
 })
 
-const comparison = computed(() => ComparisonFactory.getComparison(props.firstId, props.secondId))
+// This eslint rule is disabled to allow the use of await in the setup function. Disabling this rule is safe, because the props are gathered from the url, so changing them would reload the pafe anyway.
+// eslint-disable-next-line vue/no-setup-props-reactivity-loss
+const comparison = await ComparisonFactory.getComparison(props.firstId, props.secondId)
 
-const filesOfFirst = ref(comparison.value.filesOfFirstSubmission)
-const filesOfSecond = ref(comparison.value.filesOfSecondSubmission)
+const filesOfFirst = ref(comparison.filesOfFirstSubmission)
+const filesOfSecond = ref(comparison.filesOfSecondSubmission)
 
 /**
  * Collapses a file in the first files container.
diff --git a/report-viewer/src/views/FileUploadView.vue b/report-viewer/src/views/FileUploadView.vue
index 51e6a0d8e..2594cc107 100644
--- a/report-viewer/src/views/FileUploadView.vue
+++ b/report-viewer/src/views/FileUploadView.vue
@@ -32,7 +32,7 @@
           <div>Or click here to select a file</div>
         </div>
         <div>(No files will be uploaded)</div>
-        <Button class="mx-auto mt-8 w-fit" @click="continueWithLocal" v-if="hasLocalFile">
+        <Button class="mx-auto mt-8 w-fit" @click="continueWithLocal" v-if="localFiles !== 'none'">
           Continue with local files
         </Button>
       </div>
@@ -48,7 +48,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, type Ref } from 'vue'
 import { useRoute } from 'vue-router'
 import { router } from '@/router'
 import { store } from '@/stores/store'
@@ -58,9 +58,22 @@ import { JsonFileHandler } from '@/utils/fileHandling/JsonFileHandler'
 import { ZipFileHandler } from '@/utils/fileHandling/ZipFileHandler'
 
 store().clearStore()
-const hasLocalFile = ref(false)
+const localFiles: Ref<'json' | 'zip' | 'none'> = ref('none')
 // Checks whether local files exist
-fetch('/files/overview.json').then((response) => (hasLocalFile.value = response.status == 200))
+fetch('/files/overview.json')
+  .then((response) => {
+    if (response.status == 200) {
+      localFiles.value = 'json'
+    }
+  })
+  .catch(() => {})
+fetch('/results.zip')
+  .then((response) => {
+    if (response.status == 200) {
+      localFiles.value = 'zip'
+    }
+  })
+  .catch(() => {})
 
 const loadingFiles = ref(false)
 
@@ -202,7 +215,7 @@ async function loadQueryFile(url: URL) {
 function continueWithLocal() {
   store().setLoadingType({
     local: true,
-    zip: false,
+    zip: localFiles.value === 'zip',
     single: false
   })
   navigateToOverview()
diff --git a/report-viewer/src/views/InformationView.vue b/report-viewer/src/views/InformationView.vue
index 2bc5f2188..a31a4fc38 100644
--- a/report-viewer/src/views/InformationView.vue
+++ b/report-viewer/src/views/InformationView.vue
@@ -54,7 +54,7 @@ import TextInformation from '@/components/TextInformation.vue'
 import ScrollableComponent from '@/components/ScrollableComponent.vue'
 import { store } from '@/stores/store'
 
-const overview = OverviewFactory.getOverview()
+const overview = await OverviewFactory.getOverview()
 
 const totalComparisons = overview.totalComparisons
 const shownComparisons = overview.topComparisons.length
diff --git a/report-viewer/src/views/OverviewView.vue b/report-viewer/src/views/OverviewView.vue
index 9bd976329..a1ba316db 100644
--- a/report-viewer/src/views/OverviewView.vue
+++ b/report-viewer/src/views/OverviewView.vue
@@ -92,7 +92,7 @@ import TextInformation from '@/components/TextInformation.vue'
 import type { ComparisonListElement } from '@/model/ComparisonListElement'
 import OptionsSelector from '@/components/OptionsSelectorComponent.vue'
 
-const overview = OverviewFactory.getOverview()
+const overview = await OverviewFactory.getOverview()
 
 const searchString = ref('')
 const comparisonTableSortingMetric = ref(MetricType.AVERAGE)

From d93a608f79e48cacca534422464c39269f697b92 Mon Sep 17 00:00:00 2001
From: Alex | Kronox <alexander_vogt@outlook.de>
Date: Thu, 7 Sep 2023 12:15:09 +0200
Subject: [PATCH 20/57] store all selections

---
 report-viewer/src/stores/state.ts        | 12 +++++++++
 report-viewer/src/stores/store.ts        |  8 +++++-
 report-viewer/src/views/OverviewView.vue | 34 +++++++++++++++---------
 3 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/report-viewer/src/stores/state.ts b/report-viewer/src/stores/state.ts
index c49794467..43cbad1a3 100644
--- a/report-viewer/src/stores/state.ts
+++ b/report-viewer/src/stores/state.ts
@@ -1,3 +1,5 @@
+import type { MetricType } from '@/model/MetricType'
+
 /**
  * Local store. Stores the state of the application.
  */
@@ -68,4 +70,14 @@ export interface LoadConfiguration {
 
 export interface UIState {
   useDarkMode: boolean
+  comparisonTableSortingMetric: MetricType
+  distributionChartConfig: DistributionChartConfig
+}
+
+/**
+ * Configuration for the distribution chart.
+ */
+export interface DistributionChartConfig {
+  metric: MetricType
+  xScale: 'linear' | 'logarithmic'
 }
diff --git a/report-viewer/src/stores/store.ts b/report-viewer/src/stores/store.ts
index 9b6512af5..d18fabbb5 100644
--- a/report-viewer/src/stores/store.ts
+++ b/report-viewer/src/stores/store.ts
@@ -1,5 +1,6 @@
 import { defineStore } from 'pinia'
 import type { State, SubmissionFile, File, LoadConfiguration, UIState } from './state'
+import { MetricType } from '@/model/MetricType'
 
 /**
  * The store is a global state management system. It is used to store the state of the application.
@@ -20,7 +21,12 @@ const store = defineStore('store', {
       fileIdToDisplayName: new Map()
     },
     uiState: {
-      useDarkMode: false
+      useDarkMode: false,
+      comparisonTableSortingMetric: MetricType.AVERAGE,
+      distributionChartConfig: {
+        metric: MetricType.AVERAGE,
+        xScale: 'linear'
+      }
     }
   }),
   getters: {
diff --git a/report-viewer/src/views/OverviewView.vue b/report-viewer/src/views/OverviewView.vue
index 4da8aca4d..870c174f4 100644
--- a/report-viewer/src/views/OverviewView.vue
+++ b/report-viewer/src/views/OverviewView.vue
@@ -26,8 +26,8 @@
       <Container class="flex max-h-0 min-h-full flex-1 flex-col">
         <h2>Distribution of Comparisons:</h2>
         <DistributionDiagram
-          :distribution="overview.distribution[selectedDistributionDiagramMetric]"
-          :x-scale="distributionDiagramScaleX"
+          :distribution="overview.distribution[store().uiState.distributionChartConfig.metric]"
+          :x-scale="store().uiState.distributionChartConfig.xScale"
           class="h-2/3 w-full"
         />
         <div class="flex flex-grow flex-col space-y-1">
@@ -36,16 +36,21 @@
             <OptionsSelector
               name="Metric"
               :labels="['Average', 'Maximum']"
+              :defaultSelected="getIndexFromMetric(store().uiState.distributionChartConfig.metric)"
               @selection-changed="
-                (i: number) => (selectedDistributionDiagramMetric = getMetricFromNumber(i))
+                (i: number) =>
+                  (store().uiState.distributionChartConfig.metric = getMetricFromNumber(i))
               "
             />
             <OptionsSelector
               class="mt-2"
               name="Scale x-Axis:"
               :labels="['Linear', 'Logarithmic']"
+              :defaultSelected="store().uiState.distributionChartConfig.xScale == 'linear' ? 0 : 1"
               @selection-changed="
-                (i: number) => (distributionDiagramScaleX = i == 0 ? 'linear' : 'logarithmic')
+                (i: number) =>
+                  (store().uiState.distributionChartConfig.xScale =
+                    i == 0 ? 'linear' : 'logarithmic')
               "
             />
           </ScrollableComponent>
@@ -71,8 +76,9 @@
         <OptionsSelector
           name="Sort By"
           :labels="['Average Similarity', 'Maximum Similarity']"
+          :defaultSelected="getIndexFromMetric(store().uiState.comparisonTableSortingMetric)"
           @selection-changed="
-            (index) => (comparisonTableSortingMetric = getMetricFromNumber(index))
+            (index) => (store().uiState.comparisonTableSortingMetric = getMetricFromNumber(index))
           "
         />
         <ComparisonsTable
@@ -86,7 +92,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, onErrorCaptured, ref, watch, type Ref } from 'vue'
+import { computed, onErrorCaptured, ref, watch } from 'vue'
 import { router } from '@/router'
 import DistributionDiagram from '@/components/DistributionDiagram.vue'
 import ComparisonsTable from '@/components/ComparisonsTable.vue'
@@ -104,8 +110,6 @@ import OptionsSelector from '@/components/OptionsSelectorComponent.vue'
 const overview = OverviewFactory.getOverview()
 
 const searchString = ref('')
-const comparisonTableSortingMetric = ref(MetricType.AVERAGE)
-const distributionDiagramScaleX: Ref<'linear' | 'logarithmic'> = ref('linear')
 
 /**
  * This funtion gets called when the search bar for the compariosn table has been updated.
@@ -134,8 +138,8 @@ function getFilteredComparisons(comparisons: ComparisonListElement[]) {
 function getSortedComparisons(comparisons: ComparisonListElement[]) {
   comparisons.sort(
     (a, b) =>
-      b.similarities[comparisonTableSortingMetric.value] -
-      a.similarities[comparisonTableSortingMetric.value]
+      b.similarities[store().uiState.comparisonTableSortingMetric] -
+      a.similarities[store().uiState.comparisonTableSortingMetric]
   )
   let index = 0
   comparisons.forEach((c) => {
@@ -184,8 +188,6 @@ function changeAnnoymousForAll() {
   }
 }
 
-const selectedDistributionDiagramMetric = ref(MetricType.AVERAGE)
-
 function getMetricFromNumber(metric: number) {
   if (metric == 0) {
     return MetricType.AVERAGE
@@ -194,6 +196,14 @@ function getMetricFromNumber(metric: number) {
   }
 }
 
+function getIndexFromMetric(metric: MetricType) {
+  if (metric == MetricType.AVERAGE) {
+    return 0
+  } else {
+    return 1
+  }
+}
+
 const hasMoreSubmissionPaths = overview.submissionFolderPath.length > 1
 const submissionPathValue = hasMoreSubmissionPaths
   ? 'Click More to see all paths'

From bf332f0211543bdc0cb856f05a13b4212cd9e75c Mon Sep 17 00:00:00 2001
From: Alex | Kronox <alexander_vogt@outlook.de>
Date: Fri, 8 Sep 2023 12:33:37 +0200
Subject: [PATCH 21/57] add some more tooltips

---
 report-viewer/src/components/MatchList.vue    | 27 ++++++++----
 .../optionsSelectors/MetricSelector.vue       |  2 +-
 .../optionsSelectors/OptionComponent.vue      |  7 ++--
 .../OptionsSelectorComponent.vue              | 25 ++++++-----
 report-viewer/src/views/OverviewView.vue      | 41 +++++++++++++++----
 report-viewer/src/views/TestView.vue          | 24 -----------
 6 files changed, 70 insertions(+), 56 deletions(-)
 delete mode 100644 report-viewer/src/views/TestView.vue

diff --git a/report-viewer/src/components/MatchList.vue b/report-viewer/src/components/MatchList.vue
index aeb218112..f36697b01 100644
--- a/report-viewer/src/components/MatchList.vue
+++ b/report-viewer/src/components/MatchList.vue
@@ -3,26 +3,35 @@
 -->
 <template>
   <div class="flex h-fit min-w-0 max-w-full flex-row space-x-1 overflow-x-hidden text-xs">
-    <Interactable class="my-2 flex h-6 items-center whitespace-nowrap !rounded-2xl text-center">
-      Match Files: TokenCount
-    </Interactable>
+    <ToolTipComponent direction="right">
+      <template #default>
+        <OptionComponent label="Match Files: TokenCount" />
+      </template>
+      <template #tooltip>
+        <p class="flex min-h-[1.25rem] items-center whitespace-pre">
+          Click on a match to show it in the code view.
+        </p>
+      </template>
+    </ToolTipComponent>
+
     <div class="flex w-full flex-row space-x-1 overflow-x-auto">
-      <Interactable
-        class="my-2 flex h-6 items-center whitespace-nowrap !rounded-2xl !bg-opacity-50 text-center"
+      <OptionComponent
         :style="{ background: match.color }"
         v-for="[index, match] in matches?.entries()"
         v-bind:key="index"
         @click="$emit('matchSelected', match)"
-      >
-        {{ getFileName(match.firstFile) }} - {{ getFileName(match.secondFile) }}: {{ match.tokens }}
-      </Interactable>
+        :label="
+          getFileName(match.firstFile) + ' - ' + getFileName(match.secondFile) + ': ' + match.tokens
+        "
+      />
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
 import type { Match } from '@/model/Match'
-import Interactable from './InteractableComponent.vue'
+import OptionComponent from './optionsSelectors/OptionComponent.vue'
+import ToolTipComponent from './ToolTipComponent.vue'
 
 defineProps({
   /**
diff --git a/report-viewer/src/components/optionsSelectors/MetricSelector.vue b/report-viewer/src/components/optionsSelectors/MetricSelector.vue
index 3831b21e1..5e7823eb2 100644
--- a/report-viewer/src/components/optionsSelectors/MetricSelector.vue
+++ b/report-viewer/src/components/optionsSelectors/MetricSelector.vue
@@ -8,7 +8,7 @@
 
 <script setup lang="ts">
 import OptionsSelectorComponent from './OptionsSelectorComponent.vue'
-import MetricType, { metricToolTips } from '@/model/MetricType'
+import { MetricType, metricToolTips } from '@/model/MetricType'
 
 const props = defineProps({
   metrics: {
diff --git a/report-viewer/src/components/optionsSelectors/OptionComponent.vue b/report-viewer/src/components/optionsSelectors/OptionComponent.vue
index 84c1ba40e..443940a84 100644
--- a/report-viewer/src/components/optionsSelectors/OptionComponent.vue
+++ b/report-viewer/src/components/optionsSelectors/OptionComponent.vue
@@ -1,7 +1,7 @@
 <template>
   <Interactable
-    class="mr-2 px-[12px] w-fit !rounded-2xl flex justify-center items-center text-center box-border h-6 hover:!border-[2px] hover:px-[11px]"
-    :class="{ '!bg-accent !border-accent-dark !bg-opacity-40': selected }"
+    class="mr-2 box-border flex h-6 w-fit items-center justify-center whitespace-nowrap !rounded-2xl px-[12px] text-center hover:!border-[2px] hover:px-[11px]"
+    :class="{ '!border-accent-dark !bg-accent !bg-opacity-40': selected }"
     @click="$emit('click')"
   >
     {{ label }}
@@ -18,7 +18,8 @@ defineProps({
   },
   selected: {
     type: Boolean,
-    required: true
+    required: false,
+    default: false
   }
 })
 
diff --git a/report-viewer/src/components/optionsSelectors/OptionsSelectorComponent.vue b/report-viewer/src/components/optionsSelectors/OptionsSelectorComponent.vue
index 207b61276..f9d98c050 100644
--- a/report-viewer/src/components/optionsSelectors/OptionsSelectorComponent.vue
+++ b/report-viewer/src/components/optionsSelectors/OptionsSelectorComponent.vue
@@ -2,26 +2,22 @@
   Component for selecting one of multiple options.
 -->
 <template>
-  <div class="flex flex-row text-xs h-fit items-center text-center">
+  <div class="flex h-fit flex-row items-center text-center text-xs">
     <div v-if="title != ''" class="mr-3 text-base">
       {{ title }}
     </div>
     <div v-for="[index, label] in labels.entries()" :key="index">
-      <ToolTipComponent
-        v-if="(label as ToolTipLabel).displayValue !== undefined"
-        direction="right"
-        :tooltip-text="(label as ToolTipLabel).tooltip"
-      >
+      <ToolTipComponent v-if="(label as ToolTipLabel).displayValue !== undefined" direction="right">
         <template #default>
           <OptionComponent
             :label="(label as ToolTipLabel).displayValue"
-            :selected="index == selected"
+            :selected="index == getSelected()"
             @click="select(index)"
           />
         </template>
 
         <template #tooltip>
-          <p class="whitespace-pre min-h-[1.25rem] flex items-center">
+          <p class="flex min-h-[1.25rem] items-center whitespace-pre">
             {{ (label as ToolTipLabel).tooltip }}
           </p>
         </template>
@@ -29,7 +25,7 @@
       <OptionComponent
         v-else
         :label="label as string"
-        :selected="index == selected"
+        :selected="index == getSelected()"
         @click="select(index)"
       />
     </div>
@@ -37,7 +33,7 @@
 </template>
 
 <script setup lang="ts">
-import { toRef } from 'vue'
+import { ref } from 'vue'
 import ToolTipComponent from '../ToolTipComponent.vue'
 import OptionComponent from './OptionComponent.vue'
 
@@ -64,7 +60,14 @@ const props = defineProps({
 })
 
 const emit = defineEmits(['selectionChanged'])
-const selected = toRef(props.defaultSelected)
+const selected = ref(-1)
+
+function getSelected() {
+  if (selected.value == -1) {
+    return props.defaultSelected
+  }
+  return selected.value
+}
 
 function select(index: number) {
   emit('selectionChanged', index)
diff --git a/report-viewer/src/views/OverviewView.vue b/report-viewer/src/views/OverviewView.vue
index c9e6658d7..13259c6a8 100644
--- a/report-viewer/src/views/OverviewView.vue
+++ b/report-viewer/src/views/OverviewView.vue
@@ -17,7 +17,17 @@
           <TextInformation label="Min Match Length">{{
             overview.matchSensitivity
           }}</TextInformation>
-          <Button @click="router.push({ name: 'InfoView' })"> More </Button>
+
+          <ToolTipComponent direction="left">
+            <template #default>
+              <Button @click="router.push({ name: 'InfoView' })"> More </Button>
+            </template>
+            <template #tooltip>
+              <p class="flex min-h-[1.25rem] items-center whitespace-pre">
+                More information about the CLI run of JPlag
+              </p>
+            </template>
+          </ToolTipComponent>
         </div>
       </Container>
     </div>
@@ -35,14 +45,14 @@
           <ScrollableComponent class="h-fit flex-grow">
             <MetricSelector
               class="mt-2"
-              title="Metric"
+              title="Metric:"
               @selection-changed="
                 (i: number) => (selectedDistributionDiagramMetric = getMetricFromNumber(i))
               "
             />
             <OptionsSelector
               class="mt-2"
-              name="Scale x-Axis:"
+              title="Scale x-Axis:"
               :labels="['Linear', 'Logarithmic']"
               @selection-changed="
                 (i: number) => (distributionDiagramScaleX = i == 0 ? 'linear' : 'logarithmic')
@@ -55,11 +65,24 @@
       <Container class="flex max-h-0 min-h-full flex-1 flex-col space-y-2">
         <div class="flex flex-row items-center space-x-8">
           <h2>Top Comparisons:</h2>
-          <SearchBarComponent
-            placeholder="Filter/Unhide Comparisons"
-            class="flex-grow"
-            @input-changed="(value) => (searchString = value)"
-          />
+          <ToolTipComponent direction="bottom" class="flex-grow">
+            <template #default>
+              <SearchBarComponent
+                placeholder="Filter/Unhide Comparisons"
+                @input-changed="(value) => (searchString = value)"
+              />
+            </template>
+            <template #tooltip>
+              <p class="flex min-h-[1.25rem] items-center whitespace-pre">
+                Type in the name of a submission to only show comparisons that contain this
+                submission.
+              </p>
+              <p class="flex min-h-[1.25rem] items-center whitespace-pre">
+                Fully written out names get unhidden.
+              </p>
+            </template>
+          </ToolTipComponent>
+
           <Button class="w-24" @click="changeAnnoymousForAll()">
             {{
               store().state.anonymous.size == store().getSubmissionIds.length
@@ -99,6 +122,8 @@ import SearchBarComponent from '@/components/SearchBarComponent.vue'
 import TextInformation from '@/components/TextInformation.vue'
 import type { ComparisonListElement } from '@/model/ComparisonListElement'
 import MetricSelector from '@/components/optionsSelectors/MetricSelector.vue'
+import ToolTipComponent from '@/components/ToolTipComponent.vue'
+import OptionsSelector from '@/components/optionsSelectors/OptionsSelectorComponent.vue'
 
 const overview = OverviewFactory.getOverview()
 
diff --git a/report-viewer/src/views/TestView.vue b/report-viewer/src/views/TestView.vue
deleted file mode 100644
index ddd9f6380..000000000
--- a/report-viewer/src/views/TestView.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-<template>
-  <div class="w-full grow flex items-center justify-center h-96">
-    <div class="border-1 border-red-500">
-      <MetricSelector />
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import ToolTipComponent from '@/components/ToolTipComponent.vue'
-import MetricSelector from '@/components/optionsSelectors/MetricSelector.vue'
-import OptionsSelectorComponent from '@/components/optionsSelectors/OptionsSelectorComponent.vue'
-
-const label = [
-  {
-    displayValue: 'Test',
-    tooltip: 'This is a test'
-  },
-  {
-    displayValue: 'Test2',
-    tooltip: 'This is a test2'
-  }
-]
-</script>

From 203cdd060468cff9c494f25142914df09e2672d0 Mon Sep 17 00:00:00 2001
From: Alex | Kronox <alexander_vogt@outlook.de>
Date: Fri, 8 Sep 2023 12:34:34 +0200
Subject: [PATCH 22/57] fix build

---
 report-viewer/src/router/index.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/report-viewer/src/router/index.ts b/report-viewer/src/router/index.ts
index ee1b29da5..d277f86e5 100644
--- a/report-viewer/src/router/index.ts
+++ b/report-viewer/src/router/index.ts
@@ -43,11 +43,6 @@ const router = createRouter({
       path: '/info',
       name: 'InfoView',
       component: InformationView
-    },
-    {
-      path: '/test',
-      name: 'TestView',
-      component: () => import('@/views/TestView.vue')
     }
   ]
 })

From 3961b3d48dee4c86882b132785d9853a5831c956 Mon Sep 17 00:00:00 2001
From: Alex | Kronox <alexander_vogt@outlook.de>
Date: Sun, 10 Sep 2023 12:09:44 +0200
Subject: [PATCH 23/57] fix some tooltips

---
 report-viewer/src/components/ComparisonsTable.vue    |  4 ++--
 report-viewer/src/components/MatchList.vue           |  4 +---
 .../optionsSelectors/OptionsSelectorComponent.vue    |  2 +-
 report-viewer/src/views/ClusterView.vue              |  2 +-
 report-viewer/src/views/OverviewView.vue             | 12 ++++--------
 5 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/report-viewer/src/components/ComparisonsTable.vue b/report-viewer/src/components/ComparisonsTable.vue
index b9cf6e715..c22f40f70 100644
--- a/report-viewer/src/components/ComparisonsTable.vue
+++ b/report-viewer/src/components/ComparisonsTable.vue
@@ -11,7 +11,7 @@
         <div class="tableCellSimilarity !flex-col">
           <div>Similarity</div>
           <div class="flex w-full flex-row">
-            <ToolTipComponent class="flex-1">
+            <ToolTipComponent class="flex-1" :direction="displayClusters ? 'top' : 'left'">
               <template #default>
                 <p class="w-full text-center">{{ metricToolTips[MetricType.AVERAGE].shortName }}</p>
               </template>
@@ -22,7 +22,7 @@
               </template>
             </ToolTipComponent>
 
-            <ToolTipComponent class="flex-1">
+            <ToolTipComponent class="flex-1" :direction="displayClusters ? 'top' : 'left'">
               <template #default>
                 <p class="w-full text-center">{{ metricToolTips[MetricType.MAXIMUM].shortName }}</p>
               </template>
diff --git a/report-viewer/src/components/MatchList.vue b/report-viewer/src/components/MatchList.vue
index f36697b01..17e5bee28 100644
--- a/report-viewer/src/components/MatchList.vue
+++ b/report-viewer/src/components/MatchList.vue
@@ -8,9 +8,7 @@
         <OptionComponent label="Match Files: TokenCount" />
       </template>
       <template #tooltip>
-        <p class="flex min-h-[1.25rem] items-center whitespace-pre">
-          Click on a match to show it in the code view.
-        </p>
+        <p class="whitespace-pre text-sm">Click on a match to show it in the code view.</p>
       </template>
     </ToolTipComponent>
 
diff --git a/report-viewer/src/components/optionsSelectors/OptionsSelectorComponent.vue b/report-viewer/src/components/optionsSelectors/OptionsSelectorComponent.vue
index f9d98c050..94397decd 100644
--- a/report-viewer/src/components/optionsSelectors/OptionsSelectorComponent.vue
+++ b/report-viewer/src/components/optionsSelectors/OptionsSelectorComponent.vue
@@ -17,7 +17,7 @@
         </template>
 
         <template #tooltip>
-          <p class="flex min-h-[1.25rem] items-center whitespace-pre">
+          <p class="whitespace-pre text-sm">
             {{ (label as ToolTipLabel).tooltip }}
           </p>
         </template>
diff --git a/report-viewer/src/views/ClusterView.vue b/report-viewer/src/views/ClusterView.vue
index 82782c485..994b56f57 100644
--- a/report-viewer/src/views/ClusterView.vue
+++ b/report-viewer/src/views/ClusterView.vue
@@ -15,7 +15,7 @@
       <Container class="flex max-h-0 min-h-full flex-1 flex-col overflow-hidden">
         <ClusterRadarChart :cluster="clusterListElement" class="flex-grow" />
       </Container>
-      <Container class="flex max-h-0 min-h-full w-1/3 flex-col space-y-2 overflow-hidden">
+      <Container class="flex max-h-0 min-h-full w-1/3 flex-col space-y-2">
         <h2>Comparisons of Cluster Members:</h2>
         <ComparisonsTable :topComparisons="comparisons" class="min-h-0 flex-1" />
       </Container>
diff --git a/report-viewer/src/views/OverviewView.vue b/report-viewer/src/views/OverviewView.vue
index 13259c6a8..f2ea348b3 100644
--- a/report-viewer/src/views/OverviewView.vue
+++ b/report-viewer/src/views/OverviewView.vue
@@ -23,9 +23,7 @@
               <Button @click="router.push({ name: 'InfoView' })"> More </Button>
             </template>
             <template #tooltip>
-              <p class="flex min-h-[1.25rem] items-center whitespace-pre">
-                More information about the CLI run of JPlag
-              </p>
+              <p class="whitespace-pre text-sm">More information about the CLI run of JPlag</p>
             </template>
           </ToolTipComponent>
         </div>
@@ -73,13 +71,11 @@
               />
             </template>
             <template #tooltip>
-              <p class="flex min-h-[1.25rem] items-center whitespace-pre">
+              <p class="whitespace-pre text-sm">
                 Type in the name of a submission to only show comparisons that contain this
                 submission.
               </p>
-              <p class="flex min-h-[1.25rem] items-center whitespace-pre">
-                Fully written out names get unhidden.
-              </p>
+              <p class="whitespace-pre text-sm">Fully written out names get unhidden.</p>
             </template>
           </ToolTipComponent>
 
@@ -92,7 +88,7 @@
           </Button>
         </div>
         <MetricSelector
-          title="Sort By"
+          title="Sort By:"
           @selection-changed="
             (index) => (comparisonTableSortingMetric = getMetricFromNumber(index))
           "

From c327e5abcffded1e13dfa76f8e809f58088d0c80 Mon Sep 17 00:00:00 2001
From: Alex | Kronox <alexander_vogt@outlook.de>
Date: Sun, 10 Sep 2023 12:15:03 +0200
Subject: [PATCH 24/57] rearange classes

---
 report-viewer/src/components/ToolTipComponent.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/report-viewer/src/components/ToolTipComponent.vue b/report-viewer/src/components/ToolTipComponent.vue
index d7d34a0af..345fd7db7 100644
--- a/report-viewer/src/components/ToolTipComponent.vue
+++ b/report-viewer/src/components/ToolTipComponent.vue
@@ -1,12 +1,12 @@
 <template>
-  <div class="relative inline-block group">
+  <div class="group relative inline-block">
     <slot></slot>
     <div
-      class="absolute hidden group-hover:block px-1 rounded-md text-white text-center z-10"
+      class="absolute z-10 hidden rounded-md px-1 text-center text-white group-hover:block"
       :style="tooltipPosition"
     >
       <slot name="tooltip"></slot>
-      <div class="border-4 border-solid absolute" :style="arrowStyle"><!-- Arrow --></div>
+      <div class="absolute border-4 border-solid" :style="arrowStyle"><!-- Arrow --></div>
     </div>
   </div>
 </template>

From d86abeca8492cad88be4118dd5391f7fce4f703c Mon Sep 17 00:00:00 2001
From: Alex | Kronox <alexander_vogt@outlook.de>
Date: Sun, 10 Sep 2023 12:41:58 +0200
Subject: [PATCH 25/57] fix bugs

---
 .../components/optionsSelectors/MetricSelector.vue | 11 +++++------
 report-viewer/src/views/OverviewView.vue           | 14 ++------------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/report-viewer/src/components/optionsSelectors/MetricSelector.vue b/report-viewer/src/components/optionsSelectors/MetricSelector.vue
index 5e7823eb2..4299cb5e7 100644
--- a/report-viewer/src/components/optionsSelectors/MetricSelector.vue
+++ b/report-viewer/src/components/optionsSelectors/MetricSelector.vue
@@ -7,6 +7,7 @@
 </template>
 
 <script setup lang="ts">
+import { computed, type Ref } from 'vue'
 import OptionsSelectorComponent from './OptionsSelectorComponent.vue'
 import { MetricType, metricToolTips } from '@/model/MetricType'
 
@@ -25,12 +26,10 @@ const props = defineProps({
 
 defineEmits(['selectionChanged'])
 
-const labels: { displayValue: string; tooltip: string }[] = []
-
-for (const metric of props.metrics) {
-  labels.push({
+const labels: Ref<{ displayValue: string; tooltip: string }[]> = computed(() =>
+  props.metrics.map((metric) => ({
     displayValue: metricToolTips[metric].longName,
     tooltip: metricToolTips[metric].tooltip
-  })
-}
+  }))
+)
 </script>
diff --git a/report-viewer/src/views/OverviewView.vue b/report-viewer/src/views/OverviewView.vue
index f2ea348b3..9251331cc 100644
--- a/report-viewer/src/views/OverviewView.vue
+++ b/report-viewer/src/views/OverviewView.vue
@@ -45,7 +45,7 @@
               class="mt-2"
               title="Metric:"
               @selection-changed="
-                (i: number) => (selectedDistributionDiagramMetric = getMetricFromNumber(i))
+                (metric: MetricType) => (selectedDistributionDiagramMetric = metric)
               "
             />
             <OptionsSelector
@@ -89,9 +89,7 @@
         </div>
         <MetricSelector
           title="Sort By:"
-          @selection-changed="
-            (index) => (comparisonTableSortingMetric = getMetricFromNumber(index))
-          "
+          @selection-changed="(metric: MetricType) => (comparisonTableSortingMetric = metric)"
         />
         <ComparisonsTable
           :clusters="overview.clusters"
@@ -206,14 +204,6 @@ function changeAnnoymousForAll() {
 
 const selectedDistributionDiagramMetric = ref(MetricType.AVERAGE)
 
-function getMetricFromNumber(metric: number) {
-  if (metric == 0) {
-    return MetricType.AVERAGE
-  } else {
-    return MetricType.MAXIMUM
-  }
-}
-
 const hasMoreSubmissionPaths = overview.submissionFolderPath.length > 1
 const submissionPathValue = hasMoreSubmissionPaths
   ? 'Click More to see all paths'

From 32c00c163f2df5c9ee26a3f8e984efe1467b8d26 Mon Sep 17 00:00:00 2001
From: Alex | Kronox <alexander_vogt@outlook.de>
Date: Sun, 10 Sep 2023 14:42:55 +0200
Subject: [PATCH 26/57] add tests

---
 .../components/OptionsSelectorComponent.vue   |  0
 .../optionsSelectors/MetricSelector.vue       |  4 +-
 .../optionsSelectors/MetricSelector.test.ts   | 46 ++++++++++++
 .../OptionSelectorComponent.test.ts           | 70 +++++++++++++++++++
 4 files changed, 118 insertions(+), 2 deletions(-)
 delete mode 100644 report-viewer/src/components/OptionsSelectorComponent.vue
 create mode 100644 report-viewer/tests/unit/components/optionsSelectors/MetricSelector.test.ts
 create mode 100644 report-viewer/tests/unit/components/optionsSelectors/OptionSelectorComponent.test.ts

diff --git a/report-viewer/src/components/OptionsSelectorComponent.vue b/report-viewer/src/components/OptionsSelectorComponent.vue
deleted file mode 100644
index e69de29bb..000000000
diff --git a/report-viewer/src/components/optionsSelectors/MetricSelector.vue b/report-viewer/src/components/optionsSelectors/MetricSelector.vue
index 4299cb5e7..0ff0d9735 100644
--- a/report-viewer/src/components/optionsSelectors/MetricSelector.vue
+++ b/report-viewer/src/components/optionsSelectors/MetricSelector.vue
@@ -1,6 +1,6 @@
 <template>
   <OptionsSelectorComponent
-    :name="name"
+    :title="title"
     :labels="labels"
     @selection-changed="(i) => $emit('selectionChanged', metrics[i])"
   />
@@ -17,7 +17,7 @@ const props = defineProps({
     required: false,
     default: [MetricType.AVERAGE, MetricType.MAXIMUM]
   },
-  name: {
+  title: {
     type: String,
     required: false,
     default: ''
diff --git a/report-viewer/tests/unit/components/optionsSelectors/MetricSelector.test.ts b/report-viewer/tests/unit/components/optionsSelectors/MetricSelector.test.ts
new file mode 100644
index 000000000..18970b3b2
--- /dev/null
+++ b/report-viewer/tests/unit/components/optionsSelectors/MetricSelector.test.ts
@@ -0,0 +1,46 @@
+import { describe, expect, it } from 'vitest'
+import { mount } from '@vue/test-utils'
+import MetricSelector from '@/components/optionsSelectors/MetricSelector.vue'
+import OptionComponent from '@/components/optionsSelectors/OptionComponent.vue'
+import { MetricType } from '@/model/MetricType'
+
+describe('OptionSelectorComponent', () => {
+  it('renders all options', async () => {
+    const wrapper = mount(MetricSelector, {
+      props: {
+        title: 'Test:'
+      }
+    })
+
+    expect(wrapper.text()).toContain('Test:')
+    expect(wrapper.text()).toContain('Average Similarity')
+    expect(wrapper.text()).toContain('Maximum Similarity')
+  })
+
+  it('renders given metrics only', async () => {
+    const wrapper = mount(MetricSelector, {
+      props: {
+        title: 'Test:',
+        metrics: [MetricType.AVERAGE]
+      }
+    })
+
+    expect(wrapper.text()).toContain('Test:')
+    expect(wrapper.text()).toContain('Average Similarity')
+    expect(wrapper.text()).not.toContain('Maximum Similarity')
+  })
+
+  it('switch selection', async () => {
+    const wrapper = mount(MetricSelector, {
+      props: {
+        title: 'Test:'
+      }
+    })
+
+    await wrapper.findAllComponents({ name: 'OptionComponent' })[1].trigger('click')
+
+    expect(wrapper.emitted('selectionChanged')).toBeTruthy()
+    expect(wrapper.emitted('selectionChanged')?.length).toBe(1)
+    expect(wrapper.emitted('selectionChanged')?.[0]).toEqual([MetricType.MAXIMUM])
+  })
+})
diff --git a/report-viewer/tests/unit/components/optionsSelectors/OptionSelectorComponent.test.ts b/report-viewer/tests/unit/components/optionsSelectors/OptionSelectorComponent.test.ts
new file mode 100644
index 000000000..8947c8050
--- /dev/null
+++ b/report-viewer/tests/unit/components/optionsSelectors/OptionSelectorComponent.test.ts
@@ -0,0 +1,70 @@
+import { describe, expect, it } from 'vitest'
+import { mount } from '@vue/test-utils'
+import OptionsSelectorComponent from '@/components/optionsSelectors/OptionsSelectorComponent.vue'
+import OptionComponent from '@/components/optionsSelectors/OptionComponent.vue'
+
+describe('OptionSelectorComponent', () => {
+  it('renders all options', async () => {
+    const wrapper = mount(OptionsSelectorComponent, {
+      props: {
+        title: 'Test:',
+        labels: ['Option 1', 'Option 2', 'Option 3'],
+        defaultSelected: 1
+      }
+    })
+
+    expect(wrapper.text()).toContain('Test:')
+    expect(wrapper.text()).toContain('Option 1')
+    expect(wrapper.text()).toContain('Option 2')
+    expect(wrapper.text()).toContain('Option 3')
+
+    expect(
+      wrapper
+        .findAllComponents(OptionComponent)
+        .find((e) => e.text() === 'Option 2')
+        ?.classes()
+    ).toContain('!bg-accent')
+  })
+
+  it('switch selection', async () => {
+    const wrapper = mount(OptionsSelectorComponent, {
+      props: {
+        title: 'Test:',
+        labels: ['Option 1', 'Option 2'],
+        defaultSelected: 0
+      }
+    })
+
+    expect(
+      wrapper
+        .findAllComponents(OptionComponent)
+        .find((e) => e.text() === 'Option 1')
+        ?.classes()
+    ).toContain('!bg-accent')
+    expect(
+      wrapper
+        .findAllComponents(OptionComponent)
+        .find((e) => e.text() === 'Option 2')
+        ?.classes()
+    ).not.toContain('!bg-accent')
+
+    await wrapper.findAllComponents({ name: 'OptionComponent' })[1].trigger('click')
+
+    expect(wrapper.emitted('selectionChanged')).toBeTruthy()
+    expect(wrapper.emitted('selectionChanged')?.length).toBe(1)
+    expect(wrapper.emitted('selectionChanged')?.[0]).toEqual([1])
+
+    expect(
+      wrapper
+        .findAllComponents(OptionComponent)
+        .find((e) => e.text() === 'Option 1')
+        ?.classes()
+    ).not.toContain('!bg-accent')
+    expect(
+      wrapper
+        .findAll('.cursor-pointer')
+        .find((e) => e.text() === 'Option 2')
+        ?.classes()
+    ).toContain('!bg-accent')
+  })
+})

From 83033b0c4f40b65b7c6be8e522953313c1411898 Mon Sep 17 00:00:00 2001
From: Alex | Kronox <alexander_vogt@outlook.de>
Date: Sun, 10 Sep 2023 14:45:44 +0200
Subject: [PATCH 27/57] remove unused import

---
 .../unit/components/optionsSelectors/MetricSelector.test.ts      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/report-viewer/tests/unit/components/optionsSelectors/MetricSelector.test.ts b/report-viewer/tests/unit/components/optionsSelectors/MetricSelector.test.ts
index 18970b3b2..304100bf1 100644
--- a/report-viewer/tests/unit/components/optionsSelectors/MetricSelector.test.ts
+++ b/report-viewer/tests/unit/components/optionsSelectors/MetricSelector.test.ts
@@ -1,7 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import { mount } from '@vue/test-utils'
 import MetricSelector from '@/components/optionsSelectors/MetricSelector.vue'
-import OptionComponent from '@/components/optionsSelectors/OptionComponent.vue'
 import { MetricType } from '@/model/MetricType'
 
 describe('OptionSelectorComponent', () => {

From 2a7a129b2e183c4d4053b39ce2d00e9a3fb8d29b Mon Sep 17 00:00:00 2001
From: Alex | Kronox <alexander_vogt@outlook.de>
Date: Mon, 11 Sep 2023 10:22:48 +0200
Subject: [PATCH 28/57] fix url problems

---
 report-viewer/src/model/factories/BaseFactory.ts          | 5 ++++-
 .../tests/unit/model/factories/ComparisonFactory.test.ts  | 8 ++++----
 .../tests/unit/model/factories/OverviewFactory.test.ts    | 8 ++++----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/report-viewer/src/model/factories/BaseFactory.ts b/report-viewer/src/model/factories/BaseFactory.ts
index 4dc31d8a0..d29dea8a8 100644
--- a/report-viewer/src/model/factories/BaseFactory.ts
+++ b/report-viewer/src/model/factories/BaseFactory.ts
@@ -14,7 +14,9 @@ export class BaseFactory {
   protected static async getFile(path: string): Promise<string> {
     if (store().state.localModeUsed) {
       if (store().state.zipModeUsed) {
-        await new ZipFileHandler().handleFile(await this.getLocalFile('results.zip'))
+        await new ZipFileHandler().handleFile(
+          await this.getLocalFile(window.location.origin + '/results.zip')
+        )
         return this.getFileFromStore(path)
       } else {
         return await (await this.getLocalFile(`/files/${path}`)).text()
@@ -47,6 +49,7 @@ export class BaseFactory {
    */
   protected static async getLocalFile(path: string): Promise<Blob> {
     const request = await fetch(path)
+    console.log(request)
 
     if (request.status == 200) {
       return request.blob()
diff --git a/report-viewer/tests/unit/model/factories/ComparisonFactory.test.ts b/report-viewer/tests/unit/model/factories/ComparisonFactory.test.ts
index d2a835f46..1b0a34aab 100644
--- a/report-viewer/tests/unit/model/factories/ComparisonFactory.test.ts
+++ b/report-viewer/tests/unit/model/factories/ComparisonFactory.test.ts
@@ -38,10 +38,10 @@ describe('Test JSON to Comparison', () => {
     }))
   })
 
-  it('Post 5.0', () => {
+  it('Post 5.0', async () => {
     store.state.files['root1-root2.json'] = JSON.stringify(validNew)
 
-    const result = ComparisonFactory.getComparison('root1', 'root2')
+    const result = await ComparisonFactory.getComparison('root1', 'root2')
 
     expect(result).toBeDefined()
     expect(result.firstSubmissionId).toBe('root1')
@@ -55,10 +55,10 @@ describe('Test JSON to Comparison', () => {
     expect(result.matchesInSecondSubmissions.size).toBe(2)
   })
 
-  it('Pre 5.0', () => {
+  it('Pre 5.0', async () => {
     store.state.files['root1-root2.json'] = JSON.stringify(validOld)
 
-    const result = ComparisonFactory.getComparison('root1', 'root2')
+    const result = await ComparisonFactory.getComparison('root1', 'root2')
 
     expect(result).toBeDefined()
     expect(result.firstSubmissionId).toBe('root1')
diff --git a/report-viewer/tests/unit/model/factories/OverviewFactory.test.ts b/report-viewer/tests/unit/model/factories/OverviewFactory.test.ts
index 8a9f3f164..f2602f3c1 100644
--- a/report-viewer/tests/unit/model/factories/OverviewFactory.test.ts
+++ b/report-viewer/tests/unit/model/factories/OverviewFactory.test.ts
@@ -36,10 +36,10 @@ describe('Test JSON to Overview', () => {
     vi.spyOn(global.window, 'alert').mockImplementation(() => {})
   })
 
-  it('Post 5.0', () => {
+  it('Post 5.0', async () => {
     store.state.files['overview.json'] = JSON.stringify(validNew)
 
-    expect(OverviewFactory.getOverview()).toEqual({
+    expect(await OverviewFactory.getOverview()).toEqual({
       _submissionFolderPath: ['files'],
       _baseCodeFolderPath: '',
       _language: 'Javac based AST plugin',
@@ -134,9 +134,9 @@ describe('Test JSON to Overview', () => {
     })
   })
 
-  it('Pre 5.0', () => {
+  it('Pre 5.0', async () => {
     store.state.files['overview.json'] = JSON.stringify(validOld)
-    expect(OverviewFactory.getOverview()).toEqual({
+    expect(await OverviewFactory.getOverview()).toEqual({
       _submissionFolderPath: ['test'],
       _baseCodeFolderPath: '',
       _language: 'Javac based AST plugin',

From 9b2d083234572ab7658cd432e27471e59c5e9276 Mon Sep 17 00:00:00 2001
From: Alex | Kronox <alexander_vogt@outlook.de>
Date: Mon, 11 Sep 2023 11:10:13 +0200
Subject: [PATCH 29/57] fix classic local mode

---
 report-viewer/src/model/factories/BaseFactory.ts       | 8 ++------
 report-viewer/src/model/factories/ComparisonFactory.ts | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/report-viewer/src/model/factories/BaseFactory.ts b/report-viewer/src/model/factories/BaseFactory.ts
index d29dea8a8..ec7fe0dcd 100644
--- a/report-viewer/src/model/factories/BaseFactory.ts
+++ b/report-viewer/src/model/factories/BaseFactory.ts
@@ -14,9 +14,7 @@ export class BaseFactory {
   protected static async getFile(path: string): Promise<string> {
     if (store().state.localModeUsed) {
       if (store().state.zipModeUsed) {
-        await new ZipFileHandler().handleFile(
-          await this.getLocalFile(window.location.origin + '/results.zip')
-        )
+        await new ZipFileHandler().handleFile(await this.getLocalFile('results.zip'))
         return this.getFileFromStore(path)
       } else {
         return await (await this.getLocalFile(`/files/${path}`)).text()
@@ -48,9 +46,7 @@ export class BaseFactory {
    * @throws Error if the file could not be found
    */
   protected static async getLocalFile(path: string): Promise<Blob> {
-    const request = await fetch(path)
-    console.log(request)
-
+    const request = await fetch(window.location.origin + '/' + path)
     if (request.status == 200) {
       return request.blob()
     } else {
diff --git a/report-viewer/src/model/factories/ComparisonFactory.ts b/report-viewer/src/model/factories/ComparisonFactory.ts
index 15aa886df..355e2c795 100644
--- a/report-viewer/src/model/factories/ComparisonFactory.ts
+++ b/report-viewer/src/model/factories/ComparisonFactory.ts
@@ -82,7 +82,7 @@ export class ComparisonFactory extends BaseFactory {
 
   private static async getSubmissionFileListFromLocal(submissionId: string): Promise<string[]> {
     return JSON.parse(
-      await this.getLocalFile(`submissionFileIndex.json`).then((file) => file.text())
+      await this.getLocalFile(`files/submissionFileIndex.json`).then((file) => file.text())
     ).submission_file_indexes[submissionId].map((file: string) => slash(file))
   }
 
@@ -93,7 +93,7 @@ export class ComparisonFactory extends BaseFactory {
         store().saveSubmissionFile({
           fileName: slash(filePath),
           submissionId: submissionId,
-          data: await this.getLocalFile(`files/${filePath}`).then((file) => file.text())
+          data: await this.getLocalFile(`files/files/${filePath}`).then((file) => file.text())
         })
       }
     } catch (e) {

From c9e08a56d8b1ac9d6f6125cb4001431df68b22b0 Mon Sep 17 00:00:00 2001
From: Alex | Kronox <alexander_vogt@outlook.de>
Date: Mon, 11 Sep 2023 11:13:57 +0200
Subject: [PATCH 30/57] revert changes to config file

---
 report-viewer/tsconfig.app.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/report-viewer/tsconfig.app.json b/report-viewer/tsconfig.app.json
index c6a3e841f..342a91072 100644
--- a/report-viewer/tsconfig.app.json
+++ b/report-viewer/tsconfig.app.json
@@ -1,6 +1,6 @@
 {
   "extends": ["@vue/tsconfig/tsconfig.dom.json", "./tsconfig.module.json"],
-  "include": ["env.d.ts", "src/**/*", "src/**/*.vue", "src/**/*.json", "FileHandler.ts"],
+  "include": ["env.d.ts", "src/**/*", "src/**/*.vue", "src/**/*.json"],
   "exclude": ["src/**/__tests__/*"],
   "compilerOptions": {
     "composite": true,

From 9f66c2b6130bffa84507c380cd20a8d51e3fa3a3 Mon Sep 17 00:00:00 2001
From: Alex | Kronox <alexander_vogt@outlook.de>
Date: Mon, 11 Sep 2023 12:02:31 +0200
Subject: [PATCH 31/57] remove wrong file

---
 report-viewer/FileHandler.ts | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 report-viewer/FileHandler.ts

diff --git a/report-viewer/FileHandler.ts b/report-viewer/FileHandler.ts
deleted file mode 100644
index bd55ed100..000000000
--- a/report-viewer/FileHandler.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Abstract base class for handling files.
- */
-export abstract class FileHandler {
-  /**
-   * Loads the content of the given file and stores it in the store.
-   * @param file File to handle
-   */
-  public abstract handleFile(file: Blob): Promise<any>
-}

From 4488e9a2911c2ef7a50b4aee2e30ae4cfb646b24 Mon Sep 17 00:00:00 2001
From: Alex | Kronox <alexander_vogt@outlook.de>
Date: Mon, 11 Sep 2023 12:25:58 +0200
Subject: [PATCH 32/57] fix build error

---
 report-viewer/src/utils/fileHandling/JsonFileHandler.ts | 2 +-
 report-viewer/src/utils/fileHandling/ZipFileHandler.ts  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/report-viewer/src/utils/fileHandling/JsonFileHandler.ts b/report-viewer/src/utils/fileHandling/JsonFileHandler.ts
index 162cf2d97..1d3dce180 100644
--- a/report-viewer/src/utils/fileHandling/JsonFileHandler.ts
+++ b/report-viewer/src/utils/fileHandling/JsonFileHandler.ts
@@ -1,5 +1,5 @@
 import { store } from '@/stores/store'
-import { FileHandler } from '../../../FileHandler'
+import { FileHandler } from './FileHandler'
 
 /**
  * Class for handling single json files.
diff --git a/report-viewer/src/utils/fileHandling/ZipFileHandler.ts b/report-viewer/src/utils/fileHandling/ZipFileHandler.ts
index a746c9816..5702d2bac 100644
--- a/report-viewer/src/utils/fileHandling/ZipFileHandler.ts
+++ b/report-viewer/src/utils/fileHandling/ZipFileHandler.ts
@@ -1,7 +1,7 @@
 import { store } from '@/stores/store'
 import jszip from 'jszip'
 import slash from 'slash'
-import { FileHandler } from '../../../FileHandler'
+import { FileHandler } from './FileHandler'
 
 /**
  * Class for handling zip files.

From 3efd49600a7e4c890e27e38ca6183f65aaeb252e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20Br=C3=B6del?= <moritz.broedel@gmail.com>
Date: Wed, 13 Sep 2023 13:58:10 +0200
Subject: [PATCH 33/57] Remove explicit super() calls

---
 .../main/java/de/jplag/antlr/AbstractAntlrListener.java  | 7 +++++--
 .../java/de/jplag/antlr/AbstractAntlrParserAdapter.java  | 1 -
 .../src/main/java/de/jplag/antlr/TokenCollector.java     | 9 ++++++---
 .../java/de/jplag/antlr/testLanguage/TestListener.java   | 2 --
 .../cpp2/src/main/java/de/jplag/cpp2/CPPListener.java    | 2 --
 .../src/main/java/de/jplag/kotlin/KotlinListener.java    | 2 --
 .../src/main/java/de/jplag/llvmir/LLVMIRListener.java    | 2 --
 7 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java
index a1ea6ebdb..f4144b72e 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrListener.java
@@ -12,13 +12,16 @@
 import org.antlr.v4.runtime.tree.TerminalNode;
 
 /**
- * Base class for Antlr listeners. This is a quasi-static class that is only created once per language. Use by
- * overwriting the constructor, calling super(), and then calling the visit methods.
+ * Base class for Antlr listeners. This is a quasi-static class that is only created once per language. Use by calling
+ * the visit methods in the overwritten constructor.
  */
 public abstract class AbstractAntlrListener {
     private final List<ContextVisitor<ParserRuleContext>> contextVisitors;
     private final List<TerminalVisitor> terminalVisitors;
 
+    /**
+     * New instance
+     */
     protected AbstractAntlrListener() {
         contextVisitors = new ArrayList<>();
         terminalVisitors = new ArrayList<>();
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrParserAdapter.java b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrParserAdapter.java
index d6582b793..1644ccf7b 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrParserAdapter.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/AbstractAntlrParserAdapter.java
@@ -33,7 +33,6 @@ public abstract class AbstractAntlrParserAdapter<T extends Parser> extends Abstr
      * @param extractsSemantics If true, the listener will extract semantics along with every token
      */
     protected AbstractAntlrParserAdapter(boolean extractsSemantics) {
-        super();
         this.extractsSemantics = extractsSemantics;
     }
 
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/TokenCollector.java b/language-antlr-utils/src/main/java/de/jplag/antlr/TokenCollector.java
index d82e30155..7a284d015 100644
--- a/language-antlr-utils/src/main/java/de/jplag/antlr/TokenCollector.java
+++ b/language-antlr-utils/src/main/java/de/jplag/antlr/TokenCollector.java
@@ -39,8 +39,9 @@ List<Token> getTokens() {
     <T> void addToken(TokenType jplagType, Function<T, CodeSemantics> semanticsSupplier, T entity,
             Function<T, org.antlr.v4.runtime.Token> extractToken, VariableRegistry variableRegistry) {
         if (jplagType == null) {
-            if (semanticsSupplier != null)
+            if (semanticsSupplier != null) {
                 logger.warning("Received semantics, but no token type, so no token was generated and the semantics discarded");
+            }
             return;
         }
         org.antlr.v4.runtime.Token antlrToken = extractToken.apply(entity);
@@ -49,14 +50,16 @@ <T> void addToken(TokenType jplagType, Function<T, CodeSemantics> semanticsSuppl
         int length = antlrToken.getText().length();
         Token token;
         if (extractsSemantics) {
-            if (semanticsSupplier == null)
+            if (semanticsSupplier == null) {
                 throw new IllegalStateException(String.format("Expected semantics bud did not receive any for token %s", jplagType.getDescription()));
+            }
             CodeSemantics semantics = semanticsSupplier.apply(entity);
             token = new Token(jplagType, this.file, line, column, length, semantics);
             variableRegistry.updateSemantics(semantics);
         } else {
-            if (semanticsSupplier != null)
+            if (semanticsSupplier != null) {
                 logger.warning(() -> String.format("Received semantics for token %s despite not expecting any", jplagType.getDescription()));
+            }
             token = new Token(jplagType, this.file, line, column, length);
         }
         addToken(token);
diff --git a/language-antlr-utils/src/test/java/de/jplag/antlr/testLanguage/TestListener.java b/language-antlr-utils/src/test/java/de/jplag/antlr/testLanguage/TestListener.java
index c87e50128..9073ad954 100644
--- a/language-antlr-utils/src/test/java/de/jplag/antlr/testLanguage/TestListener.java
+++ b/language-antlr-utils/src/test/java/de/jplag/antlr/testLanguage/TestListener.java
@@ -10,8 +10,6 @@
 class TestListener extends AbstractAntlrListener {
 
     TestListener() {
-        super();
-
         visit(VarDefContext.class).map(VARDEF).withSemantics(CodeSemantics::createKeep)
                 .onEnter((rule, variableRegistry) -> variableRegistry.registerVariable(rule.VAR_NAME().getText(), VariableScope.FILE, false));
         visit(CalcExpressionContext.class, rule -> rule.operator() != null && rule.operator().PLUS() != null).map(ADDITION).withControlSemantics();
diff --git a/languages/cpp2/src/main/java/de/jplag/cpp2/CPPListener.java b/languages/cpp2/src/main/java/de/jplag/cpp2/CPPListener.java
index c9710635f..6b2a68c49 100644
--- a/languages/cpp2/src/main/java/de/jplag/cpp2/CPPListener.java
+++ b/languages/cpp2/src/main/java/de/jplag/cpp2/CPPListener.java
@@ -15,8 +15,6 @@
 class CPPListener extends AbstractAntlrListener {
 
     CPPListener() {
-        super();
-
         visit(ClassSpecifierContext.class, rule -> rule.classHead().Union() != null).map(UNION_BEGIN, UNION_END);
         visit(ClassSpecifierContext.class, rule -> rule.classHead().classKey() != null && rule.classHead().classKey().Class() != null)
                 .map(CLASS_BEGIN, CLASS_END);
diff --git a/languages/kotlin/src/main/java/de/jplag/kotlin/KotlinListener.java b/languages/kotlin/src/main/java/de/jplag/kotlin/KotlinListener.java
index eaa8c43e2..19a475ffa 100644
--- a/languages/kotlin/src/main/java/de/jplag/kotlin/KotlinListener.java
+++ b/languages/kotlin/src/main/java/de/jplag/kotlin/KotlinListener.java
@@ -99,8 +99,6 @@
 class KotlinListener extends AbstractAntlrListener {
 
     KotlinListener() {
-        super();
-
         visit(PackageHeaderContext.class).map(PACKAGE);
         visit(ImportHeaderContext.class).map(IMPORT);
         visit(ClassDeclarationContext.class).map(CLASS_DECLARATION);
diff --git a/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRListener.java b/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRListener.java
index 6c4988db6..24e70a9ca 100644
--- a/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRListener.java
+++ b/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRListener.java
@@ -120,8 +120,6 @@
 class LLVMIRListener extends AbstractAntlrListener {
 
     LLVMIRListener() {
-        super();
-
         visit(SourceFilenameContext.class).map(FILENAME);
         visit(ModuleAsmContext.class).map(ASSEMBLY);
         visit(TypeDefContext.class).map(TYPE_DEFINITION);

From d1db0e98dc071fda46d6fb8ecbfdfc8251555e04 Mon Sep 17 00:00:00 2001
From: Olmo Kramer <olmo@codegrade.com>
Date: Thu, 14 Sep 2023 11:08:21 +0200
Subject: [PATCH 34/57] Allow passing multiple options in the "Advanced" group

By default, `picocli` sets `exclusive = true` on `ArgGroup`s, which
means that it is not allowed to pass multiple options within the group
[1].

[1] https://picocli.info/#_mutually_exclusive_options
---
 cli/src/main/java/de/jplag/cli/CliOptions.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli/src/main/java/de/jplag/cli/CliOptions.java b/cli/src/main/java/de/jplag/cli/CliOptions.java
index 573707b86..c55e71f3b 100644
--- a/cli/src/main/java/de/jplag/cli/CliOptions.java
+++ b/cli/src/main/java/de/jplag/cli/CliOptions.java
@@ -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")

From 36dae0ffca407d2d6e69d15329ad45f4805d84fa Mon Sep 17 00:00:00 2001
From: Olmo Kramer <olmo@codegrade.com>
Date: Thu, 14 Sep 2023 11:33:58 +0200
Subject: [PATCH 35/57] Add test for the advanced options group

---
 .../java/de/jplag/cli/AdvancedGroupTest.java  | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 cli/src/test/java/de/jplag/cli/AdvancedGroupTest.java

diff --git a/cli/src/test/java/de/jplag/cli/AdvancedGroupTest.java b/cli/src/test/java/de/jplag/cli/AdvancedGroupTest.java
new file mode 100644
index 000000000..bc88af731
--- /dev/null
+++ b/cli/src/test/java/de/jplag/cli/AdvancedGroupTest.java
@@ -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());
+    }
+}

From c451e87cb88bc08483787aa866e04665e3726149 Mon Sep 17 00:00:00 2001
From: Alexander Vogt <alexander_vogt@outlook.de>
Date: Thu, 14 Sep 2023 13:54:53 +0200
Subject: [PATCH 36/57] delay showing tooltip

---
 report-viewer/src/components/ToolTipComponent.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/report-viewer/src/components/ToolTipComponent.vue b/report-viewer/src/components/ToolTipComponent.vue
index 345fd7db7..7bf83910e 100644
--- a/report-viewer/src/components/ToolTipComponent.vue
+++ b/report-viewer/src/components/ToolTipComponent.vue
@@ -2,7 +2,7 @@
   <div class="group relative inline-block">
     <slot></slot>
     <div
-      class="absolute z-10 hidden rounded-md px-1 text-center text-white group-hover:block"
+      class="delay-visible invisible absolute z-10 rounded-md px-1 text-center text-white group-hover:visible"
       :style="tooltipPosition"
     >
       <slot name="tooltip"></slot>
@@ -71,3 +71,13 @@ const arrowStyle = computed(() => {
   return style
 })
 </script>
+
+<style scoped>
+.delay-visible {
+  transition-delay: 0s;
+}
+
+*:hover > .delay-visible {
+  transition-delay: 0.25s;
+}
+</style>

From 52fd4b76443353300bed18d1087bfdd8030ea1b5 Mon Sep 17 00:00:00 2001
From: Alex | Kronox <alexander_vogt@outlook.de>
Date: Thu, 14 Sep 2023 17:03:34 +0200
Subject: [PATCH 37/57] default option for metric selector

---
 report-viewer/src/components/ToolTipComponent.vue          | 2 +-
 .../src/components/optionsSelectors/MetricSelector.vue     | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/report-viewer/src/components/ToolTipComponent.vue b/report-viewer/src/components/ToolTipComponent.vue
index 7bf83910e..57aeda733 100644
--- a/report-viewer/src/components/ToolTipComponent.vue
+++ b/report-viewer/src/components/ToolTipComponent.vue
@@ -78,6 +78,6 @@ const arrowStyle = computed(() => {
 }
 
 *:hover > .delay-visible {
-  transition-delay: 0.25s;
+  transition-delay: 0.2s;
 }
 </style>
diff --git a/report-viewer/src/components/optionsSelectors/MetricSelector.vue b/report-viewer/src/components/optionsSelectors/MetricSelector.vue
index 0ff0d9735..345d4ed68 100644
--- a/report-viewer/src/components/optionsSelectors/MetricSelector.vue
+++ b/report-viewer/src/components/optionsSelectors/MetricSelector.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, type Ref } from 'vue'
+import { computed, type PropType, type Ref } from 'vue'
 import OptionsSelectorComponent from './OptionsSelectorComponent.vue'
 import { MetricType, metricToolTips } from '@/model/MetricType'
 
@@ -21,6 +21,11 @@ const props = defineProps({
     type: String,
     required: false,
     default: ''
+  },
+  defaultSelection: {
+    type: String as PropType<MetricType>,
+    required: false,
+    default: MetricType.AVERAGE
   }
 })
 

From abbcdfb9a01aaa22969e93f0512845c063a53b12 Mon Sep 17 00:00:00 2001
From: Alexander Vogt <alexander_vogt@outlook.de>
Date: Fri, 15 Sep 2023 10:29:38 +0200
Subject: [PATCH 38/57] change delay to tailwind classes

---
 report-viewer/src/components/ToolTipComponent.vue | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/report-viewer/src/components/ToolTipComponent.vue b/report-viewer/src/components/ToolTipComponent.vue
index 57aeda733..48212c0f5 100644
--- a/report-viewer/src/components/ToolTipComponent.vue
+++ b/report-viewer/src/components/ToolTipComponent.vue
@@ -2,7 +2,7 @@
   <div class="group relative inline-block">
     <slot></slot>
     <div
-      class="delay-visible invisible absolute z-10 rounded-md px-1 text-center text-white group-hover:visible"
+      class="invisible absolute z-10 rounded-md px-1 text-center text-white delay-0 group-hover:visible group-hover:delay-200"
       :style="tooltipPosition"
     >
       <slot name="tooltip"></slot>
@@ -71,13 +71,3 @@ const arrowStyle = computed(() => {
   return style
 })
 </script>
-
-<style scoped>
-.delay-visible {
-  transition-delay: 0s;
-}
-
-*:hover > .delay-visible {
-  transition-delay: 0.2s;
-}
-</style>

From 3b6050acab93c71f5dbf5939d72c1f8202da0e8e Mon Sep 17 00:00:00 2001
From: Alex | Kronox <alexander_vogt@outlook.de>
Date: Mon, 18 Sep 2023 12:33:50 +0200
Subject: [PATCH 39/57] node v18

---
 .github/workflows/report-viewer-build-test.yml | 2 +-
 .github/workflows/report-viewer-dev.yml        | 2 +-
 .github/workflows/report-viewer-e2e.yml        | 2 +-
 .github/workflows/report-viewer-lint.yml       | 4 ++--
 .github/workflows/report-viewer-prettier.yml   | 2 +-
 .github/workflows/report-viewer-unit.yml       | 2 +-
 .github/workflows/report-viewer.yml            | 2 +-
 report-viewer/package-lock.json                | 8 ++++----
 report-viewer/package.json                     | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/report-viewer-build-test.yml b/.github/workflows/report-viewer-build-test.yml
index 1e51bfefb..aa80c86dd 100644
--- a/.github/workflows/report-viewer-build-test.yml
+++ b/.github/workflows/report-viewer-build-test.yml
@@ -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
diff --git a/.github/workflows/report-viewer-dev.yml b/.github/workflows/report-viewer-dev.yml
index e6bf77f37..92fe97407 100644
--- a/.github/workflows/report-viewer-dev.yml
+++ b/.github/workflows/report-viewer-dev.yml
@@ -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
diff --git a/.github/workflows/report-viewer-e2e.yml b/.github/workflows/report-viewer-e2e.yml
index b9ac6354c..9e265b910 100644
--- a/.github/workflows/report-viewer-e2e.yml
+++ b/.github/workflows/report-viewer-e2e.yml
@@ -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
diff --git a/.github/workflows/report-viewer-lint.yml b/.github/workflows/report-viewer-lint.yml
index 768cdd6c5..924b274e7 100644
--- a/.github/workflows/report-viewer-lint.yml
+++ b/.github/workflows/report-viewer-lint.yml
@@ -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:
@@ -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
diff --git a/.github/workflows/report-viewer-prettier.yml b/.github/workflows/report-viewer-prettier.yml
index 2da72eec3..e9933c24e 100644
--- a/.github/workflows/report-viewer-prettier.yml
+++ b/.github/workflows/report-viewer-prettier.yml
@@ -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
diff --git a/.github/workflows/report-viewer-unit.yml b/.github/workflows/report-viewer-unit.yml
index 1d3012e4e..48f9082a7 100644
--- a/.github/workflows/report-viewer-unit.yml
+++ b/.github/workflows/report-viewer-unit.yml
@@ -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
diff --git a/.github/workflows/report-viewer.yml b/.github/workflows/report-viewer.yml
index eb3642828..624dde7c5 100644
--- a/.github/workflows/report-viewer.yml
+++ b/.github/workflows/report-viewer.yml
@@ -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
diff --git a/report-viewer/package-lock.json b/report-viewer/package-lock.json
index 0ea377c82..ea4cca179 100644
--- a/report-viewer/package-lock.json
+++ b/report-viewer/package-lock.json
@@ -28,7 +28,7 @@
         "@playwright/test": "^1.37.1",
         "@rushstack/eslint-patch": "^1.3.3",
         "@types/jsdom": "^21.1.2",
-        "@types/node": "^20.6.0",
+        "@types/node": "^18.11.9",
         "@vitejs/plugin-vue": "^4.3.4",
         "@vue/eslint-config-prettier": "^8.0.0",
         "@vue/eslint-config-typescript": "^11.0.3",
@@ -788,9 +788,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.6.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.6.0.tgz",
-      "integrity": "sha512-najjVq5KN2vsH2U/xyh2opaSEz6cZMR2SetLIlxlj08nOcmPOemJmUK2o4kUzfLqfrWE0PIrNeE16XhYDd3nqg==",
+      "version": "18.17.17",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.17.tgz",
+      "integrity": "sha512-cOxcXsQ2sxiwkykdJqvyFS+MLQPLvIdwh5l6gNg8qF6s+C7XSkEWOZjK+XhUZd+mYvHV/180g2cnCcIl4l06Pw==",
       "dev": true
     },
     "node_modules/@types/semver": {
diff --git a/report-viewer/package.json b/report-viewer/package.json
index 3650b11e7..1ecabf94d 100644
--- a/report-viewer/package.json
+++ b/report-viewer/package.json
@@ -37,7 +37,7 @@
     "@playwright/test": "^1.37.1",
     "@rushstack/eslint-patch": "^1.3.3",
     "@types/jsdom": "^21.1.2",
-    "@types/node": "^20.6.0",
+    "@types/node": "^18.11.9",
     "@vitejs/plugin-vue": "^4.3.4",
     "@vue/eslint-config-prettier": "^8.0.0",
     "@vue/eslint-config-typescript": "^11.0.3",

From abfe349d43ef7be72f9b22184e61d213bd7ee159 Mon Sep 17 00:00:00 2001
From: Alex | Kronox <alexander_vogt@outlook.de>
Date: Mon, 18 Sep 2023 18:23:27 +0200
Subject: [PATCH 40/57] remove log message

---
 report-viewer/src/views/OverviewView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/report-viewer/src/views/OverviewView.vue b/report-viewer/src/views/OverviewView.vue
index a1d0bf14f..4f030beb8 100644
--- a/report-viewer/src/views/OverviewView.vue
+++ b/report-viewer/src/views/OverviewView.vue
@@ -213,7 +213,7 @@ const submissionPathValue = hasMoreSubmissionPaths
   : overview.submissionFolderPath[0]
 
 onErrorCaptured((e) => {
-  console.log('here', e)
+  console.log(e)
   router.push({
     name: 'ErrorView',
     state: {

From 482ad43a838d7957163c82fcce2c87a2ee244969 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Sep 2023 16:52:39 +0200
Subject: [PATCH 41/57] Dependency(deps-dev): Bump @playwright/test from 1.37.1
 to 1.38.0 in /report-viewer (#1306)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 report-viewer/package-lock.json | 38 ++++++++++++++++++++++-----------
 report-viewer/package.json      |  2 +-
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/report-viewer/package-lock.json b/report-viewer/package-lock.json
index ea4cca179..2418946bc 100644
--- a/report-viewer/package-lock.json
+++ b/report-viewer/package-lock.json
@@ -25,7 +25,7 @@
         "vue-virtual-scroller": "^2.0.0-beta.8"
       },
       "devDependencies": {
-        "@playwright/test": "^1.37.1",
+        "@playwright/test": "^1.38.0",
         "@rushstack/eslint-patch": "^1.3.3",
         "@types/jsdom": "^21.1.2",
         "@types/node": "^18.11.9",
@@ -716,22 +716,18 @@
       "dev": true
     },
     "node_modules/@playwright/test": {
-      "version": "1.37.1",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.37.1.tgz",
-      "integrity": "sha512-bq9zTli3vWJo8S3LwB91U0qDNQDpEXnw7knhxLM0nwDvexQAwx9tO8iKDZSqqneVq+URd/WIoz+BALMqUTgdSg==",
+      "version": "1.38.0",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.38.0.tgz",
+      "integrity": "sha512-xis/RXXsLxwThKnlIXouxmIvvT3zvQj1JE39GsNieMUrMpb3/GySHDh2j8itCG22qKVD4MYLBp7xB73cUW/UUw==",
       "dev": true,
       "dependencies": {
-        "@types/node": "*",
-        "playwright-core": "1.37.1"
+        "playwright": "1.38.0"
       },
       "bin": {
         "playwright": "cli.js"
       },
       "engines": {
         "node": ">=16"
-      },
-      "optionalDependencies": {
-        "fsevents": "2.3.2"
       }
     },
     "node_modules/@rushstack/eslint-patch": {
@@ -4833,10 +4829,28 @@
         "pathe": "^1.1.0"
       }
     },
+    "node_modules/playwright": {
+      "version": "1.38.0",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.38.0.tgz",
+      "integrity": "sha512-fJGw+HO0YY+fU/F1N57DMO+TmXHTrmr905J05zwAQE9xkuwP/QLDk63rVhmyxh03dYnEhnRbsdbH9B0UVVRB3A==",
+      "dev": true,
+      "dependencies": {
+        "playwright-core": "1.38.0"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "optionalDependencies": {
+        "fsevents": "2.3.2"
+      }
+    },
     "node_modules/playwright-core": {
-      "version": "1.37.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.37.1.tgz",
-      "integrity": "sha512-17EuQxlSIYCmEMwzMqusJ2ztDgJePjrbttaefgdsiqeLWidjYz9BxXaTaZWxH1J95SHGk6tjE+dwgWILJoUZfA==",
+      "version": "1.38.0",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.38.0.tgz",
+      "integrity": "sha512-f8z1y8J9zvmHoEhKgspmCvOExF2XdcxMW8jNRuX4vkQFrzV4MlZ55iwb5QeyiFQgOFCUolXiRHgpjSEnqvO48g==",
       "dev": true,
       "bin": {
         "playwright-core": "cli.js"
diff --git a/report-viewer/package.json b/report-viewer/package.json
index 1ecabf94d..f8c09da89 100644
--- a/report-viewer/package.json
+++ b/report-viewer/package.json
@@ -34,7 +34,7 @@
     "vue-virtual-scroller": "^2.0.0-beta.8"
   },
   "devDependencies": {
-    "@playwright/test": "^1.37.1",
+    "@playwright/test": "^1.38.0",
     "@rushstack/eslint-patch": "^1.3.3",
     "@types/jsdom": "^21.1.2",
     "@types/node": "^18.11.9",

From 1b64236d1db6ec38104f57cea4b456a327d763f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Sep 2023 16:57:51 +0200
Subject: [PATCH 42/57] Dependency(deps-dev): Bump postcss from 8.4.29 to
 8.4.30 in /report-viewer (#1304)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 report-viewer/package-lock.json | 8 ++++----
 report-viewer/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/report-viewer/package-lock.json b/report-viewer/package-lock.json
index 2418946bc..daaf1b9d3 100644
--- a/report-viewer/package-lock.json
+++ b/report-viewer/package-lock.json
@@ -41,7 +41,7 @@
         "jsdom": "^22.1.0",
         "lint-staged": "^14.0.1",
         "npm-run-all": "^4.1.5",
-        "postcss": "^8.4.29",
+        "postcss": "^8.4.30",
         "prettier": "^3.0.3",
         "prettier-plugin-tailwindcss": "^0.5.4",
         "tailwindcss": "^3.3.3",
@@ -4860,9 +4860,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.29",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.29.tgz",
-      "integrity": "sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw==",
+      "version": "8.4.30",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz",
+      "integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==",
       "funding": [
         {
           "type": "opencollective",
diff --git a/report-viewer/package.json b/report-viewer/package.json
index f8c09da89..8f7d31981 100644
--- a/report-viewer/package.json
+++ b/report-viewer/package.json
@@ -50,7 +50,7 @@
     "jsdom": "^22.1.0",
     "lint-staged": "^14.0.1",
     "npm-run-all": "^4.1.5",
-    "postcss": "^8.4.29",
+    "postcss": "^8.4.30",
     "prettier": "^3.0.3",
     "prettier-plugin-tailwindcss": "^0.5.4",
     "tailwindcss": "^3.3.3",

From 1e4a5bf208b90a394d55d9866bc1a6ce89cdf75f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Sep 2023 16:59:21 +0200
Subject: [PATCH 43/57] Dependency(deps-dev): Bump @types/jsdom from 21.1.2 to
 21.1.3 in /report-viewer (#1305)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 report-viewer/package-lock.json | 8 ++++----
 report-viewer/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/report-viewer/package-lock.json b/report-viewer/package-lock.json
index daaf1b9d3..5221ae61c 100644
--- a/report-viewer/package-lock.json
+++ b/report-viewer/package-lock.json
@@ -27,7 +27,7 @@
       "devDependencies": {
         "@playwright/test": "^1.38.0",
         "@rushstack/eslint-patch": "^1.3.3",
-        "@types/jsdom": "^21.1.2",
+        "@types/jsdom": "^21.1.3",
         "@types/node": "^18.11.9",
         "@vitejs/plugin-vue": "^4.3.4",
         "@vue/eslint-config-prettier": "^8.0.0",
@@ -767,9 +767,9 @@
       }
     },
     "node_modules/@types/jsdom": {
-      "version": "21.1.2",
-      "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-21.1.2.tgz",
-      "integrity": "sha512-bGj+7TaCkOwkJfx7HtS9p22Ij0A2aKMuz8a1+owpkxa1wU/HUBy/WAXhdv90uDdVI9rSjGvUrXmLSeA9VP3JeA==",
+      "version": "21.1.3",
+      "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-21.1.3.tgz",
+      "integrity": "sha512-1zzqSP+iHJYV4lB3lZhNBa012pubABkj9yG/GuXuf6LZH1cSPIJBqFDrm5JX65HHt6VOnNYdTui/0ySerRbMgA==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
diff --git a/report-viewer/package.json b/report-viewer/package.json
index 8f7d31981..507ba2e8a 100644
--- a/report-viewer/package.json
+++ b/report-viewer/package.json
@@ -36,7 +36,7 @@
   "devDependencies": {
     "@playwright/test": "^1.38.0",
     "@rushstack/eslint-patch": "^1.3.3",
-    "@types/jsdom": "^21.1.2",
+    "@types/jsdom": "^21.1.3",
     "@types/node": "^18.11.9",
     "@vitejs/plugin-vue": "^4.3.4",
     "@vue/eslint-config-prettier": "^8.0.0",

From fdbeec782d322192685badb29f1aabb859dacda9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Sep 2023 17:05:51 +0200
Subject: [PATCH 44/57] Dependency(deps-dev): Bump @rushstack/eslint-patch from
 1.3.3 to 1.4.0 in /report-viewer (#1308)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 report-viewer/package-lock.json | 8 ++++----
 report-viewer/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/report-viewer/package-lock.json b/report-viewer/package-lock.json
index 5221ae61c..4c063d310 100644
--- a/report-viewer/package-lock.json
+++ b/report-viewer/package-lock.json
@@ -26,7 +26,7 @@
       },
       "devDependencies": {
         "@playwright/test": "^1.38.0",
-        "@rushstack/eslint-patch": "^1.3.3",
+        "@rushstack/eslint-patch": "^1.4.0",
         "@types/jsdom": "^21.1.3",
         "@types/node": "^18.11.9",
         "@vitejs/plugin-vue": "^4.3.4",
@@ -731,9 +731,9 @@
       }
     },
     "node_modules/@rushstack/eslint-patch": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.3.3.tgz",
-      "integrity": "sha512-0xd7qez0AQ+MbHatZTlI1gu5vkG8r7MYRUJAHPAHJBmGLs16zpkrpAVLvjQKQOqaXPDUBwOiJzNc00znHSCVBw==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.4.0.tgz",
+      "integrity": "sha512-cEjvTPU32OM9lUFegJagO0mRnIn+rbqrG89vV8/xLnLFX0DoR0r1oy5IlTga71Q7uT3Qus7qm7wgeiMT/+Irlg==",
       "dev": true
     },
     "node_modules/@sinclair/typebox": {
diff --git a/report-viewer/package.json b/report-viewer/package.json
index 507ba2e8a..c88eef012 100644
--- a/report-viewer/package.json
+++ b/report-viewer/package.json
@@ -35,7 +35,7 @@
   },
   "devDependencies": {
     "@playwright/test": "^1.38.0",
-    "@rushstack/eslint-patch": "^1.3.3",
+    "@rushstack/eslint-patch": "^1.4.0",
     "@types/jsdom": "^21.1.3",
     "@types/node": "^18.11.9",
     "@vitejs/plugin-vue": "^4.3.4",

From c2225241208d10d3c8882ab5d5c79d59c24d307f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Sep 2023 10:33:14 +0000
Subject: [PATCH 45/57] Dependency(deps): Bump
 org.eclipse.emf:org.eclipse.emf.ecore

Bumps [org.eclipse.emf:org.eclipse.emf.ecore](https://github.com/eclipse-emf/org.eclipse.emf) from 2.34.0 to 2.35.0.
- [Commits](https://github.com/eclipse-emf/org.eclipse.emf/commits)

---
updated-dependencies:
- dependency-name: org.eclipse.emf:org.eclipse.emf.ecore
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 801156d6d..bfe20932e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
 
         <antlr2.version>2.7.7</antlr2.version>
         <antlr4.version>4.13.1</antlr4.version>
-        <emf.version>2.34.0</emf.version>
+        <emf.version>2.35.0</emf.version>
         <emf.ecore.version>2.28.0</emf.ecore.version>
         <emf.ecore.xmi.version>2.18.0</emf.ecore.xmi.version>
         <emfatic.version>1.0.0</emfatic.version>

From 2c98dccc7fa445b4d18b6d224ad1bbc84e06f965 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 30 Aug 2023 09:15:26 +0000
Subject: [PATCH 46/57] Dependency(deps): Bump
 org.eclipse.emf:org.eclipse.emf.ecore.xmi

Bumps [org.eclipse.emf:org.eclipse.emf.ecore.xmi](https://github.com/eclipse-emf/org.eclipse.emf) from 2.18.0 to 2.35.0.
- [Commits](https://github.com/eclipse-emf/org.eclipse.emf/commits)

---
updated-dependencies:
- dependency-name: org.eclipse.emf:org.eclipse.emf.ecore.xmi
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bfe20932e..11397f605 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
         <antlr4.version>4.13.1</antlr4.version>
         <emf.version>2.35.0</emf.version>
         <emf.ecore.version>2.28.0</emf.ecore.version>
-        <emf.ecore.xmi.version>2.18.0</emf.ecore.xmi.version>
+        <emf.ecore.xmi.version>2.35.0</emf.ecore.xmi.version>
         <emfatic.version>1.0.0</emfatic.version>
 
         <!-- The Revision of JPlag -->

From 8ef14dda0952f0ecdd763afb2df9f971ded18d18 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 06:45:42 +0000
Subject: [PATCH 47/57] Dependency(deps): Bump
 org.eclipse.emf:org.eclipse.emf.common

Bumps [org.eclipse.emf:org.eclipse.emf.common](https://github.com/eclipse-emf/org.eclipse.emf) from 2.28.0 to 2.29.0.
- [Commits](https://github.com/eclipse-emf/org.eclipse.emf/commits)

---
updated-dependencies:
- dependency-name: org.eclipse.emf:org.eclipse.emf.common
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 11397f605..5eb57edba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,7 @@
         <antlr2.version>2.7.7</antlr2.version>
         <antlr4.version>4.13.1</antlr4.version>
         <emf.version>2.35.0</emf.version>
-        <emf.ecore.version>2.28.0</emf.ecore.version>
+        <emf.ecore.version>2.29.0</emf.ecore.version>
         <emf.ecore.xmi.version>2.35.0</emf.ecore.xmi.version>
         <emfatic.version>1.0.0</emfatic.version>
 

From 094fab85e964119c0c95be5f46cb96c27ce781fc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Sep 2023 09:59:30 +0000
Subject: [PATCH 48/57] Dependency(deps): Bump
 org.apache.maven.plugins:maven-javadoc-plugin

Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.5.0 to 3.6.0.
- [Release notes](https://github.com/apache/maven-javadoc-plugin/releases)
- [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.5.0...maven-javadoc-plugin-3.6.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-javadoc-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5eb57edba..fbc2ce86d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -330,7 +330,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.6.0</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>

From 77e22dd78a90c4d165469e42c37cb8a3ba1f3b6e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Sep 2023 18:04:40 +0200
Subject: [PATCH 49/57] Dependency(deps-dev): Bump eslint from 8.49.0 to 8.50.0
 in /report-viewer (#1318)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 report-viewer/package-lock.json | 16 ++++++++--------
 report-viewer/package.json      |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/report-viewer/package-lock.json b/report-viewer/package-lock.json
index 4c063d310..8cae957e9 100644
--- a/report-viewer/package-lock.json
+++ b/report-viewer/package-lock.json
@@ -35,7 +35,7 @@
         "@vue/test-utils": "^2.4.1",
         "@vue/tsconfig": "^0.4.0",
         "autoprefixer": "^10.4.15",
-        "eslint": "^8.49.0",
+        "eslint": "^8.50.0",
         "eslint-plugin-vue": "^9.17.0",
         "husky": "^8.0.0",
         "jsdom": "^22.1.0",
@@ -483,9 +483,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.49.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.49.0.tgz",
-      "integrity": "sha512-1S8uAY/MTJqVx0SC4epBq+N2yhuwtNwLbJYNZyhL2pO1ZVKn5HFXav5T41Ryzy9K9V7ZId2JB2oy/W4aCd9/2w==",
+      "version": "8.50.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.50.0.tgz",
+      "integrity": "sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -2410,15 +2410,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.49.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.49.0.tgz",
-      "integrity": "sha512-jw03ENfm6VJI0jA9U+8H5zfl5b+FvuU3YYvZRdZHOlU2ggJkxrlkJH4HcDrZpj6YwD8kuYqvQM8LyesoazrSOQ==",
+      "version": "8.50.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz",
+      "integrity": "sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.49.0",
+        "@eslint/js": "8.50.0",
         "@humanwhocodes/config-array": "^0.11.11",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
diff --git a/report-viewer/package.json b/report-viewer/package.json
index c88eef012..338c1d650 100644
--- a/report-viewer/package.json
+++ b/report-viewer/package.json
@@ -44,7 +44,7 @@
     "@vue/test-utils": "^2.4.1",
     "@vue/tsconfig": "^0.4.0",
     "autoprefixer": "^10.4.15",
-    "eslint": "^8.49.0",
+    "eslint": "^8.50.0",
     "eslint-plugin-vue": "^9.17.0",
     "husky": "^8.0.0",
     "jsdom": "^22.1.0",

From 8f0f5f78248a7805f647cf0192ba69efdae49ef7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Sep 2023 18:05:19 +0200
Subject: [PATCH 50/57] Dependency(deps-dev): Bump @types/node from 18.17.17 to
 18.18.0 in /report-viewer (#1315)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 report-viewer/package-lock.json | 8 ++++----
 report-viewer/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/report-viewer/package-lock.json b/report-viewer/package-lock.json
index 8cae957e9..23126411b 100644
--- a/report-viewer/package-lock.json
+++ b/report-viewer/package-lock.json
@@ -28,7 +28,7 @@
         "@playwright/test": "^1.38.0",
         "@rushstack/eslint-patch": "^1.4.0",
         "@types/jsdom": "^21.1.3",
-        "@types/node": "^18.11.9",
+        "@types/node": "^18.18.0",
         "@vitejs/plugin-vue": "^4.3.4",
         "@vue/eslint-config-prettier": "^8.0.0",
         "@vue/eslint-config-typescript": "^11.0.3",
@@ -784,9 +784,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "18.17.17",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.17.tgz",
-      "integrity": "sha512-cOxcXsQ2sxiwkykdJqvyFS+MLQPLvIdwh5l6gNg8qF6s+C7XSkEWOZjK+XhUZd+mYvHV/180g2cnCcIl4l06Pw==",
+      "version": "18.18.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.0.tgz",
+      "integrity": "sha512-3xA4X31gHT1F1l38ATDIL9GpRLdwVhnEFC8Uikv5ZLlXATwrCYyPq7ZWHxzxc3J/30SUiwiYT+bQe0/XvKlWbw==",
       "dev": true
     },
     "node_modules/@types/semver": {
diff --git a/report-viewer/package.json b/report-viewer/package.json
index 338c1d650..cd8090f28 100644
--- a/report-viewer/package.json
+++ b/report-viewer/package.json
@@ -37,7 +37,7 @@
     "@playwright/test": "^1.38.0",
     "@rushstack/eslint-patch": "^1.4.0",
     "@types/jsdom": "^21.1.3",
-    "@types/node": "^18.11.9",
+    "@types/node": "^18.18.0",
     "@vitejs/plugin-vue": "^4.3.4",
     "@vue/eslint-config-prettier": "^8.0.0",
     "@vue/eslint-config-typescript": "^11.0.3",

From dd1a20d99ff08d5881df09d09d106752509fcc71 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Sep 2023 19:19:04 +0200
Subject: [PATCH 51/57] Dependency(deps-dev): Bump @playwright/test from 1.38.0
 to 1.38.1 in /report-viewer (#1314)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 report-viewer/package-lock.json | 24 ++++++++++++------------
 report-viewer/package.json      |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/report-viewer/package-lock.json b/report-viewer/package-lock.json
index 23126411b..96d643e7f 100644
--- a/report-viewer/package-lock.json
+++ b/report-viewer/package-lock.json
@@ -25,7 +25,7 @@
         "vue-virtual-scroller": "^2.0.0-beta.8"
       },
       "devDependencies": {
-        "@playwright/test": "^1.38.0",
+        "@playwright/test": "^1.38.1",
         "@rushstack/eslint-patch": "^1.4.0",
         "@types/jsdom": "^21.1.3",
         "@types/node": "^18.18.0",
@@ -716,12 +716,12 @@
       "dev": true
     },
     "node_modules/@playwright/test": {
-      "version": "1.38.0",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.38.0.tgz",
-      "integrity": "sha512-xis/RXXsLxwThKnlIXouxmIvvT3zvQj1JE39GsNieMUrMpb3/GySHDh2j8itCG22qKVD4MYLBp7xB73cUW/UUw==",
+      "version": "1.38.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.38.1.tgz",
+      "integrity": "sha512-NqRp8XMwj3AK+zKLbZShl0r/9wKgzqI/527bkptKXomtuo+dOjU9NdMASQ8DNC9z9zLOMbG53T4eihYr3XR+BQ==",
       "dev": true,
       "dependencies": {
-        "playwright": "1.38.0"
+        "playwright": "1.38.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -4830,12 +4830,12 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.38.0",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.38.0.tgz",
-      "integrity": "sha512-fJGw+HO0YY+fU/F1N57DMO+TmXHTrmr905J05zwAQE9xkuwP/QLDk63rVhmyxh03dYnEhnRbsdbH9B0UVVRB3A==",
+      "version": "1.38.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.38.1.tgz",
+      "integrity": "sha512-oRMSJmZrOu1FP5iu3UrCx8JEFRIMxLDM0c/3o4bpzU5Tz97BypefWf7TuTNPWeCe279TPal5RtPPZ+9lW/Qkow==",
       "dev": true,
       "dependencies": {
-        "playwright-core": "1.38.0"
+        "playwright-core": "1.38.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -4848,9 +4848,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.38.0",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.38.0.tgz",
-      "integrity": "sha512-f8z1y8J9zvmHoEhKgspmCvOExF2XdcxMW8jNRuX4vkQFrzV4MlZ55iwb5QeyiFQgOFCUolXiRHgpjSEnqvO48g==",
+      "version": "1.38.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.38.1.tgz",
+      "integrity": "sha512-tQqNFUKa3OfMf4b2jQ7aGLB8o9bS3bOY0yMEtldtC2+spf8QXG9zvXLTXUeRsoNuxEYMgLYR+NXfAa1rjKRcrg==",
       "dev": true,
       "bin": {
         "playwright-core": "cli.js"
diff --git a/report-viewer/package.json b/report-viewer/package.json
index cd8090f28..d6fcdfa72 100644
--- a/report-viewer/package.json
+++ b/report-viewer/package.json
@@ -34,7 +34,7 @@
     "vue-virtual-scroller": "^2.0.0-beta.8"
   },
   "devDependencies": {
-    "@playwright/test": "^1.38.0",
+    "@playwright/test": "^1.38.1",
     "@rushstack/eslint-patch": "^1.4.0",
     "@types/jsdom": "^21.1.3",
     "@types/node": "^18.18.0",

From 9b877a35c17da644549b72b55e9bfef66b0a38a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Sep 2023 19:35:31 +0200
Subject: [PATCH 52/57] Dependency(deps): Bump vue-router from 4.2.4 to 4.2.5
 in /report-viewer (#1316)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 report-viewer/package-lock.json | 8 ++++----
 report-viewer/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/report-viewer/package-lock.json b/report-viewer/package-lock.json
index 96d643e7f..a3263b9d2 100644
--- a/report-viewer/package-lock.json
+++ b/report-viewer/package-lock.json
@@ -21,7 +21,7 @@
         "vue": "^3.3.4",
         "vue-chartjs": "^5.2.0",
         "vue-draggable-next": "^2.2.1",
-        "vue-router": "^4.2.4",
+        "vue-router": "^4.2.5",
         "vue-virtual-scroller": "^2.0.0-beta.8"
       },
       "devDependencies": {
@@ -6634,9 +6634,9 @@
       }
     },
     "node_modules/vue-router": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.2.4.tgz",
-      "integrity": "sha512-9PISkmaCO02OzPVOMq2w82ilty6+xJmQrarYZDkjZBfl4RvYAlt4PKnEX21oW4KTtWfa9OuO/b3qk1Od3AEdCQ==",
+      "version": "4.2.5",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.2.5.tgz",
+      "integrity": "sha512-DIUpKcyg4+PTQKfFPX88UWhlagBEBEfJ5A8XDXRJLUnZOvcpMF8o/dnL90vpVkGaPbjvXazV/rC1qBKrZlFugw==",
       "dependencies": {
         "@vue/devtools-api": "^6.5.0"
       },
diff --git a/report-viewer/package.json b/report-viewer/package.json
index d6fcdfa72..b361c4e49 100644
--- a/report-viewer/package.json
+++ b/report-viewer/package.json
@@ -30,7 +30,7 @@
     "vue": "^3.3.4",
     "vue-chartjs": "^5.2.0",
     "vue-draggable-next": "^2.2.1",
-    "vue-router": "^4.2.4",
+    "vue-router": "^4.2.5",
     "vue-virtual-scroller": "^2.0.0-beta.8"
   },
   "devDependencies": {

From 7d1682ebe61136eaca19f8c14a71082663ceb2e7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Sep 2023 22:59:02 +0200
Subject: [PATCH 53/57] Dependency(deps): Bump
 edu.stanford.nlp:stanford-corenlp from 4.5.4 to 4.5.5 (#1313)

Bumps edu.stanford.nlp:stanford-corenlp from 4.5.4 to 4.5.5.

---
updated-dependencies:
- dependency-name: edu.stanford.nlp:stanford-corenlp
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fbc2ce86d..968ba8cca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
             <dependency>
                 <groupId>edu.stanford.nlp</groupId>
                 <artifactId>stanford-corenlp</artifactId>
-                <version>4.5.4</version>
+                <version>4.5.5</version>
             </dependency>
 
             <!-- LOGGER -->

From 8722f62eeb4f5532860b5f4ad8e79ed176a74ddf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Sep 2023 22:59:16 +0200
Subject: [PATCH 54/57] Dependency(deps): Bump org.scalameta:scalameta_2.13
 from 4.8.10 to 4.8.11 (#1312)

Bumps [org.scalameta:scalameta_2.13](https://github.com/scalameta/scalameta) from 4.8.10 to 4.8.11.
- [Release notes](https://github.com/scalameta/scalameta/releases)
- [Commits](https://github.com/scalameta/scalameta/compare/v4.8.10...v4.8.11)

---
updated-dependencies:
- dependency-name: org.scalameta:scalameta_2.13
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 languages/scala/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages/scala/pom.xml b/languages/scala/pom.xml
index dcedea621..8eb11b59a 100644
--- a/languages/scala/pom.xml
+++ b/languages/scala/pom.xml
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>org.scalameta</groupId>
             <artifactId>scalameta_${scala.compat.version}</artifactId>
-            <version>4.8.10</version>
+            <version>4.8.11</version>
         </dependency>
     </dependencies>
 

From 953bdc9ab94646fc5dc3da1540721999f2788227 Mon Sep 17 00:00:00 2001
From: Alexander Vogt <alexander_vogt@outlook.de>
Date: Thu, 28 Sep 2023 15:15:34 +0200
Subject: [PATCH 55/57] add view wrapper for async views

---
 report-viewer/src/App.vue                     |  4 +-
 .../src/components/LoadingCircle.vue          | 18 +++++++
 report-viewer/src/router/index.ts             | 16 +++---
 .../src/viewWrapper/ClusterViewWrapper.vue    | 32 ++++++++++++
 .../src/viewWrapper/ComparisonViewWrapper.vue | 49 +++++++++++++++++++
 .../viewWrapper/InformationViewWrapper.vue    | 23 +++++++++
 .../src/viewWrapper/OverviewViewWrapper.vue   | 23 +++++++++
 report-viewer/src/views/ClusterView.vue       | 36 ++++++++------
 report-viewer/src/views/ComparisonView.vue    | 28 ++++++-----
 report-viewer/src/views/FileUploadView.vue    |  8 +--
 report-viewer/src/views/InformationView.vue   | 16 ++++--
 report-viewer/src/views/OverviewView.vue      | 25 ++++++----
 12 files changed, 219 insertions(+), 59 deletions(-)
 create mode 100644 report-viewer/src/components/LoadingCircle.vue
 create mode 100644 report-viewer/src/viewWrapper/ClusterViewWrapper.vue
 create mode 100644 report-viewer/src/viewWrapper/ComparisonViewWrapper.vue
 create mode 100644 report-viewer/src/viewWrapper/InformationViewWrapper.vue
 create mode 100644 report-viewer/src/viewWrapper/OverviewViewWrapper.vue

diff --git a/report-viewer/src/App.vue b/report-viewer/src/App.vue
index 988799c65..094cf305b 100644
--- a/report-viewer/src/App.vue
+++ b/report-viewer/src/App.vue
@@ -3,9 +3,7 @@
     <div
       class="max-w-screen max-h-fit min-h-screen bg-backgorund-light text-black dark:bg-backgorund-dark dark:text-amber-50"
     >
-      <Suspense>
-        <RouterView class="max-h-screen overflow-hidden" />
-      </Suspense>
+      <RouterView class="max-h-screen overflow-hidden" />
 
       <Button
         class="absolute bottom-2 right-2 flex h-12 w-12 items-center justify-center text-center"
diff --git a/report-viewer/src/components/LoadingCircle.vue b/report-viewer/src/components/LoadingCircle.vue
new file mode 100644
index 000000000..e94062a97
--- /dev/null
+++ b/report-viewer/src/components/LoadingCircle.vue
@@ -0,0 +1,18 @@
+<template>
+  <div>
+    <div
+      class="mx-auto h-16 w-16 animate-spin rounded-full border-8 border-interactable-border-light border-t-accent dark:border-interactable-border-dark dark:border-t-accent"
+    ></div>
+    <p class="text-2xl font-bold">{{ message }}</p>
+  </div>
+</template>
+
+<script setup lang="ts">
+defineProps({
+  message: {
+    type: String,
+    required: false,
+    default: 'Loading Files...'
+  }
+})
+</script>
diff --git a/report-viewer/src/router/index.ts b/report-viewer/src/router/index.ts
index d277f86e5..31283c13d 100644
--- a/report-viewer/src/router/index.ts
+++ b/report-viewer/src/router/index.ts
@@ -1,10 +1,10 @@
 import { createRouter, createWebHistory } from 'vue-router'
 import FileUploadView from '@/views/FileUploadView.vue'
-import OverviewView from '@/views/OverviewView.vue'
-import ComparisonView from '@/views/ComparisonView.vue'
+import OverviewViewWrapper from '@/viewWrapper/OverviewViewWrapper.vue'
+import ComparisonViewWrapper from '@/viewWrapper/ComparisonViewWrapper.vue'
 import ErrorView from '@/views/ErrorView.vue'
-import ClusterView from '@/views/ClusterView.vue'
-import InformationView from '@/views/InformationView.vue'
+import InformationViewWrapper from '@/viewWrapper/InformationViewWrapper.vue'
+import ClusterViewWrapper from '@/viewWrapper/ClusterViewWrapper.vue'
 
 /**
  * The router is used to navigate between the different views of the application.
@@ -20,12 +20,12 @@ const router = createRouter({
     {
       path: '/overview',
       name: 'OverviewView',
-      component: OverviewView
+      component: OverviewViewWrapper
     },
     {
       path: '/comparison/:firstId/:secondId',
       name: 'ComparisonView',
-      component: ComparisonView,
+      component: ComparisonViewWrapper,
       props: true
     },
     {
@@ -36,13 +36,13 @@ const router = createRouter({
     {
       path: '/cluster/:clusterIndex',
       name: 'ClusterView',
-      component: ClusterView,
+      component: ClusterViewWrapper,
       props: true
     },
     {
       path: '/info',
       name: 'InfoView',
-      component: InformationView
+      component: InformationViewWrapper
     }
   ]
 })
diff --git a/report-viewer/src/viewWrapper/ClusterViewWrapper.vue b/report-viewer/src/viewWrapper/ClusterViewWrapper.vue
new file mode 100644
index 000000000..d3cf2a2aa
--- /dev/null
+++ b/report-viewer/src/viewWrapper/ClusterViewWrapper.vue
@@ -0,0 +1,32 @@
+<template>
+  <ClusterView v-if="overview" :overview="overview" :cluster="overview.clusters[clusterIndex]" />
+  <div
+    v-else
+    class="absolute bottom-0 left-0 right-0 top-0 flex flex-col items-center justify-center"
+  >
+    <LoadingCircle class="mx-auto" />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { type Ref, ref, computed } from 'vue'
+import { OverviewFactory } from '@/model/factories/OverviewFactory'
+import ClusterView from '@/views/ClusterView.vue'
+import LoadingCircle from '@/components/LoadingCircle.vue'
+import type { Overview } from '@/model/Overview'
+
+const props = defineProps({
+  clusterIndex: {
+    type: String,
+    required: true
+  }
+})
+
+const clusterIndex = computed(() => parseInt(props.clusterIndex))
+
+const overview: Ref<Overview | null> = ref(null)
+
+OverviewFactory.getOverview().then((o) => {
+  overview.value = o
+})
+</script>
diff --git a/report-viewer/src/viewWrapper/ComparisonViewWrapper.vue b/report-viewer/src/viewWrapper/ComparisonViewWrapper.vue
new file mode 100644
index 000000000..96395207b
--- /dev/null
+++ b/report-viewer/src/viewWrapper/ComparisonViewWrapper.vue
@@ -0,0 +1,49 @@
+<template>
+  <ComparisonView
+    v-if="comparison && language"
+    :first-id="firstId"
+    :second-id="secondId"
+    :comparison="comparison"
+    :language="language"
+  />
+  <div
+    v-else
+    class="absolute bottom-0 left-0 right-0 top-0 flex flex-col items-center justify-center"
+  >
+    <LoadingCircle class="mx-auto" />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { type Ref, ref } from 'vue'
+import { OverviewFactory } from '@/model/factories/OverviewFactory'
+import ComparisonView from '@/views/ComparisonView.vue'
+import { getHighlightLanguage, type HighlightLanguage } from '@/model/Language'
+import type { Comparison } from '@/model/Comparison'
+import { ComparisonFactory } from '@/model/factories/ComparisonFactory'
+import LoadingCircle from '@/components/LoadingCircle.vue'
+
+const props = defineProps({
+  firstId: {
+    type: String,
+    required: true
+  },
+  secondId: {
+    type: String,
+    required: true
+  }
+})
+
+const comparison: Ref<Comparison | null> = ref(null)
+const language: Ref<HighlightLanguage | null> = ref(null)
+
+// This eslint rule is disabled to allow the use of await in the setup function. Disabling this rule is safe, because the props are gathered from the url, so changing them would reload the pafe anyway.
+// eslint-disable-next-line vue/no-setup-props-reactivity-loss
+ComparisonFactory.getComparison(props.firstId, props.secondId).then((comp) => {
+  comparison.value = comp
+})
+
+OverviewFactory.getOverview().then((overview) => {
+  language.value = getHighlightLanguage(overview.language)
+})
+</script>
diff --git a/report-viewer/src/viewWrapper/InformationViewWrapper.vue b/report-viewer/src/viewWrapper/InformationViewWrapper.vue
new file mode 100644
index 000000000..6354e8630
--- /dev/null
+++ b/report-viewer/src/viewWrapper/InformationViewWrapper.vue
@@ -0,0 +1,23 @@
+<template>
+  <InformationView v-if="overview" :overview="overview" />
+  <div
+    v-else
+    class="absolute bottom-0 left-0 right-0 top-0 flex flex-col items-center justify-center"
+  >
+    <LoadingCircle class="mx-auto" />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { type Ref, ref } from 'vue'
+import { OverviewFactory } from '@/model/factories/OverviewFactory'
+import InformationView from '@/views/InformationView.vue'
+import type { Overview } from '@/model/Overview'
+import LoadingCircle from '@/components/LoadingCircle.vue'
+
+const overview: Ref<Overview | null> = ref(null)
+
+OverviewFactory.getOverview().then((o) => {
+  overview.value = o
+})
+</script>
diff --git a/report-viewer/src/viewWrapper/OverviewViewWrapper.vue b/report-viewer/src/viewWrapper/OverviewViewWrapper.vue
new file mode 100644
index 000000000..c7c4f07d3
--- /dev/null
+++ b/report-viewer/src/viewWrapper/OverviewViewWrapper.vue
@@ -0,0 +1,23 @@
+<template>
+  <OverviewView v-if="overview" :overview="overview" />
+  <div
+    v-else
+    class="absolute bottom-0 left-0 right-0 top-0 flex flex-col items-center justify-center"
+  >
+    <LoadingCircle class="mx-auto" />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { type Ref, ref } from 'vue'
+import { OverviewFactory } from '@/model/factories/OverviewFactory'
+import OverviewView from '@/views/OverviewView.vue'
+import type { Overview } from '@/model/Overview'
+import LoadingCircle from '@/components/LoadingCircle.vue'
+
+const overview: Ref<Overview | null> = ref(null)
+
+OverviewFactory.getOverview().then((o) => {
+  overview.value = o
+})
+</script>
diff --git a/report-viewer/src/views/ClusterView.vue b/report-viewer/src/views/ClusterView.vue
index 62c94d50e..11dcc3d7f 100644
--- a/report-viewer/src/views/ClusterView.vue
+++ b/report-viewer/src/views/ClusterView.vue
@@ -28,35 +28,39 @@ import ClusterRadarChart from '@/components/ClusterRadarChart.vue'
 import ComparisonsTable from '@/components/ComparisonsTable.vue'
 import Container from '@/components/ContainerComponent.vue'
 import TextInformation from '@/components/TextInformation.vue'
+import type { Cluster } from '@/model/Cluster'
 import type { ClusterListElement, ClusterListElementMember } from '@/model/ClusterListElement'
 import type { ComparisonListElement } from '@/model/ComparisonListElement'
 import { MetricType } from '@/model/MetricType'
-import { OverviewFactory } from '@/model/factories/OverviewFactory'
+import type { Overview } from '@/model/Overview'
+import { computed, type PropType, type Ref } from 'vue'
 
 const props = defineProps({
-  clusterIndex: {
-    type: Number,
+  overview: {
+    type: Object as PropType<Overview>,
+    required: true
+  },
+  cluster: {
+    type: Object as PropType<Cluster>,
     required: true
   }
 })
 
-const overview = await OverviewFactory.getOverview()
-const cluster = overview.clusters[props.clusterIndex]
 const comparisons = [] as Array<ComparisonListElement>
 const clusterMemberList = new Map() as ClusterListElementMember
 const usedMetric = MetricType.AVERAGE
 
 function getComparisonFor(id1: string, id2: string) {
-  return overview.topComparisons.find(
+  return props.overview.topComparisons.find(
     (c) =>
       (c.firstSubmissionId === id1 && c.secondSubmissionId === id2) ||
       (c.firstSubmissionId === id2 && c.secondSubmissionId === id1)
   )
 }
 
-for (let i = 0; i < cluster.members.length; i++) {
-  for (let j = i + 1; j < cluster.members.length; j++) {
-    const comparison = getComparisonFor(cluster.members[i], cluster.members[j])
+for (let i = 0; i < props.cluster.members.length; i++) {
+  for (let j = i + 1; j < props.cluster.members.length; j++) {
+    const comparison = getComparisonFor(props.cluster.members[i], props.cluster.members[j])
     if (comparison) {
       comparisons.push(comparison)
     }
@@ -70,7 +74,7 @@ comparisons
     c.id = counter
   })
 
-for (const member of cluster.members) {
+for (const member of props.cluster.members) {
   const membersComparisons: { matchedWith: string; similarity: number }[] = []
   comparisons
     .filter((c) => c.firstSubmissionId === member || c.secondSubmissionId === member)
@@ -83,9 +87,11 @@ for (const member of cluster.members) {
   clusterMemberList.set(member, membersComparisons)
 }
 
-const clusterListElement: ClusterListElement = {
-  averageSimilarity: cluster.averageSimilarity,
-  members: clusterMemberList,
-  strength: cluster.strength
-}
+const clusterListElement: Ref<ClusterListElement> = computed(() => {
+  return {
+    averageSimilarity: props.cluster.averageSimilarity,
+    members: clusterMemberList,
+    strength: props.cluster.strength
+  }
+})
 </script>
diff --git a/report-viewer/src/views/ComparisonView.vue b/report-viewer/src/views/ComparisonView.vue
index 3c8db9ece..a50bd1746 100644
--- a/report-viewer/src/views/ComparisonView.vue
+++ b/report-viewer/src/views/ComparisonView.vue
@@ -43,7 +43,7 @@
             ? 'Submission 1'
             : (store().submissionDisplayName(comparison.secondSubmissionId) as string)
         "
-        :highlight-language="getHighlightLanguage(language)"
+        :highlight-language="language"
         @line-selected="showMatchInSecond"
         class="max-h-0 min-h-full flex-1 overflow-hidden"
       />
@@ -56,7 +56,7 @@
             ? 'Submission 2'
             : (store().submissionDisplayName(comparison.secondSubmissionId) as string)
         "
-        :highlight-language="getHighlightLanguage(language)"
+        :highlight-language="language"
         @line-selected="showMatchInFirst"
         class="max-h-0 min-h-full flex-1 overflow-hidden"
       />
@@ -67,19 +67,18 @@
 <script setup lang="ts">
 import type { Match } from '@/model/Match'
 
-import { onMounted, ref, watch, type Ref, computed, onErrorCaptured } from 'vue'
+import { onMounted, ref, watch, type Ref, computed, onErrorCaptured, type PropType } from 'vue'
 import TextInformation from '@/components/TextInformation.vue'
 import MatchList from '@/components/MatchList.vue'
-import { ComparisonFactory } from '@/model/factories/ComparisonFactory'
 import FilesContainer from '@/components/FilesContainer.vue'
 import { store } from '@/stores/store'
 import Container from '@/components/ContainerComponent.vue'
-import { getHighlightLanguage } from '@/model/Language'
+import { HighlightLanguage } from '@/model/Language'
 import hljsLightMode from 'highlight.js/styles/vs.css?raw'
 import hljsDarkMode from 'highlight.js/styles/vs2015.css?raw'
 import { router } from '@/router'
 import { MetricType } from '@/model/MetricType'
-import { OverviewFactory } from '@/model/factories/OverviewFactory'
+import { Comparison } from '@/model/Comparison'
 
 const props = defineProps({
   firstId: {
@@ -89,16 +88,19 @@ const props = defineProps({
   secondId: {
     type: String,
     required: true
+  },
+  comparison: {
+    type: Object as PropType<Comparison>,
+    required: true
+  },
+  language: {
+    type: Object as PropType<HighlightLanguage>,
+    required: true
   }
 })
 
-// This eslint rule is disabled to allow the use of await in the setup function. Disabling this rule is safe, because the props are gathered from the url, so changing them would reload the pafe anyway.
-// eslint-disable-next-line vue/no-setup-props-reactivity-loss
-const comparison = await ComparisonFactory.getComparison(props.firstId, props.secondId)
-const language = (await OverviewFactory.getOverview()).language
-
-const filesOfFirst = ref(comparison.filesOfFirstSubmission)
-const filesOfSecond = ref(comparison.filesOfSecondSubmission)
+const filesOfFirst = computed(() => props.comparison.filesOfFirstSubmission)
+const filesOfSecond = computed(() => props.comparison.filesOfSecondSubmission)
 
 const panel1: Ref<typeof FilesContainer | null> = ref(null)
 const panel2: Ref<typeof FilesContainer | null> = ref(null)
diff --git a/report-viewer/src/views/FileUploadView.vue b/report-viewer/src/views/FileUploadView.vue
index 2594cc107..c6a95c50c 100644
--- a/report-viewer/src/views/FileUploadView.vue
+++ b/report-viewer/src/views/FileUploadView.vue
@@ -36,12 +36,7 @@
           Continue with local files
         </Button>
       </div>
-      <div v-else class="space-y-5 pt-5">
-        <div
-          class="mx-auto h-16 w-16 animate-spin rounded-full border-8 border-interactable-border-light border-t-accent dark:border-interactable-border-dark dark:border-t-accent"
-        ></div>
-        <p class="text-2xl font-bold">Loading file...</p>
-      </div>
+      <LoadingCircle v-else class="space-y-5 pt-5" />
     </div>
     <VersionInfoComponent class="absolute bottom-3 left-3" />
   </div>
@@ -54,6 +49,7 @@ import { router } from '@/router'
 import { store } from '@/stores/store'
 import Button from '@/components/ButtonComponent.vue'
 import VersionInfoComponent from '@/components/VersionInfoComponent.vue'
+import LoadingCircle from '@/components/LoadingCircle.vue'
 import { JsonFileHandler } from '@/utils/fileHandling/JsonFileHandler'
 import { ZipFileHandler } from '@/utils/fileHandling/ZipFileHandler'
 
diff --git a/report-viewer/src/views/InformationView.vue b/report-viewer/src/views/InformationView.vue
index a31a4fc38..b55a73cc7 100644
--- a/report-viewer/src/views/InformationView.vue
+++ b/report-viewer/src/views/InformationView.vue
@@ -48,15 +48,21 @@
 </template>
 
 <script setup lang="ts">
-import { OverviewFactory } from '@/model/factories/OverviewFactory'
 import Container from '@/components/ContainerComponent.vue'
 import TextInformation from '@/components/TextInformation.vue'
 import ScrollableComponent from '@/components/ScrollableComponent.vue'
 import { store } from '@/stores/store'
+import { Overview } from '@/model/Overview'
+import { computed, type PropType } from 'vue'
 
-const overview = await OverviewFactory.getOverview()
+const props = defineProps({
+  overview: {
+    type: Object as PropType<Overview>,
+    required: true
+  }
+})
 
-const totalComparisons = overview.totalComparisons
-const shownComparisons = overview.topComparisons.length
-const missingComparisons = totalComparisons - shownComparisons
+const totalComparisons = computed(() => props.overview.totalComparisons)
+const shownComparisons = computed(() => props.overview.topComparisons.length)
+const missingComparisons = computed(() => totalComparisons.value - shownComparisons.value)
 </script>
diff --git a/report-viewer/src/views/OverviewView.vue b/report-viewer/src/views/OverviewView.vue
index 4f030beb8..fb6d9f33d 100644
--- a/report-viewer/src/views/OverviewView.vue
+++ b/report-viewer/src/views/OverviewView.vue
@@ -109,11 +109,10 @@
 </template>
 
 <script setup lang="ts">
-import { computed, onErrorCaptured, ref, watch } from 'vue'
+import { computed, onErrorCaptured, ref, watch, type PropType } from 'vue'
 import { router } from '@/router'
 import DistributionDiagram from '@/components/DistributionDiagram.vue'
 import ComparisonsTable from '@/components/ComparisonsTable.vue'
-import { OverviewFactory } from '@/model/factories/OverviewFactory'
 import { store } from '@/stores/store'
 import Container from '@/components/ContainerComponent.vue'
 import Button from '@/components/ButtonComponent.vue'
@@ -125,8 +124,14 @@ import type { ComparisonListElement } from '@/model/ComparisonListElement'
 import MetricSelector from '@/components/optionsSelectors/MetricSelector.vue'
 import ToolTipComponent from '@/components/ToolTipComponent.vue'
 import OptionsSelector from '@/components/optionsSelectors/OptionsSelectorComponent.vue'
+import type { Overview } from '@/model/Overview'
 
-const overview = await OverviewFactory.getOverview()
+const props = defineProps({
+  overview: {
+    type: Object as PropType<Overview>,
+    required: true
+  }
+})
 
 const searchString = ref('')
 
@@ -164,11 +169,11 @@ function getSortedComparisons(comparisons: ComparisonListElement[]) {
   comparisons.forEach((c) => {
     c.sortingPlace = index++
   })
-  return overview.topComparisons
+  return props.overview.topComparisons
 }
 
 const displayedComparisons = computed(() => {
-  const comparisons = getFilteredComparisons(getSortedComparisons(overview.topComparisons))
+  const comparisons = getFilteredComparisons(getSortedComparisons(props.overview.topComparisons))
   let index = 1
   comparisons.forEach((c) => {
     c.id = index++
@@ -207,10 +212,12 @@ function changeAnnoymousForAll() {
   }
 }
 
-const hasMoreSubmissionPaths = overview.submissionFolderPath.length > 1
-const submissionPathValue = hasMoreSubmissionPaths
-  ? 'Click More to see all paths'
-  : overview.submissionFolderPath[0]
+const hasMoreSubmissionPaths = computed(() => props.overview.submissionFolderPath.length > 1)
+const submissionPathValue = computed(() =>
+  hasMoreSubmissionPaths.value
+    ? 'Click More to see all paths'
+    : props.overview.submissionFolderPath[0]
+)
 
 onErrorCaptured((e) => {
   console.log(e)

From afc3f827b5114ed4247e1d55540382b8dcc8bd7c Mon Sep 17 00:00:00 2001
From: Alexander Vogt <alexander_vogt@outlook.de>
Date: Thu, 28 Sep 2023 15:34:44 +0200
Subject: [PATCH 56/57] bump vue-tsc to 1.8.15

---
 report-viewer/package-lock.json               | 26 +++++++++----------
 report-viewer/package.json                    |  2 +-
 .../src/components/FilesContainer.vue         |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/report-viewer/package-lock.json b/report-viewer/package-lock.json
index a3263b9d2..3cd65c76e 100644
--- a/report-viewer/package-lock.json
+++ b/report-viewer/package-lock.json
@@ -48,7 +48,7 @@
         "typescript": "^5.2.2",
         "vite": "^4.4.9",
         "vitest": "^0.34.4",
-        "vue-tsc": "^1.8.11"
+        "vue-tsc": "^1.8.15"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -1214,9 +1214,9 @@
       }
     },
     "node_modules/@vue/language-core": {
-      "version": "1.8.11",
-      "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-1.8.11.tgz",
-      "integrity": "sha512-+MZOBGqGwfld6hpo0DB47x8eNM0dNqk15ZdfOhj19CpvuYuOWCeVdOEGZunKDyo3QLkTn3kLOSysJzg7FDOQBA==",
+      "version": "1.8.15",
+      "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-1.8.15.tgz",
+      "integrity": "sha512-zche5Aw8kkvp3YaghuLiOZyVIpoWHjSQ0EfjxGSsqHOPMamdCoa9x3HtbenpR38UMUoKJ88wiWuiOrV3B/Yq+A==",
       "dev": true,
       "dependencies": {
         "@volar/language-core": "~1.10.0",
@@ -1343,13 +1343,13 @@
       "dev": true
     },
     "node_modules/@vue/typescript": {
-      "version": "1.8.11",
-      "resolved": "https://registry.npmjs.org/@vue/typescript/-/typescript-1.8.11.tgz",
-      "integrity": "sha512-skUmMDiPUUtu1flPmf2YybF+PX8IzBtMioQOaNn6Ck/RhdrPJGj1AX/7s3Buf9G6ln+/KHR1XQuti/FFxw5XVA==",
+      "version": "1.8.15",
+      "resolved": "https://registry.npmjs.org/@vue/typescript/-/typescript-1.8.15.tgz",
+      "integrity": "sha512-qWyanQKXOsK84S8rP7QBrqsvUdQ0nZABZmTjXMpb3ox4Bp5IbkscREA3OPUrkgl64mAxwwCzIWcOc3BPTCPjQw==",
       "dev": true,
       "dependencies": {
         "@volar/typescript": "~1.10.0",
-        "@vue/language-core": "1.8.11"
+        "@vue/language-core": "1.8.15"
       }
     },
     "node_modules/abab": {
@@ -6658,13 +6658,13 @@
       }
     },
     "node_modules/vue-tsc": {
-      "version": "1.8.11",
-      "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-1.8.11.tgz",
-      "integrity": "sha512-BzfiMdPqDHBlysx4g26NkfVHSQwGD/lTRausmxN9sFyjXz34OWfsbkh0YsVkX84Hu65In1fFlxHiG39Tr4Vojg==",
+      "version": "1.8.15",
+      "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-1.8.15.tgz",
+      "integrity": "sha512-4DoB3LUj7IToLmggoCxRiFG+QU5lem0nv03m1ocqugXA9rSVoTOEoYYaP8vu8b99Eh+/cCVdYOeIAQ+RsgUYUw==",
       "dev": true,
       "dependencies": {
-        "@vue/language-core": "1.8.11",
-        "@vue/typescript": "1.8.11",
+        "@vue/language-core": "1.8.15",
+        "@vue/typescript": "1.8.15",
         "semver": "^7.3.8"
       },
       "bin": {
diff --git a/report-viewer/package.json b/report-viewer/package.json
index b361c4e49..b55301372 100644
--- a/report-viewer/package.json
+++ b/report-viewer/package.json
@@ -57,6 +57,6 @@
     "typescript": "^5.2.2",
     "vite": "^4.4.9",
     "vitest": "^0.34.4",
-    "vue-tsc": "^1.8.11"
+    "vue-tsc": "^1.8.15"
   }
 }
diff --git a/report-viewer/src/components/FilesContainer.vue b/report-viewer/src/components/FilesContainer.vue
index f9fb206dc..89862d235 100644
--- a/report-viewer/src/components/FilesContainer.vue
+++ b/report-viewer/src/components/FilesContainer.vue
@@ -18,7 +18,7 @@
             !matches.get(file.fileName) ? [] : (matches.get(file.fileName) as MatchInSingleFile[])
           "
           :highlight-language="highlightLanguage"
-          @line-selected="(match) => $emit('line-selected', match)"
+          @line-selected="(match) => $emit('lineSelected', match)"
           class="mt-1"
         />
       </VueDraggableNext>

From f965e31631e6394fef4985f4663f5d1a3cfb95d4 Mon Sep 17 00:00:00 2001
From: Niklas Heneka <93838730+NiklasHeneka@users.noreply.github.com>
Date: Mon, 2 Oct 2023 12:49:37 +0200
Subject: [PATCH 57/57] Adjust min token match and add further usage
 instructions to the README.

---
 languages/llvmir/README.md                         | 14 ++++++++++++++
 .../main/java/de/jplag/llvmir/LLVMIRLanguage.java  |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/languages/llvmir/README.md b/languages/llvmir/README.md
index 6d5af395d..a006a51d2 100644
--- a/languages/llvmir/README.md
+++ b/languages/llvmir/README.md
@@ -22,6 +22,20 @@ These include binary and bitwise instructions (like addition and or), memory ope
 
 To use the LLVM IR module, add the `-l llvmir` flag in the CLI, or use a `JPlagOption` object with `new de.jplag.llvmir.LLVMIRLanguage()` as `language` in the Java API as described in the usage information in the [readme of the main project](https://github.com/jplag/JPlag#usage) and [in the wiki](https://github.com/jplag/JPlag/wiki/1.-How-to-Use-JPlag).
 
+We recommend using the [LLVM optimizer](https://llvm.org/docs/CommandGuide/opt.html) to optimize the LLVM IR code before using JPlag.
+In our tests, optimization level 1 showed the best results in plagiarism detection quality and should therefore, be used.
+
+### Minimum Token Match
+
+It can be difficult to find a good value for the minimum token match because the range of possible candidates for low-level languages like the LLVM IR is much larger.
+Values can range between 60 and 70 for code compiled from C to more than 1000 for code compiled from C++.
+From our tests, we calculated a formula that depends on the average lines of code (avg. loc) to determine a value that should provide good results:
+
+min_token_match(x) = 48.2055162 * e^(0.000333593799 * x)
+
+with x = (avg. loc of the LLVM IR code) - (avg. loc of the source code), <br>
+where the source code is the code from which the IR code was generated, for example, the C or C++ code.
+
 <br>
 
 #### Footnotes
diff --git a/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRLanguage.java b/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRLanguage.java
index 8f0d65830..846a047e6 100644
--- a/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRLanguage.java
+++ b/languages/llvmir/src/main/java/de/jplag/llvmir/LLVMIRLanguage.java
@@ -13,7 +13,7 @@ public class LLVMIRLanguage extends AbstractAntlrLanguage {
 
     private static final String NAME = "LLVMIR Parser";
     private static final String IDENTIFIER = "llvmir";
-    private static final int DEFAULT_MIN_TOKEN_MATCH = 40;
+    private static final int DEFAULT_MIN_TOKEN_MATCH = 70;
     private static final String[] FILE_EXTENSIONS = {".ll"};
 
     public LLVMIRLanguage() {