Merge branch 'nb74dev'

Author: junichi11

manifest.mf

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.php.wordpress
 OpenIDE-Module-Layer: org/netbeans/modules/php/wordpress/resources/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/wordpress/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.6.3
+OpenIDE-Module-Specification-Version: 0.6.4
 OpenIDE-Module-Install: org/netbeans/modules/php/wordpress/WordPressModule.class

nbproject/phpcsmd.properties

@@ -53,12 +53,10 @@
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.swing.text.AbstractDocument;
 import javax.swing.text.Document;
 import javax.swing.text.JTextComponent;
 import org.netbeans.api.editor.mimelookup.MimeRegistration;
 import org.netbeans.api.lexer.Token;
-import org.netbeans.api.lexer.TokenHierarchy;
 import org.netbeans.api.lexer.TokenSequence;
 import org.netbeans.modules.parsing.spi.indexing.support.QuerySupport;
 import org.netbeans.modules.php.api.phpmodule.PhpModule;
@@ -70,6 +68,7 @@
 import org.netbeans.modules.php.editor.api.elements.FunctionElement;
 import org.netbeans.modules.php.editor.lexer.PHPTokenId;
 import org.netbeans.modules.php.wordpress.util.Charset;
+import org.netbeans.modules.php.wordpress.util.DocUtils;
 import org.netbeans.spi.editor.completion.CompletionProvider;
 import org.netbeans.spi.editor.completion.CompletionResultSet;
 import org.netbeans.spi.editor.completion.CompletionTask;
@@ -87,7 +86,7 @@
  *
  * @author junichi11
  */
-@MimeRegistration(mimeType = "text/x-php5", service = CompletionProvider.class)
+@MimeRegistration(mimeType = FileUtils.PHP_MIME_TYPE, service = CompletionProvider.class)
 public final class FilterAndActionCompletion extends WordPressCompletionProvider {
 
     private static final Logger LOGGER = Logger.getLogger(FilterAndActionCompletion.class.getName());
@@ -112,16 +111,15 @@ public CompletionTask createTask(int queryType, JTextComponent component, final
         return new AsyncCompletionTask(new AsyncCompletionQuery() {
             @Override
             protected void query(CompletionResultSet completionResultSet, Document doc, int caretOffset) {
-                AbstractDocument ad = (AbstractDocument) doc;
-                ad.readLock();
-                TokenHierarchy hierarchy = TokenHierarchy.get(doc);
                 try {
-                    TokenSequence<PHPTokenId> ts = (TokenSequence<PHPTokenId>) hierarchy.tokenSequence(PHPTokenId.language());
+                    TokenSequence<PHPTokenId> ts = DocUtils.getTokenSequence(doc);
+                    if (ts == null) {
+                        return;
+                    }
                     ts.move(caretOffset);
                     ts.moveNext();
                     Token<PHPTokenId> token = ts.token();
                     if (token.id() != PHPTokenId.PHP_CONSTANT_ENCAPSED_STRING) {
-                        completionResultSet.finish();
                         return;
                     }
                     String caretInput = ts.token().text().toString();
@@ -135,7 +133,6 @@ protected void query(CompletionResultSet completionResultSet, Document doc, int
 
                     // check whether funciton is add_filter
                     if (!isValidCompletion(ts) || length < 2) {
-                        completionResultSet.finish();
                         return;
                     }
 
@@ -161,10 +158,8 @@ protected void query(CompletionResultSet completionResultSet, Document doc, int
                         }
                     }
                 } finally {
-                    ad.readUnlock();
+                    completionResultSet.finish();
                 }
-
-                completionResultSet.finish();
             }
         }, component);
     }
@@ -267,10 +262,8 @@ public void refresh() {
         // use custom file
         if (phpModule != null) {
             FileObject projectDirectory = phpModule.getProjectDirectory();
-            if (projectDirectory != null) {
-                filterXml = projectDirectory.getFileObject(CUSTOM_FILTER_CODE_COMPLETION_XML);
-                actionXml = projectDirectory.getFileObject(CUSTOM_ACTION_CODE_COMPLETION_XML);
-            }
+            filterXml = projectDirectory.getFileObject(CUSTOM_FILTER_CODE_COMPLETION_XML);
+            actionXml = projectDirectory.getFileObject(CUSTOM_ACTION_CODE_COMPLETION_XML);
         }
         // TODO improve loop
         InputStream filterInputStream = null;

src/org/netbeans/modules/php/wordpress/editor/completion/FilterAndActionCompletion.java

@@ -43,7 +43,7 @@ Portions Copyrighted 2013 Sun Microsystems, Inc.
 
 <!DOCTYPE codetemplates PUBLIC "-//NetBeans//DTD Editor Code Templates settings 1.0//EN" "http://www.netbeans.org/dtds/EditorCodeTemplates-1_0.dtd">
 <codetemplates>
-    <codetemplate abbreviation="wpph" xml:space="preserve">
+    <codetemplate contexts="wp-code" abbreviation="wpph">
         <code><![CDATA[/*
 Plugin Name: ${name}
 Plugin URI: http://${url}/
@@ -56,7 +56,7 @@ License: ${GPLv2}
 ${cursor}]]></code>
         <description>WordPress Snippet wordpress plugin header</description>
     </codetemplate>
-    <codetemplate abbreviation="wpgpl" xml:space="preserve">
+    <codetemplate contexts="wp-code" abbreviation="wpgpl">
         <code><![CDATA[/*  Copyright ${year} ${author_name} (email : ${email})
 
     This program is free software; you can redistribute it and/or modify

src/org/netbeans/modules/php/wordpress/resources/org-netbeans-modules-phpeditor-snippets.xml

@@ -0,0 +1,78 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2013 Sun Microsystems, Inc.
+ */
+package org.netbeans.modules.php.wordpress.util;
+
+import javax.swing.text.AbstractDocument;
+import javax.swing.text.Document;
+import org.netbeans.api.lexer.TokenHierarchy;
+import org.netbeans.api.lexer.TokenSequence;
+import org.netbeans.modules.php.editor.lexer.PHPTokenId;
+
+/**
+ *
+ * @author junichi11
+ */
+public final class DocUtils {
+
+    private DocUtils() {
+    }
+
+    /**
+     * Get token sequence.
+     *
+     * @param doc
+     * @return token sequence
+     */
+    public static TokenSequence<PHPTokenId> getTokenSequence(Document doc) {
+        AbstractDocument ad = (AbstractDocument) doc;
+        ad.readLock();
+        TokenSequence<PHPTokenId> ts = null;
+        try {
+            TokenHierarchy hierarchy = TokenHierarchy.get(doc);
+            ts = (TokenSequence<PHPTokenId>) hierarchy.tokenSequence(PHPTokenId.language());
+        } finally {
+            ad.readUnlock();
+        }
+        return ts;
+    }
+
+}