Skip to content

fix: NPE when file is stored in semantic cache location where rawLocation returns null #528

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
Will-ShaoHua merged 3 commits into from
Jan 20, 2026
Merged

fix: NPE when file is stored in semantic cache location where rawLocation returns null #528

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb127ea
fix: NPE when file is stored in semantic cache location where rawLoca…
Will-ShaoHua Jan 20, 2026
2f6181a
revert: a
Will-ShaoHua Jan 20, 2026
d979a8f
chore: patch
Will-ShaoHua Jan 20, 2026
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
51 changes: 32 additions & 19 deletions plugin/src/software/aws/toolkits/eclipse/amazonq/util/QEclipseEditorUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public static boolean shouldIndentVertically(final StyledText textWidget, final
public static Optional<String> getOpenFileUri() {
try {
return getOpenFilePath()
.map(filePath -> Paths.get(filePath).toUri().toString());
.map(filePath -> Paths.get(filePath).toUri().toString());
} catch (Exception e) {
Activator.getLogger().error("Unexpected error when determining open file path", e);
return Optional.empty();
Expand Down Expand Up @@ -146,7 +146,11 @@ private static String getOpenFilePath(final IEditorInput editorInput) {
// rather than the workspace location, so we need to reference the cached file path
return AbapUtil.getSemanticCachePath(file.getFullPath().toOSString());
}
return file.getRawLocation().toOSString();
// Fallback to semantic cache location if rawLocation is null, one of the use
// cases is also file when users connect to a remote SAP project
return (file.getRawLocation() != null)
? file.getRawLocation().toOSString()
: AbapUtil.getSemanticCachePath(file.getFullPath().toOSString());
} else {
throw new AmazonQPluginException("Unexpected editor input type: " + editorInput.getClass().getName());
}
Expand All @@ -172,7 +176,8 @@ public static Optional<Range> getSelectionRange(final ITextEditor editor) {
var end = new Position(endLine, endColumn);
return Optional.of(new Range(start, end));
} catch (org.eclipse.jface.text.BadLocationException e) {
Activator.getLogger().error("Error occurred while attempting to determine selected text position in editor", e);
Activator.getLogger()
.error("Error occurred while attempting to determine selected text position in editor", e);
}
}
return Optional.empty();
Expand All @@ -184,7 +189,8 @@ public static Optional<Range> getActiveSelectionRange() {
}

/*
* Inserts the given text at cursor position and returns cursor position range of the text
* Inserts the given text at cursor position and returns cursor position range
* of the text
*/
public static Optional<Range> insertAtCursor(final String text) {
var editor = getActiveTextEditor();
Expand Down Expand Up @@ -254,8 +260,9 @@ private static String applyIndentation(final String text, final String indentati
StringBuilder indentedText = new StringBuilder(lines.get(0));
for (int i = 1; i < lines.size(); i++) {
indentedText.append("\n")
.append(lines.get(i).isEmpty() ? "" : indentation) // Don't apply the gap to empty lines (eg: end of string may end in a newline)
.append(lines.get(i));
.append(lines.get(i).isEmpty() ? "" : indentation) // Don't apply the gap to empty lines (eg: end of
// string may end in a newline)
.append(lines.get(i));
}

return indentedText.toString();
Expand All @@ -268,7 +275,8 @@ private static String getIndentation(final IDocument document, final int offset)
var content = document.get(lineOffset, offset - lineOffset);

if (content.trim().isEmpty()) {
// if current line is blank or contains only whitespace, return line as indentation
// if current line is blank or contains only whitespace, return line as
// indentation
return content;
}
return content.substring(0, content.indexOf(content.trim()));
Expand Down Expand Up @@ -319,14 +327,18 @@ public static IExecutionListener getAutoTriggerExecutionListener(final Consumer<
public void notHandled(final String commandId, final NotHandledException exception) {
return;
}

@Override
public void postExecuteFailure(final String commandId, final org.eclipse.core.commands.ExecutionException exception) {
public void postExecuteFailure(final String commandId,
final org.eclipse.core.commands.ExecutionException exception) {
return;
}

@Override
public void postExecuteSuccess(final String commandId, final Object returnValue) {
return;
}

@Override
public void preExecute(final String commandId, final ExecutionEvent event) {
callback.accept(commandId);
Expand All @@ -348,17 +360,18 @@ public static IQInlineTypeaheadProcessor getAutoCloseSettings(final ITextEditor
return new GenericTypeheadProcessor();
}
switch (contentTypeName) {
// TODO: Add more supported file types here:
case "Java Source File":
IEclipsePreferences preferences = InstanceScope.INSTANCE.getNode("org.eclipse.jdt.ui");
boolean isBracesSetToAutoClose = preferences.getBoolean("closeBraces", true);
boolean isBracketsSetToAutoClose = preferences.getBoolean("closeBrackets", true);
boolean isStringSetToAutoClose = preferences.getBoolean("closeStrings", true);
return new JavaTypeaheadProcessor(editor, isBracesSetToAutoClose, isBracketsSetToAutoClose, isStringSetToAutoClose);
case "JavaScript Source File":
return new JavascriptTypeaheadProcessor();
default:
return new GenericTypeheadProcessor();
// TODO: Add more supported file types here:
case "Java Source File":
IEclipsePreferences preferences = InstanceScope.INSTANCE.getNode("org.eclipse.jdt.ui");
boolean isBracesSetToAutoClose = preferences.getBoolean("closeBraces", true);
boolean isBracketsSetToAutoClose = preferences.getBoolean("closeBrackets", true);
boolean isStringSetToAutoClose = preferences.getBoolean("closeStrings", true);
return new JavaTypeaheadProcessor(editor, isBracesSetToAutoClose, isBracketsSetToAutoClose,
isStringSetToAutoClose);
case "JavaScript Source File":
return new JavascriptTypeaheadProcessor();
default:
return new GenericTypeheadProcessor();
}
}

Expand Down