This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 269179
Collapse All | Expand All

(-)a/spellchecker.bindings.htmlxml/manifest.mf (-1 / +1 lines)
Lines 2-6 Link Here
2
OpenIDE-Module: org.netbeans.modules.spellchecker.bindings.htmlxml
2
OpenIDE-Module: org.netbeans.modules.spellchecker.bindings.htmlxml
3
OpenIDE-Module-Layer: org/netbeans/modules/spellchecker/bindings/htmlxml/layer.xml
3
OpenIDE-Module-Layer: org/netbeans/modules/spellchecker/bindings/htmlxml/layer.xml
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/spellchecker/bindings/htmlxml/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/spellchecker/bindings/htmlxml/Bundle.properties
5
OpenIDE-Module-Specification-Version: 1.28
5
OpenIDE-Module-Specification-Version: 1.29
6
6
(-)a/spellchecker.bindings.htmlxml/nbproject/project.xml (-1 / +4 lines)
Lines 137-143 Link Here
137
                    </run-dependency>
137
                    </run-dependency>
138
                </dependency>
138
                </dependency>
139
            </module-dependencies>
139
            </module-dependencies>
140
            <public-packages/>
140
            <friend-packages>
141
                <friend>org.netbeans.modules.spellchecker.bindings.php</friend>
142
                <package>org.netbeans.modules.spellchecker.bindings.htmlxml</package>
143
            </friend-packages>
141
        </data>
144
        </data>
142
    </configuration>
145
    </configuration>
143
</project>
146
</project>
(-)a/spellchecker.bindings.php/manifest.mf (-1 / +1 lines)
Lines 2-6 Link Here
2
OpenIDE-Module: org.netbeans.modules.spellchecker.bindings.php
2
OpenIDE-Module: org.netbeans.modules.spellchecker.bindings.php
3
OpenIDE-Module-Layer: org/netbeans/modules/spellchecker/bindings/php/resources/layer.xml
3
OpenIDE-Module-Layer: org/netbeans/modules/spellchecker/bindings/php/resources/layer.xml
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/spellchecker/bindings/php/resources/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/spellchecker/bindings/php/resources/Bundle.properties
5
OpenIDE-Module-Specification-Version: 0.2
5
OpenIDE-Module-Specification-Version: 0.3
6
6
(-)a/spellchecker.bindings.php/nbproject/project.xml (+8 lines)
Lines 107-112 Link Here
107
                    </run-dependency>
107
                    </run-dependency>
108
                </dependency>
108
                </dependency>
109
                <dependency>
109
                <dependency>
110
                    <code-name-base>org.netbeans.modules.spellchecker.bindings.htmlxml</code-name-base>
111
                    <build-prerequisite/>
112
                    <compile-dependency/>
113
                    <run-dependency>
114
                        <specification-version>1.29</specification-version>
115
                    </run-dependency>
116
                </dependency>
117
                <dependency>
110
                    <code-name-base>org.openide.filesystems</code-name-base>
118
                    <code-name-base>org.openide.filesystems</code-name-base>
111
                    <build-prerequisite/>
119
                    <build-prerequisite/>
112
                    <compile-dependency/>
120
                    <compile-dependency/>
(-)a/spellchecker.bindings.php/src/org/netbeans/modules/spellchecker/bindings/php/PHPTokenListProvider.java (-1 / +8 lines)
Lines 41-52 Link Here
41
 */
41
 */
42
package org.netbeans.modules.spellchecker.bindings.php;
42
package org.netbeans.modules.spellchecker.bindings.php;
43
43
44
import java.util.ArrayList;
45
import java.util.List;
44
import javax.swing.text.Document;
46
import javax.swing.text.Document;
45
import org.netbeans.editor.BaseDocument;
47
import org.netbeans.editor.BaseDocument;
46
import org.netbeans.modules.editor.NbEditorUtilities;
48
import org.netbeans.modules.editor.NbEditorUtilities;
47
import org.netbeans.modules.php.api.util.FileUtils;
49
import org.netbeans.modules.php.api.util.FileUtils;
50
import org.netbeans.modules.spellchecker.bindings.htmlxml.HtmlTokenList;
48
import org.netbeans.modules.spellchecker.spi.language.TokenList;
51
import org.netbeans.modules.spellchecker.spi.language.TokenList;
49
import org.netbeans.modules.spellchecker.spi.language.TokenListProvider;
52
import org.netbeans.modules.spellchecker.spi.language.TokenListProvider;
53
import org.netbeans.modules.spellchecker.spi.language.support.MultiTokenList;
50
import org.openide.util.lookup.ServiceProvider;
54
import org.openide.util.lookup.ServiceProvider;
51
55
52
@ServiceProvider(service = TokenListProvider.class)
56
@ServiceProvider(service = TokenListProvider.class)
Lines 57-63 Link Here
57
        String mimeType = NbEditorUtilities.getMimeType(doc);
61
        String mimeType = NbEditorUtilities.getMimeType(doc);
58
        if (FileUtils.PHP_MIME_TYPE.equals(mimeType)
62
        if (FileUtils.PHP_MIME_TYPE.equals(mimeType)
59
                && doc instanceof BaseDocument) {
63
                && doc instanceof BaseDocument) {
60
            return new PHPTokenList(doc);
64
            List<TokenList> tokens = new ArrayList<>(2);
65
            tokens.add(new PHPTokenList(doc));
66
            tokens.add(new HtmlTokenList((BaseDocument) doc, "PHP")); // NOI18N
67
            return MultiTokenList.create(tokens);
61
        }
68
        }
62
        return null;
69
        return null;
63
    }
70
    }

Return to bug 269179