Skip to content

Commit c9f0b07

Browse files
committed
Small fixes and improvements
1 parent 8760360 commit c9f0b07

File tree

4 files changed

+27
-2
lines changed

4 files changed

+27
-2
lines changed

plugin/src/de/hetzge/eclipse/aicoder/context/PackageContextEntry.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import de.hetzge.eclipse.aicoder.AiCoderImageKey;
1818
import de.hetzge.eclipse.aicoder.util.ContextUtils;
1919
import de.hetzge.eclipse.aicoder.util.JavaProjectUtils;
20+
import de.hetzge.eclipse.aicoder.util.JdtUtils;
2021
import de.hetzge.eclipse.aicoder.util.LambdaExceptionUtils;
2122
import de.hetzge.eclipse.aicoder.util.Utils;
2223

@@ -81,7 +82,8 @@ public static Optional<PackageContextEntry> create(ContextEntryKey key) throws J
8182
private static PackageContextEntry create(final IPackageFragment packageFragment) throws CoreException {
8283
final long before = System.currentTimeMillis();
8384
final String elementName = packageFragment.getElementName();
84-
final List<TypeContextEntry> entries = Arrays.stream(packageFragment.getCompilationUnits())
85+
final ICompilationUnit[] compilationUnits = JdtUtils.getCompilationUnits(packageFragment);
86+
final List<TypeContextEntry> entries = Arrays.stream(compilationUnits)
8587
.flatMap(LambdaExceptionUtils.rethrowFunction(it -> Arrays.stream(it.getAllTypes())))
8688
.filter(Utils::checkType)
8789
.map(LambdaExceptionUtils.rethrowFunction(TypeContextEntry::create))

plugin/src/de/hetzge/eclipse/aicoder/inline/InlineCompletionController.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,7 @@ public void accept() {
427427
acceptSuggestion();
428428
}
429429
if (AiCoderPreferences.isCleanupCodeOnApplyEnabled()) {
430+
// TODO only cleanup if syntax is complete
430431
AiCoderActivator.log().info("Trigger code cleanup on apply");
431432
final Optional<ICompilationUnit> compilationUnitOptional = EclipseUtils.getCompilationUnit(this.textEditor.getEditorInput());
432433
if (compilationUnitOptional.isPresent()) {

plugin/src/de/hetzge/eclipse/aicoder/llm/LlmUtils.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,8 @@ private static LlmResponse executeOpenAi(LlmOption llmModelOption, String system
172172
Map.entry("prefix", prompt),
173173
Map.entry("suffix", suffix)));
174174
json.set("prompt", fimPrompt)
175-
.set("max_tokens", AiCoderPreferences.getMaxTokens());
175+
.set("max_tokens", AiCoderPreferences.getMaxTokens())
176+
.set("stop", createStop(AiCoderPreferences.isMultilineEnabled()));
176177
}
177178

178179
final URL url = URI.create(urlString + "/").resolve(isFillInTheMiddle ? "./v1/completions" : "./v1/chat/completions").toURL();
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package de.hetzge.eclipse.aicoder.util;
2+
3+
import org.eclipse.jdt.core.ICompilationUnit;
4+
import org.eclipse.jdt.core.IPackageFragment;
5+
import org.eclipse.jdt.core.JavaModelException;
6+
7+
import de.hetzge.eclipse.aicoder.AiCoderActivator;
8+
9+
public final class JdtUtils {
10+
private JdtUtils() {
11+
}
12+
13+
public static ICompilationUnit[] getCompilationUnits(final IPackageFragment packageFragment) {
14+
try {
15+
return packageFragment.getCompilationUnits();
16+
} catch (final JavaModelException exception) {
17+
AiCoderActivator.log().error("Failed to get compilation units for package fragment: " + packageFragment, exception);
18+
return new ICompilationUnit[0];
19+
}
20+
}
21+
}

0 commit comments

Comments
 (0)