Skip to content

Handle paths strictly #11

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

Merged
merged 2 commits into from
Oct 19, 2021
Merged

Handle paths strictly #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0cdf72
Handle paths strictly
mattn Oct 18, 2021
70084eb
Remove needless import
mattn Oct 18, 2021
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
20 changes: 18 additions & 2 deletions src/com/google/devtools/intellij/ijaas/OpenFileManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager;
import java.io.File;
import java.net.URI;
import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.nio.file.Paths;
import java.util.HashMap;
import java.util.Map;
import javax.annotation.Nullable;
Expand All @@ -39,7 +44,11 @@ public class OpenFileManager {

@Nullable
Copy link
Owner

@draftcode draftcode Oct 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now looking at the code, we don't use this method at all. Let's delete this getByPath

public OpenedFile getByPath(String filePath) {
return getByURI("file:/" + filePath);
try {
return getByURI(new File(filePath).toURI().toURL().toExternalForm());
} catch (MalformedURLException e) {
return null;
}
}

@Nullable
Expand Down Expand Up @@ -103,8 +112,15 @@ private OpenedFile(String uri, int version, String text) {
Pair<Editor, PsiFile> p =
MoreWriteActions.computeAndWaitForDocument(
() -> {
;
Copy link
Owner

@draftcode draftcode Oct 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this.

String path = null;
Copy link
Owner

@draftcode draftcode Oct 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

= null is not needed because the path is always initialized (or bail out by throwing an exception). Keep this uninitialized unless the default initialized value makes sense for all cases. Usage of uninitialized variables is easy to detect, vs initializing with a wrong value is not.

try {
path = Paths.get(new URI(uri)).toFile().getPath();
} catch(URISyntaxException e) {
throw new RuntimeException("Cannot find the VirtualFile");
}
VirtualFile vf =
LocalFileSystem.getInstance().findFileByPath(uri.replace("file:/", ""));
LocalFileSystem.getInstance().findFileByPath(path);
if (vf == null) {
throw new RuntimeException("Cannot find the VirtualFile");
}
Expand Down