This is an automated email from the ASF dual-hosted git repository.
geertjan 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 4254693 [NETBEANS-39] Fix for no code completion in Jade files while
typing (#1261)
4254693 is described below
commit 4254693b47c6629cd56af2dbcb0087e0f8e3e6a6
Author: Pete Whelpton <[email protected]>
AuthorDate: Mon May 27 08:22:26 2019 +0100
[NETBEANS-39] Fix for no code completion in Jade files while typing (#1261)
---
.../jade/editor/JadeCodeCompletion.java | 7 +++
.../jade/editor/JadeAutoCompletionTest.java | 58 ++++++++++++++++++++++
2 files changed, 65 insertions(+)
diff --git
a/webcommon/javascript2.jade/src/org/netbeans/modules/javascript2/jade/editor/JadeCodeCompletion.java
b/webcommon/javascript2.jade/src/org/netbeans/modules/javascript2/jade/editor/JadeCodeCompletion.java
index 9d8b687..437aa82 100644
---
a/webcommon/javascript2.jade/src/org/netbeans/modules/javascript2/jade/editor/JadeCodeCompletion.java
+++
b/webcommon/javascript2.jade/src/org/netbeans/modules/javascript2/jade/editor/JadeCodeCompletion.java
@@ -159,6 +159,13 @@ public class JadeCodeCompletion implements
CodeCompletionHandler2 {
@Override
public QueryType getAutoQuery(JTextComponent component, String typedText) {
+ if(typedText != null) {
+ int length = typedText.length();
+ if(length > 0 && !Character.isWhitespace(typedText.charAt(length
- 1))) {
+ return QueryType.COMPLETION;
+ }
+ }
+
return QueryType.NONE;
}
diff --git
a/webcommon/javascript2.jade/test/unit/src/org/netbeans/modules/javascript2/jade/editor/JadeAutoCompletionTest.java
b/webcommon/javascript2.jade/test/unit/src/org/netbeans/modules/javascript2/jade/editor/JadeAutoCompletionTest.java
new file mode 100644
index 0000000..18b367d
--- /dev/null
+++
b/webcommon/javascript2.jade/test/unit/src/org/netbeans/modules/javascript2/jade/editor/JadeAutoCompletionTest.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.javascript2.jade.editor;
+
+import org.netbeans.modules.csl.api.CodeCompletionHandler.QueryType;
+
+/**
+ *
+ * @author peedeeboy
+ */
+public class JadeAutoCompletionTest extends JadeTestBase {
+
+ public JadeAutoCompletionTest(String testName) {
+ super(testName);
+ }
+
+ public void testAutoCompletion() {
+ QueryType expected = QueryType.COMPLETION;
+ assertAutoQuery(expected, "^ ", "B");
+ }
+
+ public void testAutoCompletionWhitespace() {
+ QueryType expected = QueryType.NONE;
+ assertAutoQuery(expected, "^ ", " ");
+ }
+
+ public void testAutoCompletionEmptyString() {
+ QueryType expected = QueryType.NONE;
+ assertAutoQuery(expected, "^ ", "");
+ }
+
+ public void testAutoCompletionNull() {
+ QueryType expected = QueryType.NONE;
+ assertAutoQuery(expected, "^ ", null);
+ }
+
+ public void testAutoCompletionNewLine() {
+ QueryType expected = QueryType.NONE;
+ String newline = System.lineSeparator();
+ assertAutoQuery(expected, "^ ", newline);
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
