This is an automated email from the ASF dual-hosted git repository.
jhorvath pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 29773a3fc1 Adding priorities to SQLCompletionItem
new 4a89c2b57a Merge pull request #6620 from jhorvath/sql_cc_priority
29773a3fc1 is described below
commit 29773a3fc1acb2810d5c1b3922ed168371809fdf
Author: Jan Horvath <j...@horvath.cz>
AuthorDate: Sun Oct 29 16:15:07 2023 +0100
Adding priorities to SQLCompletionItem
---
.../MicronautDataCompletionCollector.java | 4 ++
.../sql/editor/completion/SQLCompletionItem.java | 70 ++++++++++++++++++++++
2 files changed, 74 insertions(+)
diff --git
a/enterprise/micronaut/src/org/netbeans/modules/micronaut/completion/MicronautDataCompletionCollector.java
b/enterprise/micronaut/src/org/netbeans/modules/micronaut/completion/MicronautDataCompletionCollector.java
index 34a0b1fb21..42b2cdf436 100644
---
a/enterprise/micronaut/src/org/netbeans/modules/micronaut/completion/MicronautDataCompletionCollector.java
+++
b/enterprise/micronaut/src/org/netbeans/modules/micronaut/completion/MicronautDataCompletionCollector.java
@@ -53,6 +53,10 @@ public class MicronautDataCompletionCollector implements
CompletionCollector {
return
CompletionCollector.newBuilder(item.getInsertPrefix().toString())
.insertText(item.getInsertPrefix().toString().replace("\"", "\\\""))
.kind(Completion.Kind.Property)
+ .sortText(String.format("%010d%s",
+ Long.valueOf(item.getSortPriority()) +
Math.abs(Long.valueOf(Integer.MIN_VALUE)),
+ item.getSortText())
+ )
.build();
}
}).stream().forEach(consumer);
diff --git
a/ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionItem.java
b/ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionItem.java
index 6178df03d6..3c96beb949 100644
---
a/ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionItem.java
+++
b/ide/db.sql.editor/src/org/netbeans/modules/db/sql/editor/completion/SQLCompletionItem.java
@@ -186,6 +186,16 @@ public abstract class SQLCompletionItem implements
CompletionItem {
}
return leftText;
}
+
+ @Override
+ public CharSequence getSortText() {
+ return catalogName;
+ }
+
+ @Override
+ public int getSortPriority() {
+ return 500;
+ }
@Override
protected String getRightHtmlText() {
@@ -225,6 +235,16 @@ public abstract class SQLCompletionItem implements
CompletionItem {
return leftText;
}
+ @Override
+ public CharSequence getSortText() {
+ return schemaName;
+ }
+
+ @Override
+ public int getSortPriority() {
+ return 400;
+ }
+
@Override
protected String getRightHtmlText() {
return null;
@@ -262,6 +282,16 @@ public abstract class SQLCompletionItem implements
CompletionItem {
}
return leftText;
}
+
+ @Override
+ public CharSequence getSortText() {
+ return tableName;
+ }
+
+ @Override
+ public int getSortPriority() {
+ return 200;
+ }
@Override
protected String getRightHtmlText() {
@@ -301,6 +331,16 @@ public abstract class SQLCompletionItem implements
CompletionItem {
}
return leftText;
}
+
+ @Override
+ public CharSequence getSortText() {
+ return viewName;
+ }
+
+ @Override
+ public int getSortPriority() {
+ return 300;
+ }
@Override
protected String getRightHtmlText() {
@@ -335,6 +375,16 @@ public abstract class SQLCompletionItem implements
CompletionItem {
protected String getLeftHtmlText() {
return alias;
}
+
+ @Override
+ public CharSequence getSortText() {
+ return alias;
+ }
+
+ @Override
+ public int getSortPriority() {
+ return 300;
+ }
@Override
protected String getRightHtmlText() {
@@ -385,6 +435,16 @@ public abstract class SQLCompletionItem implements
CompletionItem {
protected ImageIcon getImageIcon() {
return COLUMN_ICON;
}
+
+ @Override
+ public CharSequence getSortText() {
+ return columnName;
+ }
+
+ @Override
+ public int getSortPriority() {
+ return 100;
+ }
@Override
protected String getLeftHtmlText() {
@@ -461,6 +521,16 @@ public abstract class SQLCompletionItem implements
CompletionItem {
}
return leftText;
}
+
+ @Override
+ public CharSequence getSortText() {
+ return keyword;
+ }
+
+ @Override
+ public int getSortPriority() {
+ return 50;
+ }
@Override
protected String getRightHtmlText() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
