Skip to content

Fix Path bug #3810

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
wadoon wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −8
Open

Fix Path bug #3810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions key.core/src/main/java/de/uka/ilkd/key/proof/io/UrlRuleSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ public Path file() {
try {
return Paths.get(uri);
} catch (FileSystemNotFoundException e) {
URI rootFs = URI.create(StringUtil.takeUntil(uri.toString(), "\\!"));
String internal = StringUtil.takeAfter(uri.toString(), "\\!");
try (FileSystem zipfs = FileSystems.newFileSystem(rootFs, new HashMap<>())) {
return zipfs.getPath(internal);
}
URI rootFs = URI.create(StringUtil.takeUntil(uri.toString(), "!"));
String internal = StringUtil.takeAfter(uri.toString(), "!");
// keep the file system open.
FileSystem zipfs = FileSystems.newFileSystem(rootFs, new HashMap<>());
return zipfs.getPath(internal);
}
} catch (URISyntaxException | IOException e) {
throw new RuntimeException(e);
Expand Down
6 changes: 3 additions & 3 deletions key.util/src/main/java/org/key_project/util/java/StringUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,14 +504,14 @@ public static String move(@NonNull String text, int line, int charPositionInLine

/// Returns the string until the first match of the given regex.
public static String takeUntil(String content, String regex) {
var array = content.split(regex, 1);
var array = content.split(regex, 2);
return array[0];
}

/// Returns the string after the first match of the given regex.
public static String takeAfter(String content, String regex) {
var array = content.split(regex, 1);
return array[0];
var array = content.split(regex, 2);
return array[1];
}


Expand Down
Loading