Merge branch 'main' into specMath

DerDrodt · Feb 4, 2023 · 5a83005 · 5a83005
2 parents bf43d8c + 77781e2
commit 5a83005
Show file tree

Hide file tree

Showing 7 changed files with 93 additions and 7 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,50 @@
+---
+name: Bug report
+about: Create a report to help us improve KeY
+title: ''
+labels: ''
+assignees: ''
+
+---
+<!-- 
+     Thank you for taking your time to make KeY a better tool!
+     Please replace the quoted lines (`> ...`) below with your text.
+--> 
+
+## Description
+
+> Please describe your concern in detail!
+
+## Reproducible
+
+> Is the issue reproducible?
+> Select one of: always, sometimes, random, have not tried, n/a 
+
+### Steps to reproduce 
+
+> Describe the steps needed to reproduce the issue.
+
+1. ... 
+2. ... 
+3. ... 
+
+> What is your expected behavior and what was the actual behavior?
+
+### Additional information
+
+> Add more details here. In particular: if you have a stacktrace, put it here.
+
+---
+
+* Commit: <!-- SHA checksum of the git commit where you observed the problem-->
+
+<!--
+  If you have the permissions:
+  From the "labels" selection component on the right, please select appropriate labels:
+  * If you think this is a "bug" that should be fixed, please select Bug.
+  * Please select exactly one of the priority labels:  P:LOW, P:NORMAL, P:HIGH or P:URGENT.
+  * Please select those components (0, 1 or more) to which this issue refers 
+    (the labels with lilac background)
+-->
+
+<!-- END OF BUG TEMPLATE -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,36 @@
+---
+name: Feature request
+about: Suggest an idea to improve KeY
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+## Please describe your proposal in a ONE sentence
+
+> One sentence describing your idea
+
+## Underlying problem
+
+> A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+## Usage Scenario
+
+> Who (user scenario) would benefit from implementing the idea?
+> Describe a short use case scenario in which the suggested idea is featured.
+> Describe the solution you'd like: A clear and concise description of what you want to happen.
+
+## Alternatives 
+
+> A clear and concise description of any alternative solutions or features you've considered.
+> Why is the suggestion the best alternative?
+
+## Estimated effort
+
+> If you can: Estimate the effort that has to be invested to implement the feature request.
+> Is there still discussion needed? Or is it purely implementation? Expertises needed?
+
+## Additional context
+
+> Add any other context or screenshots about the feature request here.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Build with Gradle
         uses: gradle/gradle-build-action@v2.3.3
         with:
-          arguments: --continue -x key.core.symbolic_execution:test key.core.proof_references:test test
+          arguments: --continue -x :key.core.symbolic_execution:test -x :key.core.proof_references:test test
 
       - name: Upload test results
         uses: actions/upload-artifact@v3.1.1

diff --git a/key.util/src/main/java/org/key_project/util/helper/FindResources.java b/key.util/src/main/java/org/key_project/util/helper/FindResources.java
@@ -56,7 +56,7 @@ public static <T> List<Path> getResources(String path, Class<T> clazz)
             Path dir = fs.getPath(path);
             return Files.list(dir).collect(Collectors.toList());
         }
-        throw new UnsupportedOperationException("Cannot list files for URL $dirURL");
+        throw new UnsupportedOperationException("Cannot list files for URL \"" + dirURL + "\"");
     }
 
     public static <T> List<Path> getResources(String path) throws URISyntaxException, IOException {
@@ -90,7 +90,7 @@ public static <T> Path getResource(String path, Class<T> clazz)
             Path dir = fs.getPath(path);
             return dir;
         }
-        throw new UnsupportedOperationException("Cannot list files for URL $dirURL");
+        throw new UnsupportedOperationException("Cannot list files for URL \"" + dirURL + "\"");
     }
 
     public static <T> Path getResource(String path) throws URISyntaxException, IOException {

diff --git a/key.util/src/main/java/org/key_project/util/lookup/Lookup.java b/key.util/src/main/java/org/key_project/util/lookup/Lookup.java
@@ -86,7 +86,7 @@ public <T> T get(Class<T> service) {
             if (parent != null)
                 return parent.get(service);
             else
-                throw new IllegalStateException("Service $service not registered");
+                throw new IllegalStateException("Service \"" + service + "\" not registered");
         } else {
             return t.get(0);
         }

diff --git a/scripts/tools/checkstyle/GitDiffFilter.java b/scripts/tools/checkstyle/GitDiffFilter.java
@@ -26,9 +26,9 @@
  *
  * For <code>MERGE_BASE</code> the assignment
  *
- * <pre>MERGE_BASE=`git merge-base HEAD origin/master`</pre>
+ * <pre>MERGE_BASE=`git merge-base HEAD origin/main`</pre>
  *
- * proved sensible if merging against the master branch.
+ * proved sensible if merging against the main branch.
  * The <code>diffFile</code> can then be provided to the filter as
  * <pre> &lt;module name="GitDiffFilter"&gt;
  *   &lt;property name="diffFilename" value="diffFile" /&gt;

diff --git a/scripts/tools/checkstyle/runIncrementalCheckstyle.sh b/scripts/tools/checkstyle/runIncrementalCheckstyle.sh
@@ -5,7 +5,7 @@ cd `dirname $0`
 HOME_DIR=`readlink -f ../../..`
 DIFF_FILE=$HOME_DIR/checkstyle-diff.txt
 
-MERGE_BASE=`git merge-base HEAD origin/master`
+MERGE_BASE=`git merge-base HEAD origin/main`
 OPTIONS=""
 
 javac -cp checkstyle-10.6.0-all.jar -d . -sourcepath $HOME_DIR \