Attachment #163100 for bug #269179

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

Lines 2-6 Link Here

(-)a/spellchecker.bindings.php/manifest.mf (-1 / +1 lines)
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

Lines 65-70 Link Here

(-)a/spellchecker.bindings.php/nbproject/project.xml (+9 lines)
65	</run-dependency>	65	</run-dependency>
66	</dependency>	66	</dependency>
67	<dependency>	67	<dependency>
		68	<code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
		69	<build-prerequisite/>
		70	<compile-dependency/>
		71	<run-dependency>
		72	<release-version>1</release-version>
		73	<specification-version>1.41</specification-version>
		74	</run-dependency>
		75	</dependency>
		76	<dependency>
68	<code-name-base>org.netbeans.modules.lexer</code-name-base>	77	<code-name-base>org.netbeans.modules.lexer</code-name-base>
69	<build-prerequisite/>	78	<build-prerequisite/>
70	<compile-dependency/>	79	<compile-dependency/>

Lines 41-52 Link Here

(-)a/spellchecker.bindings.php/src/org/netbeans/modules/spellchecker/bindings/php/PHPTokenListProvider.java (-1 / +14 lines)
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;
		47	import org.netbeans.api.editor.mimelookup.MimeLookup;
		48	import org.netbeans.api.editor.mimelookup.MimePath;
45	import org.netbeans.editor.BaseDocument;	49	import org.netbeans.editor.BaseDocument;
46	import org.netbeans.modules.editor.NbEditorUtilities;	50	import org.netbeans.modules.editor.NbEditorUtilities;
47	import org.netbeans.modules.php.api.util.FileUtils;	51	import org.netbeans.modules.php.api.util.FileUtils;
48	import org.netbeans.modules.spellchecker.spi.language.TokenList;	52	import org.netbeans.modules.spellchecker.spi.language.TokenList;
49	import org.netbeans.modules.spellchecker.spi.language.TokenListProvider;	53	import org.netbeans.modules.spellchecker.spi.language.TokenListProvider;
		54	import org.netbeans.modules.spellchecker.spi.language.support.MultiTokenList;
50	import org.openide.util.lookup.ServiceProvider;	55	import org.openide.util.lookup.ServiceProvider;
51		56
52	@ServiceProvider(service = TokenListProvider.class)	57	@ServiceProvider(service = TokenListProvider.class)
Lines 57-63 Link Here
57	String mimeType = NbEditorUtilities.getMimeType(doc);	62	String mimeType = NbEditorUtilities.getMimeType(doc);
58	if (FileUtils.PHP_MIME_TYPE.equals(mimeType)	63	if (FileUtils.PHP_MIME_TYPE.equals(mimeType)
59	&& doc instanceof BaseDocument) {	64	&& doc instanceof BaseDocument) {
60	return new PHPTokenList(doc);	65	for (TokenListProvider p : MimeLookup.getLookup(MimePath.get("text/html")).lookupAll(TokenListProvider.class)) { // NOI18N
		66	TokenList l = p.findTokenList(doc);
		67	if (l != null) {
		68	List<TokenList> tokens = new ArrayList<>(2);
		69	tokens.add(new PHPTokenList(doc));
		70	tokens.add(l);
		71	return MultiTokenList.create(tokens);
		72	}
		73	}
61	}	74	}
62	return null;	75	return null;
63	}	76	}

Return to bug 269179