Please use the Apache issue tracking system for new NetBeans issues (https://issues.apache.org/jira/projects/NETBEANS0/issues) !!
View | Details | Raw Unified | Return to bug 169991 | Differences between
and this patch

Collapse All | Expand All

(-)a/csl.api/manifest.mf (-2 / +2 lines)
 Lines 1-6    Link Here 
1
Manifest-Version: 1.0
1
Manifest-Version: 1.0
2
OpenIDE-Module: org.netbeans.modules.csl.api/1
2
OpenIDE-Module: org.netbeans.modules.csl.api/2
3
OpenIDE-Module-Implementation-Version: 1
3
OpenIDE-Module-Implementation-Version: 2
4
OpenIDE-Module-Layer: org/netbeans/modules/csl/core/layer.xml
4
OpenIDE-Module-Layer: org/netbeans/modules/csl/core/layer.xml
5
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/csl/api/Bundle.properties
5
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/csl/api/Bundle.properties
6
AutoUpdate-Show-In-Client: false
6
AutoUpdate-Show-In-Client: false
(-)a/csl.api/nbproject/project.properties (-1 / +1 lines)
 Lines 37-43    Link Here 
37
# Version 2 license, then the option applies only if the new code is
37
# Version 2 license, then the option applies only if the new code is
38
# made subject to such option by the copyright holder.
38
# made subject to such option by the copyright holder.
39
39
40
spec.version.base=1.19.0
40
spec.version.base=1.20.0
41
is.autoload=true
41
is.autoload=true
42
javac.source=1.6
42
javac.source=1.6
43
43
(-)a/csl.api/src/org/netbeans/modules/csl/core/AbstractCamelCasePosition.java (-1 / +1 lines)
 Lines 38-44    Link Here 
38
 * Version 2 license, then the option applies only if the new code is
38
 * Version 2 license, then the option applies only if the new code is
39
 * made subject to such option by the copyright holder.
39
 * made subject to such option by the copyright holder.
40
 */
40
 */
41
package org.netbeans.modules.csl.core;
41
package org.netbeans.modules.csl.api;
42
42
43
import java.awt.event.ActionEvent;
43
import java.awt.event.ActionEvent;
44
import java.util.MissingResourceException;
44
import java.util.MissingResourceException;
(-)a/csl.api/src/org/netbeans/modules/csl/core/CamelCaseOperations.java (-4 / +3 lines)
 Lines 39-50    Link Here 
39
 * made subject to such option by the copyright holder.
39
 * made subject to such option by the copyright holder.
40
 */
40
 */
41
41
42
package org.netbeans.modules.csl.core;
42
package org.netbeans.modules.csl.api;
43
43
44
import javax.swing.text.BadLocationException;
44
import javax.swing.text.BadLocationException;
45
import javax.swing.text.Document;
45
import javax.swing.text.Document;
46
import javax.swing.text.JTextComponent;
46
import javax.swing.text.JTextComponent;
47
import org.netbeans.modules.csl.api.KeystrokeHandler;
48
import org.netbeans.editor.BaseDocument;
47
import org.netbeans.editor.BaseDocument;
49
import org.netbeans.editor.Utilities;
48
import org.netbeans.editor.Utilities;
50
import org.openide.ErrorManager;
49
import org.openide.ErrorManager;
 Lines 67-73    Link Here 
67
            return -1;
66
            return -1;
68
        }
67
        }
69
68
70
        KeystrokeHandler bc = CslEditorKit.getBracketCompletion(doc, offset);
69
        KeystrokeHandler bc = UiUtils.getBracketCompletion(doc, offset);
71
        if (bc != null) {
70
        if (bc != null) {
72
            int nextOffset = bc.getNextWordOffset(doc, offset, false);
71
            int nextOffset = bc.getNextWordOffset(doc, offset, false);
73
            if (nextOffset != -1) {
72
            if (nextOffset != -1) {
 Lines 94-100    Link Here 
94
93
95
        final Document doc = textComponent.getDocument();
94
        final Document doc = textComponent.getDocument();
96
        
95
        
97
        KeystrokeHandler bc = CslEditorKit.getBracketCompletion(doc, offset);
96
        KeystrokeHandler bc = UiUtils.getBracketCompletion(doc, offset);
98
        if (bc != null) {
97
        if (bc != null) {
99
            int nextOffset = bc.getNextWordOffset(
98
            int nextOffset = bc.getNextWordOffset(
100
                    doc, offset, true);
99
                    doc, offset, true);
(-)a/csl.api/src/org/netbeans/modules/csl/core/DeleteToNextCamelCasePosition.java (-1 / +1 lines)
 Lines 25-31    Link Here 
25
 *
25
 *
26
 * Portions Copyrighted 2007 Sun Microsystems, Inc.
26
 * Portions Copyrighted 2007 Sun Microsystems, Inc.
27
 */
27
 */
28
package org.netbeans.modules.csl.core;
28
package org.netbeans.modules.csl.api;
29
29
30
import javax.swing.Action;
30
import javax.swing.Action;
31
import javax.swing.text.BadLocationException;
31
import javax.swing.text.BadLocationException;
(-)a/csl.api/src/org/netbeans/modules/csl/core/DeleteToPreviousCamelCasePosition.java (-1 / +1 lines)
 Lines 38-44    Link Here 
38
 * Version 2 license, then the option applies only if the new code is
38
 * Version 2 license, then the option applies only if the new code is
39
 * made subject to such option by the copyright holder.
39
 * made subject to such option by the copyright holder.
40
 */
40
 */
41
package org.netbeans.modules.csl.core;
41
package org.netbeans.modules.csl.api;
42
42
43
import javax.swing.Action;
43
import javax.swing.Action;
44
import javax.swing.text.BadLocationException;
44
import javax.swing.text.BadLocationException;
(-)a/csl.api/src/org/netbeans/modules/csl/editor/InstantRenameAction.java (-6 / +4 lines)
 Lines 38-44    Link Here 
38
 * Version 2 license, then the option applies only if the new code is
38
 * Version 2 license, then the option applies only if the new code is
39
 * made subject to such option by the copyright holder.
39
 * made subject to such option by the copyright holder.
40
 */
40
 */
41
package org.netbeans.modules.csl.editor;
41
package org.netbeans.modules.csl.api;
42
42
43
import java.awt.event.ActionEvent;
43
import java.awt.event.ActionEvent;
44
import java.io.IOException;
44
import java.io.IOException;
 Lines 51-58    Link Here 
51
import javax.swing.text.Document;
51
import javax.swing.text.Document;
52
import javax.swing.text.JTextComponent;
52
import javax.swing.text.JTextComponent;
53
53
54
import org.netbeans.modules.csl.api.InstantRenamer;
55
import org.netbeans.modules.csl.api.OffsetRange;
56
import org.netbeans.modules.parsing.api.Source;
54
import org.netbeans.modules.parsing.api.Source;
57
import org.netbeans.modules.parsing.api.UserTask;
55
import org.netbeans.modules.parsing.api.UserTask;
58
import org.netbeans.modules.parsing.spi.ParseException;
56
import org.netbeans.modules.parsing.spi.ParseException;
 Lines 61-67    Link Here 
61
import org.netbeans.editor.Utilities;
59
import org.netbeans.editor.Utilities;
62
import org.netbeans.modules.csl.core.Language;
60
import org.netbeans.modules.csl.core.Language;
63
import org.netbeans.modules.csl.core.LanguageRegistry;
61
import org.netbeans.modules.csl.core.LanguageRegistry;
64
import org.netbeans.modules.csl.api.DataLoadersBridge;
62
import org.netbeans.modules.csl.editor.InstantRenamePerformer;
65
import org.netbeans.modules.csl.spi.ParserResult;
63
import org.netbeans.modules.csl.spi.ParserResult;
66
import org.netbeans.modules.parsing.api.ParserManager;
64
import org.netbeans.modules.parsing.api.ParserManager;
67
import org.netbeans.modules.parsing.api.ResultIterator;
65
import org.netbeans.modules.parsing.api.ResultIterator;
 Lines 93-99    Link Here 
93
        super("in-place-refactoring", MAGIC_POSITION_RESET | UNDO_MERGE_RESET);
91
        super("in-place-refactoring", MAGIC_POSITION_RESET | UNDO_MERGE_RESET);
94
    }
92
    }
95
93
96
    public void actionPerformed(ActionEvent evt, final JTextComponent target) {
94
    public @Override void actionPerformed(ActionEvent evt, final JTextComponent target) {
97
        try {
95
        try {
98
            final int caret = target.getCaretPosition();
96
            final int caret = target.getCaretPosition();
99
            String ident = Utilities.getIdentifier(Utilities.getDocument(target), caret);
97
            String ident = Utilities.getIdentifier(Utilities.getDocument(target), caret);
 Lines 120-126    Link Here 
120
            ParserManager.parse (
118
            ParserManager.parse (
121
                Collections.<Source> singleton (js), 
119
                Collections.<Source> singleton (js), 
122
                new UserTask () {
120
                new UserTask () {
123
                    public void run (ResultIterator resultIterator) throws Exception {
121
                    public @Override void run (ResultIterator resultIterator) throws Exception {
124
                        Parser.Result result = resultIterator.getParserResult (target.getCaretPosition ());
122
                        Parser.Result result = resultIterator.getParserResult (target.getCaretPosition ());
125
                        if(!(result instanceof ParserResult)) {
123
                        if(!(result instanceof ParserResult)) {
126
                            return ;
124
                            return ;
(-)a/csl.api/src/org/netbeans/modules/csl/core/NextCamelCasePosition.java (-1 / +1 lines)
 Lines 25-31    Link Here 
25
 *
25
 *
26
 * Portions Copyrighted 2007 Sun Microsystems, Inc.
26
 * Portions Copyrighted 2007 Sun Microsystems, Inc.
27
 */
27
 */
28
package org.netbeans.modules.csl.core;
28
package org.netbeans.modules.csl.api;
29
29
30
import javax.swing.Action;
30
import javax.swing.Action;
31
import javax.swing.text.BadLocationException;
31
import javax.swing.text.BadLocationException;
(-)a/csl.api/src/org/netbeans/modules/csl/core/PreviousCamelCasePosition.java (-1 / +1 lines)
 Lines 38-44    Link Here 
38
 * Version 2 license, then the option applies only if the new code is
38
 * Version 2 license, then the option applies only if the new code is
39
 * made subject to such option by the copyright holder.
39
 * made subject to such option by the copyright holder.
40
 */
40
 */
41
package org.netbeans.modules.csl.core;
41
package org.netbeans.modules.csl.api;
42
42
43
import javax.swing.Action;
43
import javax.swing.Action;
44
import javax.swing.text.BadLocationException;
44
import javax.swing.text.BadLocationException;
(-)a/csl.api/src/org/netbeans/modules/csl/core/SelectCodeElementAction.java (-3 / +3 lines)
 Lines 39-45    Link Here 
39
 * made subject to such option by the copyright holder.
39
 * made subject to such option by the copyright holder.
40
 */
40
 */
41
41
42
package org.netbeans.modules.csl.core;
42
package org.netbeans.modules.csl.api;
43
43
44
import java.awt.event.ActionEvent;
44
import java.awt.event.ActionEvent;
45
import java.util.Collections;
45
import java.util.Collections;
 Lines 52-61    Link Here 
52
import javax.swing.text.Document;
52
import javax.swing.text.Document;
53
import javax.swing.text.JTextComponent;
53
import javax.swing.text.JTextComponent;
54
54
55
import org.netbeans.modules.csl.api.OffsetRange;
56
import org.netbeans.editor.BaseAction;
55
import org.netbeans.editor.BaseAction;
57
import org.netbeans.editor.BaseDocument;
56
import org.netbeans.editor.BaseDocument;
58
import org.netbeans.modules.csl.api.KeystrokeHandler;
57
import org.netbeans.modules.csl.core.Language;
58
import org.netbeans.modules.csl.core.LanguageRegistry;
59
import org.netbeans.modules.csl.spi.ParserResult;
59
import org.netbeans.modules.csl.spi.ParserResult;
60
import org.netbeans.modules.parsing.api.ParserManager;
60
import org.netbeans.modules.parsing.api.ParserManager;
61
import org.netbeans.modules.parsing.api.ResultIterator;
61
import org.netbeans.modules.parsing.api.ResultIterator;
(-)a/csl.api/src/org/netbeans/modules/csl/core/SelectNextCamelCasePosition.java (-1 / +1 lines)
 Lines 25-31    Link Here 
25
 *
25
 *
26
 * Portions Copyrighted 2007 Sun Microsystems, Inc.
26
 * Portions Copyrighted 2007 Sun Microsystems, Inc.
27
 */
27
 */
28
package org.netbeans.modules.csl.core;
28
package org.netbeans.modules.csl.api;
29
29
30
import javax.swing.Action;
30
import javax.swing.Action;
31
import javax.swing.text.BadLocationException;
31
import javax.swing.text.BadLocationException;
(-)a/csl.api/src/org/netbeans/modules/csl/core/SelectPreviousCamelCasePosition.java (-1 / +1 lines)
 Lines 38-44    Link Here 
38
 * Version 2 license, then the option applies only if the new code is
38
 * Version 2 license, then the option applies only if the new code is
39
 * made subject to such option by the copyright holder.
39
 * made subject to such option by the copyright holder.
40
 */
40
 */
41
package org.netbeans.modules.csl.core;
41
package org.netbeans.modules.csl.api;
42
42
43
import javax.swing.Action;
43
import javax.swing.Action;
44
import javax.swing.text.BadLocationException;
44
import javax.swing.text.BadLocationException;
(-)a/csl.api/src/org/netbeans/modules/csl/editor/ToggleBlockCommentAction.java (-1 / +1 lines)
 Lines 36-42    Link Here 
36
 *
36
 *
37
 * Portions Copyrighted 2008 Sun Microsystems, Inc.
37
 * Portions Copyrighted 2008 Sun Microsystems, Inc.
38
 */
38
 */
39
package org.netbeans.modules.csl.editor;
39
package org.netbeans.modules.csl.api;
40
40
41
import java.awt.event.ActionEvent;
41
import java.awt.event.ActionEvent;
42
import javax.swing.text.BadLocationException;
42
import javax.swing.text.BadLocationException;
(-)a/csl.api/src/org/netbeans/modules/csl/core/UiUtils.java (-8 / +20 lines)
 Lines 38-60    Link Here 
38
 * Version 2 license, then the option applies only if the new code is
38
 * Version 2 license, then the option applies only if the new code is
39
 * made subject to such option by the copyright holder.
39
 * made subject to such option by the copyright holder.
40
 */
40
 */
41
package org.netbeans.modules.csl.core;
41
package org.netbeans.modules.csl.api;
42
42
43
import java.io.IOException;
43
import java.io.IOException;
44
import java.util.Collection;
44
import java.util.Collection;
45
import java.util.Collections;
45
import java.util.Collections;
46
import java.util.List;
46
import java.util.concurrent.Future;
47
import java.util.concurrent.Future;
47
import java.util.logging.Level;
48
import java.util.logging.Level;
48
import java.util.logging.Logger;
49
import java.util.logging.Logger;
49
import javax.swing.ImageIcon;
50
import javax.swing.ImageIcon;
50
import javax.swing.SwingUtilities;
51
import javax.swing.SwingUtilities;
52
import javax.swing.text.Document;
51
import javax.swing.text.StyledDocument;
53
import javax.swing.text.StyledDocument;
52
import org.netbeans.modules.csl.api.DataLoadersBridge;
54
import org.netbeans.editor.BaseDocument;
53
import org.netbeans.modules.csl.api.DeclarationFinder.DeclarationLocation;
55
import org.netbeans.modules.csl.api.DeclarationFinder.DeclarationLocation;
54
import org.netbeans.modules.csl.api.ElementHandle;
56
import org.netbeans.modules.csl.core.Language;
55
import org.netbeans.modules.csl.api.ElementKind;
57
import org.netbeans.modules.csl.core.LanguageRegistry;
56
import org.netbeans.modules.csl.api.Modifier;
57
import org.netbeans.modules.csl.api.OffsetRange;
58
import org.netbeans.modules.csl.navigation.Icons;
58
import org.netbeans.modules.csl.navigation.Icons;
59
import org.netbeans.modules.csl.spi.ParserResult;
59
import org.netbeans.modules.csl.spi.ParserResult;
60
import org.netbeans.modules.parsing.api.Embedding;
60
import org.netbeans.modules.parsing.api.Embedding;
 Lines 106-112    Link Here 
106
        
106
        
107
        if (!SwingUtilities.isEventDispatchThread()) {
107
        if (!SwingUtilities.isEventDispatchThread()) {
108
            SwingUtilities.invokeLater(new Runnable() {
108
            SwingUtilities.invokeLater(new Runnable() {
109
                public void run() {
109
                public @Override void run() {
110
                    doOpen(fo, offset);
110
                    doOpen(fo, offset);
111
                }
111
                }
112
            });
112
            });
 Lines 120-125    Link Here 
120
        return Icons.getElementIcon(elementKind, modifiers);
120
        return Icons.getElementIcon(elementKind, modifiers);
121
    }
121
    }
122
122
123
    public static KeystrokeHandler getBracketCompletion(Document doc, int offset) {
124
        BaseDocument baseDoc = (BaseDocument)doc;
125
        List<Language> list = LanguageRegistry.getInstance().getEmbeddedLanguages(baseDoc, offset);
126
        for (Language l : list) {
127
            if (l.getBracketCompletion() != null) {
128
                return l.getBracketCompletion();
129
            }
130
        }
131
132
        return null;
133
    }
134
123
    // Private methods ---------------------------------------------------------
135
    // Private methods ---------------------------------------------------------
124
136
125
    private static final Logger LOG = Logger.getLogger(UiUtils.class.getName());
137
    private static final Logger LOG = Logger.getLogger(UiUtils.class.getName());
 Lines 179-185    Link Here 
179
        final DeclarationLocation[] result = new DeclarationLocation[] { null };
191
        final DeclarationLocation[] result = new DeclarationLocation[] { null };
180
        try {
192
        try {
181
            Future<Void> f = ParserManager.parseWhenScanFinished(Collections.singleton(source), new UserTask() {
193
            Future<Void> f = ParserManager.parseWhenScanFinished(Collections.singleton(source), new UserTask() {
182
                public void run(ResultIterator resultIterator) throws ParseException {
194
                public @Override void run(ResultIterator resultIterator) throws ParseException {
183
                    if (resultIterator.getSnapshot().getMimeType().equals(handle.getMimeType())) {
195
                    if (resultIterator.getSnapshot().getMimeType().equals(handle.getMimeType())) {
184
                        Parser.Result r = resultIterator.getParserResult();
196
                        Parser.Result r = resultIterator.getParserResult();
185
                        if (r instanceof ParserResult) {
197
                        if (r instanceof ParserResult) {
(-)a/csl.api/src/org/netbeans/modules/csl/core/CslEditorKit.java (-20 / +15 lines)
 Lines 41-47    Link Here 
41
41
42
import java.awt.event.ActionEvent;
42
import java.awt.event.ActionEvent;
43
import java.util.ArrayList;
43
import java.util.ArrayList;
44
import java.util.List;
45
import javax.swing.Action;
44
import javax.swing.Action;
46
import javax.swing.JMenu;
45
import javax.swing.JMenu;
47
import javax.swing.JMenuItem;
46
import javax.swing.JMenuItem;
 Lines 62-72    Link Here 
62
import org.netbeans.editor.ext.ExtKit;
61
import org.netbeans.editor.ext.ExtKit;
63
import org.netbeans.editor.ext.ExtSyntaxSupport;
62
import org.netbeans.editor.ext.ExtSyntaxSupport;
64
import org.netbeans.lib.editor.codetemplates.api.CodeTemplateManager;
63
import org.netbeans.lib.editor.codetemplates.api.CodeTemplateManager;
64
import org.netbeans.modules.csl.api.DeleteToNextCamelCasePosition;
65
import org.netbeans.modules.csl.api.DeleteToPreviousCamelCasePosition;
65
import org.netbeans.modules.csl.api.GsfLanguage;
66
import org.netbeans.modules.csl.api.GsfLanguage;
67
import org.netbeans.modules.csl.api.InstantRenameAction;
66
import org.netbeans.modules.csl.api.KeystrokeHandler;
68
import org.netbeans.modules.csl.api.KeystrokeHandler;
69
import org.netbeans.modules.csl.api.NextCamelCasePosition;
67
import org.netbeans.modules.csl.api.OffsetRange;
70
import org.netbeans.modules.csl.api.OffsetRange;
68
import org.netbeans.modules.csl.editor.InstantRenameAction;
71
import org.netbeans.modules.csl.api.PreviousCamelCasePosition;
69
import org.netbeans.modules.csl.editor.ToggleBlockCommentAction;
72
import org.netbeans.modules.csl.api.SelectCodeElementAction;
73
import org.netbeans.modules.csl.api.SelectNextCamelCasePosition;
74
import org.netbeans.modules.csl.api.SelectPreviousCamelCasePosition;
75
import org.netbeans.modules.csl.api.ToggleBlockCommentAction;
76
import org.netbeans.modules.csl.api.UiUtils;
70
import org.netbeans.modules.csl.editor.hyperlink.GoToSupport;
77
import org.netbeans.modules.csl.editor.hyperlink.GoToSupport;
71
import org.netbeans.modules.csl.editor.semantic.GoToMarkOccurrencesAction;
78
import org.netbeans.modules.csl.editor.semantic.GoToMarkOccurrencesAction;
72
import org.netbeans.modules.csl.spi.CommentHandler;
79
import org.netbeans.modules.csl.spi.CommentHandler;
 Lines 125-131    Link Here 
125
            public int[] findMatchingBlock(int offset, boolean simpleSearch)
132
            public int[] findMatchingBlock(int offset, boolean simpleSearch)
126
                    throws BadLocationException {
133
                    throws BadLocationException {
127
                // Do parenthesis matching, if applicable
134
                // Do parenthesis matching, if applicable
128
                KeystrokeHandler bracketCompletion = getBracketCompletion(doc, offset);
135
                KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, offset);
129
                if (bracketCompletion != null) {
136
                if (bracketCompletion != null) {
130
                    OffsetRange range = bracketCompletion.findMatching(getDocument(), offset/*, simpleSearch*/);
137
                    OffsetRange range = bracketCompletion.findMatching(getDocument(), offset/*, simpleSearch*/);
131
                    if (range == OffsetRange.NONE) {
138
                    if (range == OffsetRange.NONE) {
 Lines 218-235    Link Here 
218
        return null;
225
        return null;
219
    }
226
    }
220
227
221
    /* package */ static KeystrokeHandler getBracketCompletion(Document doc, int offset) {
222
        BaseDocument baseDoc = (BaseDocument)doc;
223
        List<Language> list = LanguageRegistry.getInstance().getEmbeddedLanguages(baseDoc, offset);
224
        for (Language l : list) {
225
            if (l.getBracketCompletion() != null) {
226
                return l.getBracketCompletion();
227
            }
228
        }
229
230
        return null;
231
    }
232
233
    /**
228
    /**
234
     * Returns true if bracket completion is enabled in options.
229
     * Returns true if bracket completion is enabled in options.
235
     */
230
     */
 Lines 252-258    Link Here 
252
        protected void insertString(BaseDocument doc, int dotPos, Caret caret, String str,
247
        protected void insertString(BaseDocument doc, int dotPos, Caret caret, String str,
253
            boolean overwrite) throws BadLocationException {
248
            boolean overwrite) throws BadLocationException {
254
            if (completionSettingEnabled()) {
249
            if (completionSettingEnabled()) {
255
                KeystrokeHandler bracketCompletion = getBracketCompletion(doc, dotPos);
250
                KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, dotPos);
256
251
257
                if (bracketCompletion != null) {
252
                if (bracketCompletion != null) {
258
                    // TODO - check if we're in a comment etc. and if so, do nothing
253
                    // TODO - check if we're in a comment etc. and if so, do nothing
 Lines 283-289    Link Here 
283
                BaseDocument doc = (BaseDocument)document;
278
                BaseDocument doc = (BaseDocument)document;
284
279
285
                if (completionSettingEnabled()) {
280
                if (completionSettingEnabled()) {
286
                    KeystrokeHandler bracketCompletion = getBracketCompletion(doc, dotPos);
281
                    KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, dotPos);
287
282
288
                    if (bracketCompletion != null) {
283
                    if (bracketCompletion != null) {
289
                        try {
284
                        try {
 Lines 327-333    Link Here 
327
        @Override
322
        @Override
328
        protected Object beforeBreak(JTextComponent target, BaseDocument doc, Caret caret) {
323
        protected Object beforeBreak(JTextComponent target, BaseDocument doc, Caret caret) {
329
            if (completionSettingEnabled()) {
324
            if (completionSettingEnabled()) {
330
                KeystrokeHandler bracketCompletion = getBracketCompletion(doc, caret.getDot());
325
                KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, caret.getDot());
331
326
332
                if (bracketCompletion != null) {
327
                if (bracketCompletion != null) {
333
                    try {
328
                    try {
 Lines 384-390    Link Here 
384
        protected void charBackspaced(BaseDocument doc, int dotPos, Caret caret, char ch)
379
        protected void charBackspaced(BaseDocument doc, int dotPos, Caret caret, char ch)
385
            throws BadLocationException {
380
            throws BadLocationException {
386
            if (completionSettingEnabled()) {
381
            if (completionSettingEnabled()) {
387
                KeystrokeHandler bracketCompletion = getBracketCompletion(doc, dotPos);
382
                KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, dotPos);
388
383
389
                if (bracketCompletion != null) {
384
                if (bracketCompletion != null) {
390
                    boolean success = bracketCompletion.charBackspaced(doc, dotPos, currentTarget, ch);
385
                    boolean success = bracketCompletion.charBackspaced(doc, dotPos, currentTarget, ch);
(-)a/csl.api/src/org/netbeans/modules/csl/core/TypeAndSymbolProvider.java (+1 lines)
 Lines 47-52    Link Here 
47
import org.netbeans.api.project.Project;
47
import org.netbeans.api.project.Project;
48
import org.netbeans.modules.csl.api.ElementHandle;
48
import org.netbeans.modules.csl.api.ElementHandle;
49
import org.netbeans.modules.csl.api.IndexSearcher;
49
import org.netbeans.modules.csl.api.IndexSearcher;
50
import org.netbeans.modules.csl.api.UiUtils;
50
import org.netbeans.modules.csl.navigation.Icons;
51
import org.netbeans.modules.csl.navigation.Icons;
51
import org.netbeans.modules.parsing.api.Source;
52
import org.netbeans.modules.parsing.api.Source;
52
import org.netbeans.modules.parsing.spi.indexing.support.QuerySupport;
53
import org.netbeans.modules.parsing.spi.indexing.support.QuerySupport;
(-)a/csl.api/src/org/netbeans/modules/csl/editor/completion/GsfCompletionDoc.java (-1 / +1 lines)
 Lines 52-61    Link Here 
52
import org.netbeans.api.editor.completion.Completion;
52
import org.netbeans.api.editor.completion.Completion;
53
import org.netbeans.modules.csl.api.CodeCompletionHandler;
53
import org.netbeans.modules.csl.api.CodeCompletionHandler;
54
import org.netbeans.modules.csl.api.ElementHandle;
54
import org.netbeans.modules.csl.api.ElementHandle;
55
import org.netbeans.modules.csl.api.UiUtils;
55
import org.netbeans.modules.csl.core.LanguageRegistry;
56
import org.netbeans.modules.csl.core.LanguageRegistry;
56
import org.netbeans.modules.csl.spi.ParserResult;
57
import org.netbeans.modules.csl.spi.ParserResult;
57
import org.netbeans.modules.csl.core.Language;
58
import org.netbeans.modules.csl.core.Language;
58
import org.netbeans.modules.csl.core.UiUtils;
59
import org.netbeans.spi.editor.completion.CompletionDocumentation;
59
import org.netbeans.spi.editor.completion.CompletionDocumentation;
60
import org.openide.awt.HtmlBrowser;
60
import org.openide.awt.HtmlBrowser;
61
import org.openide.util.Exceptions;
61
import org.openide.util.Exceptions;
(-)a/csl.api/src/org/netbeans/modules/csl/editor/hyperlink/DeclarationPopup.java (-1 / +1 lines)
 Lines 57-64    Link Here 
57
import org.netbeans.modules.csl.api.DeclarationFinder.AlternativeLocation;
57
import org.netbeans.modules.csl.api.DeclarationFinder.AlternativeLocation;
58
import org.netbeans.modules.csl.api.DeclarationFinder.DeclarationLocation;
58
import org.netbeans.modules.csl.api.DeclarationFinder.DeclarationLocation;
59
import org.netbeans.modules.csl.api.ElementHandle;
59
import org.netbeans.modules.csl.api.ElementHandle;
60
import org.netbeans.modules.csl.api.UiUtils;
60
import org.netbeans.modules.csl.core.GsfHtmlFormatter;
61
import org.netbeans.modules.csl.core.GsfHtmlFormatter;
61
import org.netbeans.modules.csl.core.UiUtils;
62
import org.netbeans.modules.csl.navigation.Icons;
62
import org.netbeans.modules.csl.navigation.Icons;
63
import org.openide.awt.StatusDisplayer;
63
import org.openide.awt.StatusDisplayer;
64
import org.openide.filesystems.FileObject;
64
import org.openide.filesystems.FileObject;
(-)a/csl.api/src/org/netbeans/modules/csl/editor/hyperlink/GoToSupport.java (-1 / +1 lines)
 Lines 64-73    Link Here 
64
import org.netbeans.modules.csl.api.OffsetRange;
64
import org.netbeans.modules.csl.api.OffsetRange;
65
import org.netbeans.modules.csl.api.CodeCompletionHandler;
65
import org.netbeans.modules.csl.api.CodeCompletionHandler;
66
import org.netbeans.modules.csl.api.ElementHandle;
66
import org.netbeans.modules.csl.api.ElementHandle;
67
import org.netbeans.modules.csl.api.UiUtils;
67
import org.netbeans.modules.csl.core.GsfHtmlFormatter;
68
import org.netbeans.modules.csl.core.GsfHtmlFormatter;
68
import org.netbeans.modules.csl.core.Language;
69
import org.netbeans.modules.csl.core.Language;
69
import org.netbeans.modules.csl.core.LanguageRegistry;
70
import org.netbeans.modules.csl.core.LanguageRegistry;
70
import org.netbeans.modules.csl.core.UiUtils;
71
import org.netbeans.modules.csl.spi.ParserResult;
71
import org.netbeans.modules.csl.spi.ParserResult;
72
import org.netbeans.modules.parsing.api.ParserManager;
72
import org.netbeans.modules.parsing.api.ParserManager;
73
import org.netbeans.modules.parsing.api.ResultIterator;
73
import org.netbeans.modules.parsing.api.ResultIterator;
(-)a/csl.api/src/org/netbeans/modules/csl/navigation/actions/OpenAction.java (-1 / +1 lines)
 Lines 47-53    Link Here 
47
import java.awt.event.*;
47
import java.awt.event.*;
48
import org.netbeans.modules.csl.api.DataLoadersBridge;
48
import org.netbeans.modules.csl.api.DataLoadersBridge;
49
import org.netbeans.modules.csl.api.ElementHandle;
49
import org.netbeans.modules.csl.api.ElementHandle;
50
import org.netbeans.modules.csl.core.UiUtils;
50
import org.netbeans.modules.csl.api.UiUtils;
51
import org.netbeans.modules.parsing.api.Source;
51
import org.netbeans.modules.parsing.api.Source;
52
52
53
/**
53
/**
(-)a/csl.api/test/unit/src/org/netbeans/modules/csl/api/test/CslTestBase.java (+43 lines)
 Lines 3992-3997    Link Here 
3992
        assertDescriptionMatches(relFilePath, fixed, true, ".fixed");
3992
        assertDescriptionMatches(relFilePath, fixed, true, ".fixed");
3993
    }
3993
    }
3994
    
3994
    
3995
    @SuppressWarnings("unchecked")
3996
    protected final void ensureRegistered(AstRule hint) throws Exception {
3997
        org.netbeans.modules.csl.core.Language language = LanguageRegistry.getInstance().getLanguageByMimeType(getPreferredMimeType());
3998
        assertNotNull(language.getHintsProvider());
3999
        GsfHintsManager hintsManager = language.getHintsManager();
4000
        Map<?, List<? extends AstRule>> hints = (Map<?, List<? extends AstRule>>)hintsManager.getHints();
4001
        Set<?> kinds = hint.getKinds();
4002
        for (Object nodeType : kinds) {
4003
            List<? extends AstRule> rules = hints.get(nodeType);
4004
            assertNotNull(rules);
4005
            boolean found = false;
4006
            for (AstRule rule : rules) {
4007
                if (rule.getClass() == hint.getClass()) {
4008
                    found  = true;
4009
                    break;
4010
                }
4011
            }
4012
4013
            assertTrue(found);
4014
        }
4015
    }
4016
4017
    @SuppressWarnings("unchecked")
4018
    protected final void ensureRegistered(ErrorRule hint) throws Exception {
4019
        org.netbeans.modules.csl.core.Language language = LanguageRegistry.getInstance().getLanguageByMimeType(getPreferredMimeType());
4020
        assertNotNull(language.getHintsProvider());
4021
        GsfHintsManager hintsManager = language.getHintsManager();
4022
        Map<?, List<? extends ErrorRule>> hints = (Map<?, List<? extends ErrorRule>>)hintsManager.getErrors();
4023
        Set<?> kinds = hint.getCodes();
4024
        for (Object codes : kinds) {
4025
            List<? extends ErrorRule> rules = hints.get(codes);
4026
            assertNotNull(rules);
4027
            boolean found = false;
4028
            for (ErrorRule rule : rules) {
4029
                if (rule.getClass() == hint.getClass()) {
4030
                    found  = true;
4031
                    break;
4032
                }
4033
            }
4034
4035
            assertTrue(found);
4036
        }
4037
    }
3995
//    public void ensureRegistered(AstRule hint) throws Exception {
4038
//    public void ensureRegistered(AstRule hint) throws Exception {
3996
//        Map<Integer, List<AstRule>> hints = JsRulesManager.getInstance().getHints();
4039
//        Map<Integer, List<AstRule>> hints = JsRulesManager.getInstance().getHints();
3997
//        Set<Integer> kinds = hint.getKinds();
4040
//        Set<Integer> kinds = hint.getKinds();
(-)a/css.editor/manifest.mf (-1 / +1 lines)
 Lines 2-6    Link Here 
2
OpenIDE-Module: org.netbeans.modules.css.editor/1
2
OpenIDE-Module: org.netbeans.modules.css.editor/1
3
OpenIDE-Module-Layer: org/netbeans/modules/css/resources/layer.xml
3
OpenIDE-Module-Layer: org/netbeans/modules/css/resources/layer.xml
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/css/resources/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/css/resources/Bundle.properties
5
OpenIDE-Module-Specification-Version: 1.9
5
OpenIDE-Module-Specification-Version: 1.10
6
AutoUpdate-Show-In-Client: false
6
AutoUpdate-Show-In-Client: false
(-)a/css.editor/nbproject/project.xml (-2 / +2 lines)
 Lines 10-17    Link Here 
10
                    <build-prerequisite/>
10
                    <build-prerequisite/>
11
                    <compile-dependency/>
11
                    <compile-dependency/>
12
                    <run-dependency>
12
                    <run-dependency>
13
                        <release-version>1</release-version>
13
                        <release-version>2</release-version>
14
                        <specification-version>1.19</specification-version>
14
                        <specification-version>1.20</specification-version>
15
                    </run-dependency>
15
                    </run-dependency>
16
                </dependency>
16
                </dependency>
17
                <dependency>
17
                <dependency>
(-)a/css.visual/manifest.mf (-1 / +1 lines)
 Lines 5-8    Link Here 
5
OpenIDE-Module-Install: org/netbeans/modules/css/CssModuleInstall.class
5
OpenIDE-Module-Install: org/netbeans/modules/css/CssModuleInstall.class
6
OpenIDE-Module-Requires: org.openide.windows.IOProvider
6
OpenIDE-Module-Requires: org.openide.windows.IOProvider
7
AutoUpdate-Show-In-Client: false
7
AutoUpdate-Show-In-Client: false
8
OpenIDE-Module-Specification-Version: 2.10
8
OpenIDE-Module-Specification-Version: 2.11
(-)a/css.visual/nbproject/project.xml (-2 / +2 lines)
 Lines 69-76    Link Here 
69
                    <build-prerequisite/>
69
                    <build-prerequisite/>
70
                    <compile-dependency/>
70
                    <compile-dependency/>
71
                    <run-dependency>
71
                    <run-dependency>
72
                        <release-version>1</release-version>
72
                        <release-version>2</release-version>
73
                        <specification-version>1.8</specification-version>
73
                        <specification-version>1.20</specification-version>
74
                    </run-dependency>
74
                    </run-dependency>
75
                </dependency>
75
                </dependency>
76
                <dependency>
76
                <dependency>
(-)a/groovy.editor/manifest.mf (-1 / +1 lines)
 Lines 3-6    Link Here 
3
OpenIDE-Module: org.netbeans.modules.groovy.editor/2
3
OpenIDE-Module: org.netbeans.modules.groovy.editor/2
4
OpenIDE-Module-Layer: org/netbeans/modules/groovy/editor/resources/layer.xml
4
OpenIDE-Module-Layer: org/netbeans/modules/groovy/editor/resources/layer.xml
5
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/editor/Bundle.properties
5
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/editor/Bundle.properties
6
OpenIDE-Module-Specification-Version: 1.18
6
OpenIDE-Module-Specification-Version: 1.19
(-)a/groovy.editor/nbproject/project.xml (-2 / +2 lines)
 Lines 54-61    Link Here 
54
                    <build-prerequisite/>
54
                    <build-prerequisite/>
55
                    <compile-dependency/>
55
                    <compile-dependency/>
56
                    <run-dependency>
56
                    <run-dependency>
57
                        <release-version>0-1</release-version>
57
                        <release-version>2</release-version>
58
                        <specification-version>1.19</specification-version>
58
                        <specification-version>1.20</specification-version>
59
                    </run-dependency>
59
                    </run-dependency>
60
                </dependency>
60
                </dependency>
61
                <dependency>
61
                <dependency>
(-)a/groovy.grailsproject/manifest.mf (-1 / +1 lines)
 Lines 3-7    Link Here 
3
OpenIDE-Module: org.netbeans.modules.groovy.grailsproject
3
OpenIDE-Module: org.netbeans.modules.groovy.grailsproject
4
OpenIDE-Module-Layer: org/netbeans/modules/groovy/grailsproject/resources/layer.xml
4
OpenIDE-Module-Layer: org/netbeans/modules/groovy/grailsproject/resources/layer.xml
5
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/grailsproject/resources/Bundle.properties
5
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/grailsproject/resources/Bundle.properties
6
OpenIDE-Module-Specification-Version: 1.21
6
OpenIDE-Module-Specification-Version: 1.22
7
7
(-)a/groovy.grailsproject/nbproject/project.xml (-2 / +2 lines)
 Lines 55-62    Link Here 
55
                    <build-prerequisite/>
55
                    <build-prerequisite/>
56
                    <compile-dependency/>
56
                    <compile-dependency/>
57
                    <run-dependency>
57
                    <run-dependency>
58
                        <release-version>1</release-version>
58
                        <release-version>2</release-version>
59
                        <specification-version>1.8</specification-version>
59
                        <specification-version>1.20</specification-version>
60
                    </run-dependency>
60
                    </run-dependency>
61
                </dependency>
61
                </dependency>
62
                <dependency>
62
                <dependency>
(-)a/groovy.gsp/manifest.mf (-1 / +1 lines)
 Lines 3-6    Link Here 
3
OpenIDE-Module: org.netbeans.modules.groovy.gsp
3
OpenIDE-Module: org.netbeans.modules.groovy.gsp
4
OpenIDE-Module-Layer: org/netbeans/modules/groovy/gsp/resources/layer.xml
4
OpenIDE-Module-Layer: org/netbeans/modules/groovy/gsp/resources/layer.xml
5
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/gsp/resources/Bundle.properties
5
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/gsp/resources/Bundle.properties
6
OpenIDE-Module-Specification-Version: 1.12
6
OpenIDE-Module-Specification-Version: 1.13
(-)a/groovy.gsp/nbproject/project.xml (-2 / +2 lines)
 Lines 90-97    Link Here 
90
                    <build-prerequisite/>
90
                    <build-prerequisite/>
91
                    <compile-dependency/>
91
                    <compile-dependency/>
92
                    <run-dependency>
92
                    <run-dependency>
93
                        <release-version>0-1</release-version>
93
                        <release-version>2</release-version>
94
                        <specification-version>1.19</specification-version>
94
                        <specification-version>1.20</specification-version>
95
                    </run-dependency>
95
                    </run-dependency>
96
                </dependency>
96
                </dependency>
97
                <dependency>
97
                <dependency>
(-)a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/GspKit.java (-8 / +8 lines)
 Lines 56-69    Link Here 
56
import org.netbeans.lib.editor.util.swing.DocumentUtilities;
56
import org.netbeans.lib.editor.util.swing.DocumentUtilities;
57
import org.netbeans.editor.Utilities;
57
import org.netbeans.editor.Utilities;
58
import org.netbeans.editor.ext.ExtKit.ExtDefaultKeyTypedAction;
58
import org.netbeans.editor.ext.ExtKit.ExtDefaultKeyTypedAction;
59
import org.netbeans.modules.csl.core.DeleteToNextCamelCasePosition;
59
import org.netbeans.modules.csl.api.DeleteToNextCamelCasePosition;
60
import org.netbeans.modules.csl.core.DeleteToPreviousCamelCasePosition;
60
import org.netbeans.modules.csl.api.DeleteToPreviousCamelCasePosition;
61
import org.netbeans.modules.csl.core.NextCamelCasePosition;
61
import org.netbeans.modules.csl.api.InstantRenameAction;
62
import org.netbeans.modules.csl.core.PreviousCamelCasePosition;
62
import org.netbeans.modules.csl.api.NextCamelCasePosition;
63
import org.netbeans.modules.csl.core.SelectCodeElementAction;
63
import org.netbeans.modules.csl.api.PreviousCamelCasePosition;
64
import org.netbeans.modules.csl.core.SelectNextCamelCasePosition;
64
import org.netbeans.modules.csl.api.SelectCodeElementAction;
65
import org.netbeans.modules.csl.core.SelectPreviousCamelCasePosition;
65
import org.netbeans.modules.csl.api.SelectNextCamelCasePosition;
66
import org.netbeans.modules.csl.editor.InstantRenameAction;
66
import org.netbeans.modules.csl.api.SelectPreviousCamelCasePosition;
67
import org.netbeans.modules.html.editor.api.HtmlKit;
67
import org.netbeans.modules.html.editor.api.HtmlKit;
68
import org.netbeans.modules.groovy.gsp.lexer.GspTokenId;
68
import org.netbeans.modules.groovy.gsp.lexer.GspTokenId;
69
import org.openide.util.Exceptions;
69
import org.openide.util.Exceptions;
(-)a/groovy.refactoring/manifest.mf (-1 / +1 lines)
 Lines 3-7    Link Here 
3
OpenIDE-Module: org.netbeans.modules.groovy.refactoring
3
OpenIDE-Module: org.netbeans.modules.groovy.refactoring
4
OpenIDE-Module-Layer: org/netbeans/modules/groovy/refactoring/resources/layer.xml
4
OpenIDE-Module-Layer: org/netbeans/modules/groovy/refactoring/resources/layer.xml
5
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/refactoring/resources/Bundle.properties
5
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/refactoring/resources/Bundle.properties
6
OpenIDE-Module-Specification-Version: 1.11
6
OpenIDE-Module-Specification-Version: 1.12
7
7
(-)a/groovy.refactoring/nbproject/project.xml (-2 / +2 lines)
 Lines 27-34    Link Here 
27
                    <build-prerequisite/>
27
                    <build-prerequisite/>
28
                    <compile-dependency/>
28
                    <compile-dependency/>
29
                    <run-dependency>
29
                    <run-dependency>
30
                        <release-version>0-1</release-version>
30
                        <release-version>2</release-version>
31
                        <specification-version>1.8</specification-version>
31
                        <specification-version>1.20</specification-version>
32
                    </run-dependency>
32
                    </run-dependency>
33
                </dependency>
33
                </dependency>
34
                <dependency>
34
                <dependency>
(-)a/gsf.codecoverage/manifest.mf (-1 / +1 lines)
 Lines 2-7    Link Here 
2
OpenIDE-Module: org.netbeans.modules.gsf.codecoverage
2
OpenIDE-Module: org.netbeans.modules.gsf.codecoverage
3
OpenIDE-Module-Layer: org/netbeans/modules/gsf/codecoverage/layer.xml
3
OpenIDE-Module-Layer: org/netbeans/modules/gsf/codecoverage/layer.xml
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gsf/codecoverage/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gsf/codecoverage/Bundle.properties
5
OpenIDE-Module-Specification-Version: 1.6
5
OpenIDE-Module-Specification-Version: 1.7
6
AutoUpdate-Show-In-Client: false
6
AutoUpdate-Show-In-Client: false
7
7
(-)a/gsf.codecoverage/nbproject/project.xml (-2 / +2 lines)
 Lines 19-26    Link Here 
19
                    <build-prerequisite/>
19
                    <build-prerequisite/>
20
                    <compile-dependency/>
20
                    <compile-dependency/>
21
                    <run-dependency>
21
                    <run-dependency>
22
                        <release-version>1</release-version>
22
                        <release-version>2</release-version>
23
                        <specification-version>1.8</specification-version>
23
                        <specification-version>1.20</specification-version>
24
                    </run-dependency>
24
                    </run-dependency>
25
                </dependency>
25
                </dependency>
26
                <dependency>
26
                <dependency>
(-)a/html.editor/manifest.mf (-1 / +1 lines)
 Lines 2-6    Link Here 
2
OpenIDE-Module: org.netbeans.modules.html.editor/1
2
OpenIDE-Module: org.netbeans.modules.html.editor/1
3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/html/editor/resources/Bundle.properties
3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/html/editor/resources/Bundle.properties
4
OpenIDE-Module-Layer: org/netbeans/modules/html/editor/resources/layer.xml
4
OpenIDE-Module-Layer: org/netbeans/modules/html/editor/resources/layer.xml
5
OpenIDE-Module-Specification-Version: 1.19
5
OpenIDE-Module-Specification-Version: 1.20
6
AutoUpdate-Show-In-Client: false
6
AutoUpdate-Show-In-Client: false
(-)a/html.editor/nbproject/project.xml (-2 / +2 lines)
 Lines 51-58    Link Here 
51
                    <build-prerequisite/>
51
                    <build-prerequisite/>
52
                    <compile-dependency/>
52
                    <compile-dependency/>
53
                    <run-dependency>
53
                    <run-dependency>
54
                        <release-version>1</release-version>
54
                        <release-version>2</release-version>
55
                        <specification-version>1.19</specification-version>
55
                        <specification-version>1.20</specification-version>
56
                    </run-dependency>
56
                    </run-dependency>
57
                </dependency>
57
                </dependency>
58
                <dependency>
58
                <dependency>
(-)a/html.editor/src/org/netbeans/modules/html/editor/api/HtmlKit.java (-23 / +9 lines)
 Lines 51-57    Link Here 
51
import java.io.Reader;
51
import java.io.Reader;
52
import java.io.StringReader;
52
import java.io.StringReader;
53
import java.io.StringWriter;
53
import java.io.StringWriter;
54
import java.util.List;
55
import javax.swing.Action;
54
import javax.swing.Action;
56
import javax.swing.JComponent;
55
import javax.swing.JComponent;
57
import javax.swing.JEditorPane;
56
import javax.swing.JEditorPane;
 Lines 69-80    Link Here 
69
import org.netbeans.editor.BaseKit.DeleteCharAction;
68
import org.netbeans.editor.BaseKit.DeleteCharAction;
70
import org.netbeans.editor.ext.ExtKit;
69
import org.netbeans.editor.ext.ExtKit;
71
import org.netbeans.editor.ext.ExtKit.ExtDefaultKeyTypedAction;
70
import org.netbeans.editor.ext.ExtKit.ExtDefaultKeyTypedAction;
71
import org.netbeans.modules.csl.api.InstantRenameAction;
72
import org.netbeans.modules.csl.api.KeystrokeHandler;
72
import org.netbeans.modules.csl.api.KeystrokeHandler;
73
import org.netbeans.modules.csl.core.Language;
73
import org.netbeans.modules.csl.api.SelectCodeElementAction;
74
import org.netbeans.modules.csl.core.LanguageRegistry;
74
import org.netbeans.modules.csl.api.ToggleBlockCommentAction;
75
import org.netbeans.modules.csl.core.SelectCodeElementAction;
75
import org.netbeans.modules.csl.api.UiUtils;
76
import org.netbeans.modules.csl.editor.InstantRenameAction;
77
import org.netbeans.modules.csl.editor.ToggleBlockCommentAction;
78
import org.netbeans.modules.editor.NbEditorKit;
76
import org.netbeans.modules.editor.NbEditorKit;
79
import org.netbeans.modules.html.editor.gsf.HtmlCommentHandler;
77
import org.netbeans.modules.html.editor.gsf.HtmlCommentHandler;
80
import org.openide.util.Exceptions;
78
import org.openide.util.Exceptions;
 Lines 87-93    Link Here 
87
 */
85
 */
88
public class HtmlKit extends NbEditorKit implements org.openide.util.HelpCtx.Provider {
86
public class HtmlKit extends NbEditorKit implements org.openide.util.HelpCtx.Provider {
89
87
90
    public org.openide.util.HelpCtx getHelpCtx() {
88
    public @Override org.openide.util.HelpCtx getHelpCtx() {
91
        return new org.openide.util.HelpCtx(HtmlKit.class);
89
        return new org.openide.util.HelpCtx(HtmlKit.class);
92
    }
90
    }
93
    static final long serialVersionUID = -1381945567613910297L;
91
    static final long serialVersionUID = -1381945567613910297L;
 Lines 147-164    Link Here 
147
        return TextAction.augmentList(super.createActions(), HtmlActions);
145
        return TextAction.augmentList(super.createActions(), HtmlActions);
148
    }
146
    }
149
147
150
    static KeystrokeHandler getBracketCompletion(Document doc, int offset) {
151
        BaseDocument baseDoc = (BaseDocument) doc;
152
        List<Language> list = LanguageRegistry.getInstance().getEmbeddedLanguages(baseDoc, offset);
153
        for (Language l : list) {
154
            if (l.getBracketCompletion() != null) {
155
                return l.getBracketCompletion();
156
            }
157
        }
158
159
        return null;
160
    }
161
162
    /**
148
    /**
163
     * Returns true if bracket completion is enabled in options.
149
     * Returns true if bracket completion is enabled in options.
164
     */
150
     */
 Lines 174-180    Link Here 
174
        @Override
160
        @Override
175
        protected Object beforeBreak(JTextComponent target, BaseDocument doc, Caret caret) {
161
        protected Object beforeBreak(JTextComponent target, BaseDocument doc, Caret caret) {
176
            if (completionSettingEnabled()) {
162
            if (completionSettingEnabled()) {
177
                KeystrokeHandler bracketCompletion = getBracketCompletion(doc, caret.getDot());
163
                KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, caret.getDot());
178
164
179
                if (bracketCompletion != null) {
165
                if (bracketCompletion != null) {
180
                    try {
166
                    try {
 Lines 230-236    Link Here 
230
                boolean overwrite) throws BadLocationException {
216
                boolean overwrite) throws BadLocationException {
231
                
217
                
232
            if (completionSettingEnabled()) {
218
            if (completionSettingEnabled()) {
233
                KeystrokeHandler bracketCompletion = getBracketCompletion(doc, dotPos);
219
                KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, dotPos);
234
220
235
                if (bracketCompletion != null) {
221
                if (bracketCompletion != null) {
236
                    // TODO - check if we're in a comment etc. and if so, do nothing
222
                    // TODO - check if we're in a comment etc. and if so, do nothing
 Lines 262-268    Link Here 
262
                BaseDocument doc = (BaseDocument) document;
248
                BaseDocument doc = (BaseDocument) document;
263
249
264
                if (completionSettingEnabled()) {
250
                if (completionSettingEnabled()) {
265
                    KeystrokeHandler bracketCompletion = getBracketCompletion(doc, dotPos);
251
                    KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, dotPos);
266
252
267
                    if (bracketCompletion != null) {
253
                    if (bracketCompletion != null) {
268
                        try {
254
                        try {
 Lines 323-329    Link Here 
323
        @Override
309
        @Override
324
        protected void charBackspaced(BaseDocument doc, int dotPos, Caret caret, char ch) throws BadLocationException {
310
        protected void charBackspaced(BaseDocument doc, int dotPos, Caret caret, char ch) throws BadLocationException {
325
              if (completionSettingEnabled()) {
311
              if (completionSettingEnabled()) {
326
                KeystrokeHandler bracketCompletion = getBracketCompletion(doc, dotPos);
312
                KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, dotPos);
327
313
328
                if (bracketCompletion != null) {
314
                if (bracketCompletion != null) {
329
                    boolean success = bracketCompletion.charBackspaced(doc, dotPos, currentTarget, ch);
315
                    boolean success = bracketCompletion.charBackspaced(doc, dotPos, currentTarget, ch);
(-)a/html/manifest.mf (-1 / +1 lines)
 Lines 2-7    Link Here 
2
OpenIDE-Module: org.netbeans.modules.html/1
2
OpenIDE-Module: org.netbeans.modules.html/1
3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/html/Bundle.properties
3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/html/Bundle.properties
4
OpenIDE-Module-Layer: org/netbeans/modules/html/mf-layer.xml
4
OpenIDE-Module-Layer: org/netbeans/modules/html/mf-layer.xml
5
OpenIDE-Module-Specification-Version: 1.30
5
OpenIDE-Module-Specification-Version: 1.31
6
OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
6
OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
7
AutoUpdate-Show-In-Client: false
7
AutoUpdate-Show-In-Client: false
(-)a/html/nbproject/project.xml (-2 / +2 lines)
 Lines 60-67    Link Here 
60
                    <build-prerequisite/>
60
                    <build-prerequisite/>
61
                    <compile-dependency/>
61
                    <compile-dependency/>
62
                    <run-dependency>
62
                    <run-dependency>
63
                        <release-version>1</release-version>
63
                        <release-version>2</release-version>
64
                        <specification-version>1.11</specification-version>
64
                        <specification-version>1.20</specification-version>
65
                    </run-dependency>
65
                    </run-dependency>
66
                </dependency>
66
                </dependency>
67
                <dependency>
67
                <dependency>
(-)a/javascript.editing/manifest.mf (-1 / +1 lines)
 Lines 3-8    Link Here 
3
OpenIDE-Module-Install: org/netbeans/modules/javascript/editing/Installer.class
3
OpenIDE-Module-Install: org/netbeans/modules/javascript/editing/Installer.class
4
OpenIDE-Module-Layer: org/netbeans/modules/javascript/editing/layer.xml
4
OpenIDE-Module-Layer: org/netbeans/modules/javascript/editing/layer.xml
5
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript/editing/Bundle.properties
5
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript/editing/Bundle.properties
6
OpenIDE-Module-Specification-Version: 0.93
6
OpenIDE-Module-Specification-Version: 0.94
7
AutoUpdate-Show-In-Client: false
7
AutoUpdate-Show-In-Client: false
8
8
(-)a/javascript.editing/nbproject/project.xml (-2 / +2 lines)
 Lines 55-62    Link Here 
55
                    <build-prerequisite/>
55
                    <build-prerequisite/>
56
                    <compile-dependency/>
56
                    <compile-dependency/>
57
                    <run-dependency>
57
                    <run-dependency>
58
                        <release-version>1</release-version>
58
                        <release-version>2</release-version>
59
                        <specification-version>1.19</specification-version>
59
                        <specification-version>1.20</specification-version>
60
                    </run-dependency>
60
                    </run-dependency>
61
                </dependency>
61
                </dependency>
62
                <dependency>
62
                <dependency>
(-)a/javascript.hints/manifest.mf (-1 / +1 lines)
 Lines 1-6    Link Here 
1
Manifest-Version: 1.0
1
Manifest-Version: 1.0
2
OpenIDE-Module: org.netbeans.modules.javascript.hints/1
2
OpenIDE-Module: org.netbeans.modules.javascript.hints/1
3
OpenIDE-Module-Specification-Version: 0.43
3
OpenIDE-Module-Specification-Version: 0.44
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript/hints/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript/hints/Bundle.properties
5
OpenIDE-Module-Layer: org/netbeans/modules/javascript/hints/layer.xml
5
OpenIDE-Module-Layer: org/netbeans/modules/javascript/hints/layer.xml
6
AutoUpdate-Show-In-Client: false
6
AutoUpdate-Show-In-Client: false
(-)a/javascript.hints/nbproject/project.xml (-6 / +15 lines)
 Lines 28-35    Link Here 
28
                    <build-prerequisite/>
28
                    <build-prerequisite/>
29
                    <compile-dependency/>
29
                    <compile-dependency/>
30
                    <run-dependency>
30
                    <run-dependency>
31
                        <release-version>1</release-version>
31
                        <release-version>2</release-version>
32
                        <specification-version>1.0</specification-version>
32
                        <specification-version>1.20</specification-version>
33
                    </run-dependency>
33
                    </run-dependency>
34
                </dependency>
34
                </dependency>
35
                <dependency>
35
                <dependency>
 Lines 206-211    Link Here 
206
                        <compile-dependency/>
206
                        <compile-dependency/>
207
                    </test-dependency>
207
                    </test-dependency>
208
                    <test-dependency>
208
                    <test-dependency>
209
                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
210
                        <compile-dependency/>
211
                    </test-dependency>
212
                    <test-dependency>
209
                        <code-name-base>org.netbeans.modules.csl.api</code-name-base>
213
                        <code-name-base>org.netbeans.modules.csl.api</code-name-base>
210
                        <recursive/>
214
                        <recursive/>
211
                        <compile-dependency/>
215
                        <compile-dependency/>
 Lines 233-242    Link Here 
233
                        <test/>
237
                        <test/>
234
                    </test-dependency>
238
                    </test-dependency>
235
                    <test-dependency>
239
                    <test-dependency>
236
                        <code-name-base>org.netbeans.modules.lexer.nbbridge</code-name-base>
237
                        <compile-dependency/>
238
                    </test-dependency>
239
                    <test-dependency>
240
                        <code-name-base>org.netbeans.modules.editor.settings.storage</code-name-base>
240
                        <code-name-base>org.netbeans.modules.editor.settings.storage</code-name-base>
241
                    </test-dependency>
241
                    </test-dependency>
242
                    <test-dependency>
242
                    <test-dependency>
 Lines 273-282    Link Here 
273
                        <test/>
273
                        <test/>
274
                    </test-dependency>
274
                    </test-dependency>
275
                    <test-dependency>
275
                    <test-dependency>
276
                        <code-name-base>org.netbeans.modules.lexer.nbbridge</code-name-base>
277
                        <compile-dependency/>
278
                    </test-dependency>
279
                    <test-dependency>
276
                        <code-name-base>org.netbeans.modules.masterfs</code-name-base>
280
                        <code-name-base>org.netbeans.modules.masterfs</code-name-base>
277
                        <recursive/>
281
                        <recursive/>
278
                    </test-dependency>
282
                    </test-dependency>
279
                    <test-dependency>
283
                    <test-dependency>
284
                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
285
                        <recursive/>
286
                        <compile-dependency/>
287
                    </test-dependency>
288
                    <test-dependency>
280
                        <code-name-base>org.netbeans.modules.progress.ui</code-name-base>
289
                        <code-name-base>org.netbeans.modules.progress.ui</code-name-base>
281
                        <recursive/>
290
                        <recursive/>
282
                    </test-dependency>
291
                    </test-dependency>
(-)a/javascript.hints/test/unit/src/org/netbeans/modules/javascript/hints/HintTestBase.java (-52 lines)
 Lines 27-43    Link Here 
27
 */
27
 */
28
package org.netbeans.modules.javascript.hints;
28
package org.netbeans.modules.javascript.hints;
29
29
30
import java.util.List;
31
import java.util.Map;
32
import java.util.Set;
33
import org.netbeans.modules.csl.core.Language;
34
import org.netbeans.modules.csl.core.LanguageRegistry;
35
import org.netbeans.modules.csl.api.HintsProvider;
30
import org.netbeans.modules.csl.api.HintsProvider;
36
import org.netbeans.modules.csl.hints.infrastructure.GsfHintsManager;
37
import org.netbeans.modules.javascript.editing.JsTestBase;
31
import org.netbeans.modules.javascript.editing.JsTestBase;
38
import org.netbeans.modules.javascript.editing.lexer.JsTokenId;
39
import org.netbeans.modules.javascript.hints.infrastructure.JsAstRule;
40
import org.netbeans.modules.javascript.hints.infrastructure.JsErrorRule;
41
import org.netbeans.modules.javascript.hints.infrastructure.JsHintsProvider;
32
import org.netbeans.modules.javascript.hints.infrastructure.JsHintsProvider;
42
33
43
/**
34
/**
 Lines 56-102    Link Here 
56
        return new JsHintsProvider();
47
        return new JsHintsProvider();
57
    }
48
    }
58
    
49
    
59
    @SuppressWarnings("unchecked")
60
    public void ensureRegistered(JsAstRule hint) throws Exception {
61
        Language language = LanguageRegistry.getInstance().getLanguageByMimeType(JsTokenId.JAVASCRIPT_MIME_TYPE);
62
        assertNotNull(language.getHintsProvider());
63
        GsfHintsManager hintsManager = language.getHintsManager();
64
        Map<Integer, List<JsAstRule>> hints = (Map)hintsManager.getHints();
65
        Set<Integer> kinds = hint.getKinds();
66
        for (Integer nodeType : kinds) {
67
            List<JsAstRule> rules = hints.get(nodeType);
68
            assertNotNull(rules);
69
            boolean found = false;
70
            for (JsAstRule rule : rules) {
71
                if (rule.getClass() == hint.getClass()) {
72
                    found  = true;
73
                    break;
74
                }
75
            }
76
            
77
            assertTrue(found);
78
        }
79
    }
80
81
    @SuppressWarnings("unchecked")
82
    public void ensureRegistered(JsErrorRule hint) throws Exception {
83
        Language language = LanguageRegistry.getInstance().getLanguageByMimeType(JsTokenId.JAVASCRIPT_MIME_TYPE);
84
        assertNotNull(language.getHintsProvider());
85
        GsfHintsManager hintsManager = language.getHintsManager();
86
        Map<Integer, List<JsErrorRule>> hints = (Map)hintsManager.getErrors();
87
        Set<String> kinds = hint.getCodes();
88
        for (String codes : kinds) {
89
            List<JsErrorRule> rules = hints.get(codes);
90
            assertNotNull(rules);
91
            boolean found = false;
92
            for (JsErrorRule rule : rules) {
93
                if (rule.getClass() == hint.getClass()) {
94
                    found  = true;
95
                    break;
96
                }
97
            }
98
            
99
            assertTrue(found);
100
        }
101
    }
102
}
50
}
(-)a/javascript.kit/manifest.mf (-1 / +1 lines)
 Lines 1-6    Link Here 
1
Manifest-Version: 1.0
1
Manifest-Version: 1.0
2
OpenIDE-Module: org.netbeans.modules.javascript.kit/1
2
OpenIDE-Module: org.netbeans.modules.javascript.kit/1
3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript/kit/Bundle.properties
3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript/kit/Bundle.properties
4
OpenIDE-Module-Specification-Version: 0.109
4
OpenIDE-Module-Specification-Version: 0.110
5
AutoUpdate-Show-In-Client: false
5
AutoUpdate-Show-In-Client: false
6
6
(-)a/javascript.kit/nbproject/project.xml (-2 / +2 lines)
 Lines 19-26    Link Here 
19
                    <build-prerequisite/>
19
                    <build-prerequisite/>
20
                    <compile-dependency/>
20
                    <compile-dependency/>
21
                    <run-dependency>
21
                    <run-dependency>
22
                        <release-version>1</release-version>
22
                        <release-version>2</release-version>
23
                        <specification-version>1.8</specification-version>
23
                        <specification-version>1.20</specification-version>
24
                    </run-dependency>
24
                    </run-dependency>
25
                </dependency>
25
                </dependency>
26
                <dependency>
26
                <dependency>
(-)a/javascript.refactoring/manifest.mf (-1 / +1 lines)
 Lines 3-6    Link Here 
3
OpenIDE-Module-Layer: org/netbeans/modules/refactoring/javascript/resources/mf-layer.xml
3
OpenIDE-Module-Layer: org/netbeans/modules/refactoring/javascript/resources/mf-layer.xml
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/refactoring/javascript/resources/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/refactoring/javascript/resources/Bundle.properties
5
AutoUpdate-Show-In-Client: false
5
AutoUpdate-Show-In-Client: false
6
OpenIDE-Module-Specification-Version: 0.68
6
OpenIDE-Module-Specification-Version: 0.69
(-)a/javascript.refactoring/nbproject/project.xml (-2 / +2 lines)
 Lines 37-44    Link Here 
37
                    <build-prerequisite/>
37
                    <build-prerequisite/>
38
                    <compile-dependency/>
38
                    <compile-dependency/>
39
                    <run-dependency>
39
                    <run-dependency>
40
                        <release-version>1</release-version>
40
                        <release-version>2</release-version>
41
                        <specification-version>1.0</specification-version>
41
                        <specification-version>1.20</specification-version>
42
                    </run-dependency>
42
                    </run-dependency>
43
                </dependency>
43
                </dependency>
44
                <dependency>
44
                <dependency>
(-)a/javascript.refactoring/src/org/netbeans/modules/refactoring/javascript/WhereUsedElement.java (-1 / +1 lines)
 Lines 50-56    Link Here 
50
import org.netbeans.modules.csl.api.OffsetRange;
50
import org.netbeans.modules.csl.api.OffsetRange;
51
import org.netbeans.editor.BaseDocument;
51
import org.netbeans.editor.BaseDocument;
52
import org.netbeans.editor.Utilities;
52
import org.netbeans.editor.Utilities;
53
import org.netbeans.modules.csl.core.UiUtils;
53
import org.netbeans.modules.csl.api.UiUtils;
54
import org.netbeans.modules.csl.spi.GsfUtilities;
54
import org.netbeans.modules.csl.spi.GsfUtilities;
55
import org.netbeans.modules.refactoring.javascript.ui.tree.ElementGripFactory;
55
import org.netbeans.modules.refactoring.javascript.ui.tree.ElementGripFactory;
56
import org.netbeans.modules.refactoring.spi.SimpleRefactoringElementImplementation;
56
import org.netbeans.modules.refactoring.spi.SimpleRefactoringElementImplementation;
(-)a/javascript.refactoring/src/org/netbeans/modules/refactoring/javascript/plugins/JsWhereUsedQueryPlugin.java (-1 / +1 lines)
 Lines 59-65    Link Here 
59
import org.netbeans.api.lexer.TokenSequence;
59
import org.netbeans.api.lexer.TokenSequence;
60
import org.netbeans.api.lexer.TokenUtilities;
60
import org.netbeans.api.lexer.TokenUtilities;
61
import org.netbeans.editor.BaseDocument;
61
import org.netbeans.editor.BaseDocument;
62
import org.netbeans.modules.csl.core.UiUtils;
62
import org.netbeans.modules.csl.api.UiUtils;
63
import org.netbeans.modules.csl.spi.GsfUtilities;
63
import org.netbeans.modules.csl.spi.GsfUtilities;
64
import org.netbeans.modules.csl.spi.support.ModificationResult;
64
import org.netbeans.modules.csl.spi.support.ModificationResult;
65
import org.netbeans.modules.javascript.editing.JsParseResult;
65
import org.netbeans.modules.javascript.editing.JsParseResult;
(-)a/javascript.refactoring/src/org/netbeans/modules/refactoring/javascript/ui/tree/FolderTreeElement.java (-1 / +1 lines)
 Lines 49-55    Link Here 
49
import org.netbeans.api.project.ProjectUtils;
49
import org.netbeans.api.project.ProjectUtils;
50
import org.netbeans.api.project.SourceGroup;
50
import org.netbeans.api.project.SourceGroup;
51
import org.netbeans.api.project.Sources;
51
import org.netbeans.api.project.Sources;
52
import org.netbeans.modules.csl.core.UiUtils;
52
import org.netbeans.modules.csl.api.UiUtils;
53
import org.netbeans.modules.refactoring.spi.ui.*;
53
import org.netbeans.modules.refactoring.spi.ui.*;
54
import org.openide.filesystems.FileObject;
54
import org.openide.filesystems.FileObject;
55
import org.openide.filesystems.FileUtil;
55
import org.openide.filesystems.FileUtil;
(-)a/languages.yaml/manifest.mf (-1 / +1 lines)
 Lines 2-6    Link Here 
2
OpenIDE-Module: org.netbeans.modules.languages.yaml
2
OpenIDE-Module: org.netbeans.modules.languages.yaml
3
OpenIDE-Module-Layer: org/netbeans/modules/languages/yaml/layer.xml
3
OpenIDE-Module-Layer: org/netbeans/modules/languages/yaml/layer.xml
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/languages/yaml/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/languages/yaml/Bundle.properties
5
OpenIDE-Module-Specification-Version: 2.7
5
OpenIDE-Module-Specification-Version: 2.8
6
AutoUpdate-Show-In-Client: false
6
AutoUpdate-Show-In-Client: false
(-)a/languages.yaml/nbproject/project.xml (-2 / +2 lines)
 Lines 73-80    Link Here 
73
                    <build-prerequisite/>
73
                    <build-prerequisite/>
74
                    <compile-dependency/>
74
                    <compile-dependency/>
75
                    <run-dependency>
75
                    <run-dependency>
76
                        <release-version>0-1</release-version>
76
                        <release-version>2</release-version>
77
                        <specification-version>1.19</specification-version>
77
                        <specification-version>1.20</specification-version>
78
                    </run-dependency>
78
                    </run-dependency>
79
                </dependency>
79
                </dependency>
80
                <dependency>
80
                <dependency>
(-)a/php.editor/nbproject/project.properties (-1 / +1 lines)
 Lines 1-7    Link Here 
1
javac.source=1.6
1
javac.source=1.6
2
javac.compilerargs=-Xlint -Xlint:-serial
2
javac.compilerargs=-Xlint -Xlint:-serial
3
nbm.needs.restart=true
3
nbm.needs.restart=true
4
spec.version.base=1.10.0
4
spec.version.base=1.11.0
5
test-unit-sys-prop.xtest.js.home=${netbeans.dest.dir}/gsf1
5
test-unit-sys-prop.xtest.js.home=${netbeans.dest.dir}/gsf1
6
release.external/phpdocdesc.zip=docs/phpdocdesc.zip
6
release.external/phpdocdesc.zip=docs/phpdocdesc.zip
7
release.external/predefined_vars.zip=docs/predefined_vars.zip
7
release.external/predefined_vars.zip=docs/predefined_vars.zip
(-)a/php.editor/nbproject/project.xml (-2 / +2 lines)
 Lines 55-62    Link Here 
55
                    <build-prerequisite/>
55
                    <build-prerequisite/>
56
                    <compile-dependency/>
56
                    <compile-dependency/>
57
                    <run-dependency>
57
                    <run-dependency>
58
                        <release-version>1</release-version>
58
                        <release-version>2</release-version>
59
                        <specification-version>1.19</specification-version>
59
                        <specification-version>1.20</specification-version>
60
                    </run-dependency>
60
                    </run-dependency>
61
                </dependency>
61
                </dependency>
62
                <dependency>
62
                <dependency>
(-)a/php.editor/src/org/netbeans/modules/php/editor/verification/AddUseImportRule.java (-1 / +1 lines)
 Lines 49-55    Link Here 
49
import org.netbeans.modules.csl.api.Hint;
49
import org.netbeans.modules.csl.api.Hint;
50
import org.netbeans.modules.csl.api.HintFix;
50
import org.netbeans.modules.csl.api.HintFix;
51
import org.netbeans.modules.csl.api.OffsetRange;
51
import org.netbeans.modules.csl.api.OffsetRange;
52
import org.netbeans.modules.csl.core.UiUtils;
52
import org.netbeans.modules.csl.api.UiUtils;
53
import org.netbeans.modules.parsing.spi.indexing.support.QuerySupport.Kind;
53
import org.netbeans.modules.parsing.spi.indexing.support.QuerySupport.Kind;
54
import org.netbeans.modules.php.editor.index.IndexedClass;
54
import org.netbeans.modules.php.editor.index.IndexedClass;
55
import org.netbeans.modules.php.editor.index.IndexedConstant;
55
import org.netbeans.modules.php.editor.index.IndexedConstant;
(-)a/php.editor/src/org/netbeans/modules/php/editor/verification/IntroduceHint.java (-1 / +1 lines)
 Lines 52-58    Link Here 
52
import org.netbeans.modules.csl.api.Hint;
52
import org.netbeans.modules.csl.api.Hint;
53
import org.netbeans.modules.csl.api.HintFix;
53
import org.netbeans.modules.csl.api.HintFix;
54
import org.netbeans.modules.csl.api.OffsetRange;
54
import org.netbeans.modules.csl.api.OffsetRange;
55
import org.netbeans.modules.csl.core.UiUtils;
55
import org.netbeans.modules.csl.api.UiUtils;
56
import org.netbeans.modules.csl.spi.GsfUtilities;
56
import org.netbeans.modules.csl.spi.GsfUtilities;
57
import org.netbeans.modules.parsing.spi.indexing.support.QuerySupport.Kind;
57
import org.netbeans.modules.parsing.spi.indexing.support.QuerySupport.Kind;
58
import org.netbeans.modules.php.editor.CodeUtils;
58
import org.netbeans.modules.php.editor.CodeUtils;
(-)a/php.project/manifest.mf (-1 / +1 lines)
 Lines 1-6    Link Here 
1
Manifest-Version: 1.0
1
Manifest-Version: 1.0
2
AutoUpdate-Show-In-Client: false
2
AutoUpdate-Show-In-Client: false
3
OpenIDE-Module-Specification-Version: 2.23
3
OpenIDE-Module-Specification-Version: 2.24
4
OpenIDE-Module: org.netbeans.modules.php.project
4
OpenIDE-Module: org.netbeans.modules.php.project
5
OpenIDE-Module-Layer: org/netbeans/modules/php/project/resources/layer.xml
5
OpenIDE-Module-Layer: org/netbeans/modules/php/project/resources/layer.xml
6
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/project/resources/Bundle.properties
6
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/project/resources/Bundle.properties
(-)a/php.project/nbproject/project.xml (-2 / +2 lines)
 Lines 96-103    Link Here 
96
                    <build-prerequisite/>
96
                    <build-prerequisite/>
97
                    <compile-dependency/>
97
                    <compile-dependency/>
98
                    <run-dependency>
98
                    <run-dependency>
99
                        <release-version>1</release-version>
99
                        <release-version>2</release-version>
100
                        <specification-version>1.8</specification-version>
100
                        <specification-version>1.20</specification-version>
101
                    </run-dependency>
101
                    </run-dependency>
102
                </dependency>
102
                </dependency>
103
                <dependency>
103
                <dependency>
(-)a/php.refactoring/manifest.mf (-1 / +1 lines)
 Lines 3-7    Link Here 
3
OpenIDE-Module: org.netbeans.modules.php.refactoring
3
OpenIDE-Module: org.netbeans.modules.php.refactoring
4
OpenIDE-Module-Layer: org/netbeans/modules/refactoring/php/resources/mf-layer.xml
4
OpenIDE-Module-Layer: org/netbeans/modules/refactoring/php/resources/mf-layer.xml
5
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/refactoring/php/Bundle.properties
5
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/refactoring/php/Bundle.properties
6
OpenIDE-Module-Specification-Version: 1.8
6
OpenIDE-Module-Specification-Version: 1.9
7
7
(-)a/php.refactoring/nbproject/project.xml (-2 / +2 lines)
 Lines 28-35    Link Here 
28
                    <build-prerequisite/>
28
                    <build-prerequisite/>
29
                    <compile-dependency/>
29
                    <compile-dependency/>
30
                    <run-dependency>
30
                    <run-dependency>
31
                        <release-version>1</release-version>
31
                        <release-version>2</release-version>
32
                        <specification-version>1.8</specification-version>
32
                        <specification-version>1.20</specification-version>
33
                    </run-dependency>
33
                    </run-dependency>
34
                </dependency>
34
                </dependency>
35
                <dependency>
35
                <dependency>
(-)a/php.refactoring/src/org/netbeans/modules/refactoring/php/findusages/WhereUsedSupport.java (-1 / +1 lines)
 Lines 51-57    Link Here 
51
import org.netbeans.modules.csl.api.ElementKind;
51
import org.netbeans.modules.csl.api.ElementKind;
52
import org.netbeans.modules.csl.api.Modifier;
52
import org.netbeans.modules.csl.api.Modifier;
53
import org.netbeans.modules.csl.api.OffsetRange;
53
import org.netbeans.modules.csl.api.OffsetRange;
54
import org.netbeans.modules.csl.core.UiUtils;
54
import org.netbeans.modules.csl.api.UiUtils;
55
import org.netbeans.modules.csl.spi.ParserResult;
55
import org.netbeans.modules.csl.spi.ParserResult;
56
import org.netbeans.modules.parsing.api.ParserManager;
56
import org.netbeans.modules.parsing.api.ParserManager;
57
import org.netbeans.modules.parsing.api.ResultIterator;
57
import org.netbeans.modules.parsing.api.ResultIterator;
(-)a/php.refactoring/src/org/netbeans/modules/refactoring/php/ui/tree/FolderTreeElement.java (-1 / +1 lines)
 Lines 49-55    Link Here 
49
import org.netbeans.api.project.SourceGroup;
49
import org.netbeans.api.project.SourceGroup;
50
import org.netbeans.api.project.Sources;
50
import org.netbeans.api.project.Sources;
51
import org.netbeans.modules.csl.api.ElementKind;
51
import org.netbeans.modules.csl.api.ElementKind;
52
import org.netbeans.modules.csl.core.UiUtils;
52
import org.netbeans.modules.csl.api.UiUtils;
53
import org.netbeans.modules.php.project.api.PhpSourcePath;
53
import org.netbeans.modules.php.project.api.PhpSourcePath;
54
import org.netbeans.modules.refactoring.spi.ui.*;
54
import org.netbeans.modules.refactoring.spi.ui.*;
55
import org.openide.filesystems.FileObject;
55
import org.openide.filesystems.FileObject;
(-)a/php.symfony/manifest.mf (-1 / +1 lines)
 Lines 2-6    Link Here 
2
OpenIDE-Module: org.netbeans.modules.php.symfony
2
OpenIDE-Module: org.netbeans.modules.php.symfony
3
OpenIDE-Module-Layer: org/netbeans/modules/php/symfony/resources/layer.xml
3
OpenIDE-Module-Layer: org/netbeans/modules/php/symfony/resources/layer.xml
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/symfony/resources/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/symfony/resources/Bundle.properties
5
OpenIDE-Module-Specification-Version: 1.5
5
OpenIDE-Module-Specification-Version: 1.6
6
6
(-)a/php.symfony/nbproject/project.xml (-2 / +2 lines)
 Lines 19-26    Link Here 
19
                    <build-prerequisite/>
19
                    <build-prerequisite/>
20
                    <compile-dependency/>
20
                    <compile-dependency/>
21
                    <run-dependency>
21
                    <run-dependency>
22
                        <release-version>1</release-version>
22
                        <release-version>2</release-version>
23
                        <specification-version>1.11</specification-version>
23
                        <specification-version>1.20</specification-version>
24
                    </run-dependency>
24
                    </run-dependency>
25
                </dependency>
25
                </dependency>
26
                <dependency>
26
                <dependency>
(-)a/php.symfony/src/org/netbeans/modules/php/symfony/ui/actions/GoToActionOrViewAction.java (-1 / +1 lines)
 Lines 48-54    Link Here 
48
import javax.swing.Action;
48
import javax.swing.Action;
49
import javax.swing.JEditorPane;
49
import javax.swing.JEditorPane;
50
import javax.swing.text.TextAction;
50
import javax.swing.text.TextAction;
51
import org.netbeans.modules.csl.core.UiUtils;
51
import org.netbeans.modules.csl.api.UiUtils;
52
import org.netbeans.modules.editor.NbEditorUtilities;
52
import org.netbeans.modules.editor.NbEditorUtilities;
53
import org.netbeans.modules.php.api.editor.EditorSupport;
53
import org.netbeans.modules.php.api.editor.EditorSupport;
54
import org.netbeans.modules.php.api.editor.PhpClass;
54
import org.netbeans.modules.php.api.editor.PhpClass;
(-)a/php.zend/manifest.mf (-1 / +1 lines)
 Lines 2-6    Link Here 
2
OpenIDE-Module: org.netbeans.modules.php.zend
2
OpenIDE-Module: org.netbeans.modules.php.zend
3
OpenIDE-Module-Layer: org/netbeans/modules/php/zend/resources/layer.xml
3
OpenIDE-Module-Layer: org/netbeans/modules/php/zend/resources/layer.xml
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/zend/resources/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/zend/resources/Bundle.properties
5
OpenIDE-Module-Specification-Version: 1.0
5
OpenIDE-Module-Specification-Version: 1.1
6
6
(-)a/php.zend/nbproject/project.xml (-2 / +2 lines)
 Lines 19-26    Link Here 
19
                    <build-prerequisite/>
19
                    <build-prerequisite/>
20
                    <compile-dependency/>
20
                    <compile-dependency/>
21
                    <run-dependency>
21
                    <run-dependency>
22
                        <release-version>1</release-version>
22
                        <release-version>2</release-version>
23
                        <specification-version>1.16</specification-version>
23
                        <specification-version>1.20</specification-version>
24
                    </run-dependency>
24
                    </run-dependency>
25
                </dependency>
25
                </dependency>
26
                <dependency>
26
                <dependency>
(-)a/php.zend/src/org/netbeans/modules/php/zend/ui/actions/GoToActionOrViewAction.java (-1 / +1 lines)
 Lines 46-52    Link Here 
46
import javax.swing.Action;
46
import javax.swing.Action;
47
import javax.swing.JEditorPane;
47
import javax.swing.JEditorPane;
48
import javax.swing.text.TextAction;
48
import javax.swing.text.TextAction;
49
import org.netbeans.modules.csl.core.UiUtils;
49
import org.netbeans.modules.csl.api.UiUtils;
50
import org.netbeans.modules.editor.NbEditorUtilities;
50
import org.netbeans.modules.editor.NbEditorUtilities;
51
import org.netbeans.modules.php.api.editor.EditorSupport;
51
import org.netbeans.modules.php.api.editor.EditorSupport;
52
import org.netbeans.modules.php.api.editor.PhpClass;
52
import org.netbeans.modules.php.api.editor.PhpClass;
(-)a/ruby.extrahints/manifest.mf (-1 / +1 lines)
 Lines 3-6    Link Here 
3
OpenIDE-Module: org.netbeans.modules.ruby.extrahints/1
3
OpenIDE-Module: org.netbeans.modules.ruby.extrahints/1
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ruby/extrahints/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ruby/extrahints/Bundle.properties
5
OpenIDE-Module-Layer: org/netbeans/modules/ruby/extrahints/layer.xml
5
OpenIDE-Module-Layer: org/netbeans/modules/ruby/extrahints/layer.xml
6
OpenIDE-Module-Specification-Version: 0.47
6
OpenIDE-Module-Specification-Version: 0.48
(-)a/ruby.extrahints/nbproject/project.xml (-2 / +2 lines)
 Lines 37-44    Link Here 
37
                    <build-prerequisite/>
37
                    <build-prerequisite/>
38
                    <compile-dependency/>
38
                    <compile-dependency/>
39
                    <run-dependency>
39
                    <run-dependency>
40
                        <release-version>1</release-version>
40
                        <release-version>2</release-version>
41
                        <specification-version>1.8</specification-version>
41
                        <specification-version>1.20</specification-version>
42
                    </run-dependency>
42
                    </run-dependency>
43
                </dependency>
43
                </dependency>
44
                <dependency>
44
                <dependency>
(-)a/ruby.hints/manifest.mf (-1 / +1 lines)
 Lines 1-6    Link Here 
1
Manifest-Version: 1.0
1
Manifest-Version: 1.0
2
OpenIDE-Module: org.netbeans.modules.ruby.hints/1
2
OpenIDE-Module: org.netbeans.modules.ruby.hints/1
3
OpenIDE-Module-Specification-Version: 0.44
3
OpenIDE-Module-Specification-Version: 0.45
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ruby/hints/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ruby/hints/Bundle.properties
5
OpenIDE-Module-Layer: org/netbeans/modules/ruby/hints/layer.xml
5
OpenIDE-Module-Layer: org/netbeans/modules/ruby/hints/layer.xml
6
AutoUpdate-Show-In-Client: false
6
AutoUpdate-Show-In-Client: false
(-)a/ruby.hints/nbproject/project.xml (-2 / +2 lines)
 Lines 46-53    Link Here 
46
                    <build-prerequisite/>
46
                    <build-prerequisite/>
47
                    <compile-dependency/>
47
                    <compile-dependency/>
48
                    <run-dependency>
48
                    <run-dependency>
49
                        <release-version>1</release-version>
49
                        <release-version>2</release-version>
50
                        <specification-version>1.8</specification-version>
50
                        <specification-version>1.20</specification-version>
51
                    </run-dependency>
51
                    </run-dependency>
52
                </dependency>
52
                </dependency>
53
                <dependency>
53
                <dependency>
(-)a/ruby.hints/test/unit/src/org/netbeans/modules/ruby/hints/HintTestBase.java (-23 lines)
 Lines 43-50    Link Here 
43
import org.netbeans.modules.csl.api.HintSeverity;
43
import org.netbeans.modules.csl.api.HintSeverity;
44
import org.netbeans.modules.csl.api.HintsProvider;
44
import org.netbeans.modules.csl.api.HintsProvider;
45
import org.netbeans.modules.csl.api.Rule;
45
import org.netbeans.modules.csl.api.Rule;
46
import org.netbeans.modules.csl.core.Language;
47
import org.netbeans.modules.csl.core.LanguageRegistry;
48
import org.netbeans.modules.csl.hints.infrastructure.GsfHintsManager;
46
import org.netbeans.modules.csl.hints.infrastructure.GsfHintsManager;
49
import org.netbeans.modules.csl.spi.ParserResult;
47
import org.netbeans.modules.csl.spi.ParserResult;
50
import org.netbeans.modules.ruby.AstUtilities;
48
import org.netbeans.modules.ruby.AstUtilities;
 Lines 166-190    Link Here 
166
        assertTrue(fails.toString(), fails.size() == 0);
164
        assertTrue(fails.toString(), fails.size() == 0);
167
    }
165
    }
168
    
166
    
169
    @SuppressWarnings("unchecked")
170
    public void ensureRegistered(RubyAstRule hint) throws Exception {
171
        Language language = LanguageRegistry.getInstance().getLanguageByMimeType(RubyInstallation.RUBY_MIME_TYPE);
172
        assertNotNull(language.getHintsProvider());
173
        GsfHintsManager hintsManager = language.getHintsManager();
174
        Map<NodeType, List<RubyAstRule>> hints = (Map)hintsManager.getHints();
175
        Set<NodeType> kinds = hint.getKinds();
176
        for (NodeType nodeType : kinds) {
177
            List<RubyAstRule> rules = hints.get(nodeType);
178
            assertNotNull(rules);
179
            boolean found = false;
180
            for (RubyAstRule rule : rules) {
181
                if (rule.getClass() == hint.getClass()) {
182
                    found  = true;
183
                    break;
184
                }
185
            }
186
            
187
            assertTrue(found);
188
        }
189
    }
190
}
167
}
(-)a/ruby.merbproject/manifest.mf (-1 / +1 lines)
 Lines 3-7    Link Here 
3
OpenIDE-Module-Layer: org/netbeans/modules/ruby/merbproject/ui/resources/layer.xml
3
OpenIDE-Module-Layer: org/netbeans/modules/ruby/merbproject/ui/resources/layer.xml
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ruby/merbproject/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ruby/merbproject/Bundle.properties
5
OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
5
OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
6
OpenIDE-Module-Specification-Version: 1.1
6
OpenIDE-Module-Specification-Version: 1.2
7
AutoUpdate-Show-In-Client: false
7
AutoUpdate-Show-In-Client: false
(-)a/ruby.merbproject/nbproject/project.xml (-2 / +2 lines)
 Lines 37-44    Link Here 
37
                    <build-prerequisite/>
37
                    <build-prerequisite/>
38
                    <compile-dependency/>
38
                    <compile-dependency/>
39
                    <run-dependency>
39
                    <run-dependency>
40
                        <release-version>1</release-version>
40
                        <release-version>2</release-version>
41
                        <specification-version>1.8</specification-version>
41
                        <specification-version>1.20</specification-version>
42
                    </run-dependency>
42
                    </run-dependency>
43
                </dependency>
43
                </dependency>
44
                <dependency>
44
                <dependency>
(-)a/ruby.platform/manifest.mf (-1 / +1 lines)
 Lines 3-6    Link Here 
3
OpenIDE-Module-Layer: org/netbeans/modules/ruby/platform/resources/layer.xml
3
OpenIDE-Module-Layer: org/netbeans/modules/ruby/platform/resources/layer.xml
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ruby/platform/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ruby/platform/Bundle.properties
5
AutoUpdate-Show-In-Client: false
5
AutoUpdate-Show-In-Client: false
6
OpenIDE-Module-Specification-Version: 1.21
6
OpenIDE-Module-Specification-Version: 1.22
(-)a/ruby.platform/nbproject/project.xml (-2 / +2 lines)
 Lines 78-85    Link Here 
78
                    <build-prerequisite/>
78
                    <build-prerequisite/>
79
                    <compile-dependency/>
79
                    <compile-dependency/>
80
                    <run-dependency>
80
                    <run-dependency>
81
                        <release-version>1</release-version>
81
                        <release-version>2</release-version>
82
                        <specification-version>1.8</specification-version>
82
                        <specification-version>1.20</specification-version>
83
                    </run-dependency>
83
                    </run-dependency>
84
                </dependency>
84
                </dependency>
85
                <dependency>
85
                <dependency>
(-)a/ruby.project/manifest.mf (-1 / +1 lines)
 Lines 4-8    Link Here 
4
OpenIDE-Module-Install: org/netbeans/modules/ruby/rubyproject/RubyProjectModuleInstaller.class
4
OpenIDE-Module-Install: org/netbeans/modules/ruby/rubyproject/RubyProjectModuleInstaller.class
5
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ruby/rubyproject/Bundle.properties
5
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ruby/rubyproject/Bundle.properties
6
OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
6
OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
7
OpenIDE-Module-Specification-Version: 1.17
7
OpenIDE-Module-Specification-Version: 1.18
8
AutoUpdate-Show-In-Client: false
8
AutoUpdate-Show-In-Client: false
(-)a/ruby.project/nbproject/project.xml (-2 / +2 lines)
 Lines 55-62    Link Here 
55
                    <build-prerequisite/>
55
                    <build-prerequisite/>
56
                    <compile-dependency/>
56
                    <compile-dependency/>
57
                    <run-dependency>
57
                    <run-dependency>
58
                        <release-version>1</release-version>
58
                        <release-version>2</release-version>
59
                        <specification-version>1.8</specification-version>
59
                        <specification-version>1.20</specification-version>
60
                    </run-dependency>
60
                    </run-dependency>
61
                </dependency>
61
                </dependency>
62
                <dependency>
62
                <dependency>
(-)a/ruby.railsprojects/manifest.mf (-1 / +1 lines)
 Lines 3-7    Link Here 
3
OpenIDE-Module-Layer: org/netbeans/modules/ruby/railsprojects/ui/resources/layer.xml
3
OpenIDE-Module-Layer: org/netbeans/modules/ruby/railsprojects/ui/resources/layer.xml
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ruby/railsprojects/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ruby/railsprojects/Bundle.properties
5
OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
5
OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
6
OpenIDE-Module-Specification-Version: 1.7
6
OpenIDE-Module-Specification-Version: 1.8
7
AutoUpdate-Show-In-Client: false
7
AutoUpdate-Show-In-Client: false
(-)a/ruby.railsprojects/nbproject/project.xml (-2 / +2 lines)
 Lines 46-53    Link Here 
46
                    <build-prerequisite/>
46
                    <build-prerequisite/>
47
                    <compile-dependency/>
47
                    <compile-dependency/>
48
                    <run-dependency>
48
                    <run-dependency>
49
                        <release-version>1</release-version>
49
                        <release-version>2</release-version>
50
                        <specification-version>1.8</specification-version>
50
                        <specification-version>1.20</specification-version>
51
                    </run-dependency>
51
                    </run-dependency>
52
                </dependency>
52
                </dependency>
53
                <dependency>
53
                <dependency>
(-)a/ruby.refactoring/manifest.mf (-1 / +1 lines)
 Lines 3-6    Link Here 
3
OpenIDE-Module-Layer: org/netbeans/modules/refactoring/ruby/resources/mf-layer.xml
3
OpenIDE-Module-Layer: org/netbeans/modules/refactoring/ruby/resources/mf-layer.xml
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/refactoring/ruby/resources/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/refactoring/ruby/resources/Bundle.properties
5
AutoUpdate-Show-In-Client: false
5
AutoUpdate-Show-In-Client: false
6
OpenIDE-Module-Specification-Version: 0.68
6
OpenIDE-Module-Specification-Version: 0.69
(-)a/ruby.refactoring/nbproject/project.xml (-2 / +2 lines)
 Lines 28-35    Link Here 
28
                    <build-prerequisite/>
28
                    <build-prerequisite/>
29
                    <compile-dependency/>
29
                    <compile-dependency/>
30
                    <run-dependency>
30
                    <run-dependency>
31
                        <release-version>1</release-version>
31
                        <release-version>2</release-version>
32
                        <specification-version>1.8</specification-version>
32
                        <specification-version>1.20</specification-version>
33
                    </run-dependency>
33
                    </run-dependency>
34
                </dependency>
34
                </dependency>
35
                <dependency>
35
                <dependency>
(-)a/ruby.refactoring/src/org/netbeans/modules/refactoring/ruby/WhereUsedElement.java (-1 / +1 lines)
 Lines 48-54    Link Here 
48
import org.netbeans.editor.Utilities;
48
import org.netbeans.editor.Utilities;
49
import org.netbeans.modules.csl.api.Modifier;
49
import org.netbeans.modules.csl.api.Modifier;
50
import org.netbeans.modules.csl.api.OffsetRange;
50
import org.netbeans.modules.csl.api.OffsetRange;
51
import org.netbeans.modules.csl.core.UiUtils;
51
import org.netbeans.modules.csl.api.UiUtils;
52
import org.netbeans.modules.csl.spi.GsfUtilities;
52
import org.netbeans.modules.csl.spi.GsfUtilities;
53
import org.netbeans.modules.csl.spi.ParserResult;
53
import org.netbeans.modules.csl.spi.ParserResult;
54
import org.netbeans.modules.refactoring.ruby.ui.tree.ElementGripFactory;
54
import org.netbeans.modules.refactoring.ruby.ui.tree.ElementGripFactory;
(-)a/ruby.refactoring/src/org/netbeans/modules/refactoring/ruby/plugins/RubyWhereUsedQueryPlugin.java (-1 / +1 lines)
 Lines 69-75    Link Here 
69
import org.netbeans.modules.csl.api.Modifier;
69
import org.netbeans.modules.csl.api.Modifier;
70
import org.netbeans.modules.csl.api.OffsetRange;
70
import org.netbeans.modules.csl.api.OffsetRange;
71
import org.netbeans.modules.csl.api.Severity;
71
import org.netbeans.modules.csl.api.Severity;
72
import org.netbeans.modules.csl.core.UiUtils;
72
import org.netbeans.modules.csl.api.UiUtils;
73
import org.netbeans.modules.csl.spi.ParserResult;
73
import org.netbeans.modules.csl.spi.ParserResult;
74
import org.netbeans.modules.csl.spi.support.ModificationResult;
74
import org.netbeans.modules.csl.spi.support.ModificationResult;
75
import org.netbeans.modules.refactoring.api.Problem;
75
import org.netbeans.modules.refactoring.api.Problem;
(-)a/ruby.refactoring/src/org/netbeans/modules/refactoring/ruby/ui/tree/FolderTreeElement.java (-1 / +1 lines)
 Lines 48-55    Link Here 
48
import org.netbeans.api.project.SourceGroup;
48
import org.netbeans.api.project.SourceGroup;
49
import org.netbeans.api.project.Sources;
49
import org.netbeans.api.project.Sources;
50
import org.netbeans.modules.csl.api.ElementKind;
50
import org.netbeans.modules.csl.api.ElementKind;
51
import org.netbeans.modules.csl.core.UiUtils;
52
import org.netbeans.api.java.classpath.ClassPath;
51
import org.netbeans.api.java.classpath.ClassPath;
52
import org.netbeans.modules.csl.api.UiUtils;
53
import org.netbeans.modules.refactoring.spi.ui.*;
53
import org.netbeans.modules.refactoring.spi.ui.*;
54
import org.netbeans.modules.refactoring.spi.ui.TreeElementFactory;
54
import org.netbeans.modules.refactoring.spi.ui.TreeElementFactory;
55
import org.netbeans.modules.ruby.rubyproject.RubyProject;
55
import org.netbeans.modules.ruby.rubyproject.RubyProject;
(-)a/ruby.rhtml/nbproject/project.properties (-1 / +1 lines)
 Lines 39-45    Link Here 
39
39
40
javac.compilerargs=-Xlint -Xlint:-serial
40
javac.compilerargs=-Xlint -Xlint:-serial
41
javac.source=1.6
41
javac.source=1.6
42
spec.version.base=0.71.0
42
spec.version.base=0.72.0
43
43
44
test-unit-sys-prop.xtest.jruby.home=${netbeans.dest.dir}/ruby2/jruby-1.2.0
44
test-unit-sys-prop.xtest.jruby.home=${netbeans.dest.dir}/ruby2/jruby-1.2.0
45
45
(-)a/ruby.rhtml/nbproject/project.xml (-2 / +11 lines)
 Lines 19-26    Link Here 
19
                    <build-prerequisite/>
19
                    <build-prerequisite/>
20
                    <compile-dependency/>
20
                    <compile-dependency/>
21
                    <run-dependency>
21
                    <run-dependency>
22
                        <release-version>1</release-version>
22
                        <release-version>2</release-version>
23
                        <specification-version>1.19</specification-version>
23
                        <specification-version>1.20</specification-version>
24
                    </run-dependency>
24
                    </run-dependency>
25
                </dependency>
25
                </dependency>
26
                <dependency>
26
                <dependency>
 Lines 256-261    Link Here 
256
                        <recursive/>
256
                        <recursive/>
257
                    </test-dependency>
257
                    </test-dependency>
258
                    <test-dependency>
258
                    <test-dependency>
259
                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
260
                        <compile-dependency/>
261
                    </test-dependency>
262
                    <test-dependency>
259
                        <code-name-base>org.netbeans.modules.csl.api</code-name-base>
263
                        <code-name-base>org.netbeans.modules.csl.api</code-name-base>
260
                        <recursive/>
264
                        <recursive/>
261
                        <compile-dependency/>
265
                        <compile-dependency/>
 Lines 316-321    Link Here 
316
                        <recursive/>
320
                        <recursive/>
317
                    </test-dependency>
321
                    </test-dependency>
318
                    <test-dependency>
322
                    <test-dependency>
323
                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
324
                        <recursive/>
325
                        <compile-dependency/>
326
                    </test-dependency>
327
                    <test-dependency>
319
                        <code-name-base>org.netbeans.modules.progress.ui</code-name-base>
328
                        <code-name-base>org.netbeans.modules.progress.ui</code-name-base>
320
                        <recursive/>
329
                        <recursive/>
321
                    </test-dependency>
330
                    </test-dependency>
(-)a/ruby.rhtml/src/org/netbeans/modules/ruby/rhtml/editor/RhtmlKit.java (-9 / +9 lines)
 Lines 60-73    Link Here 
60
import org.netbeans.editor.ext.html.dtd.Registry;
60
import org.netbeans.editor.ext.html.dtd.Registry;
61
import org.netbeans.lib.editor.util.CharSequenceUtilities;
61
import org.netbeans.lib.editor.util.CharSequenceUtilities;
62
import org.netbeans.lib.editor.util.swing.DocumentUtilities;
62
import org.netbeans.lib.editor.util.swing.DocumentUtilities;
63
import org.netbeans.modules.csl.core.DeleteToNextCamelCasePosition;
63
import org.netbeans.modules.csl.api.DeleteToNextCamelCasePosition;
64
import org.netbeans.modules.csl.core.DeleteToPreviousCamelCasePosition;
64
import org.netbeans.modules.csl.api.DeleteToPreviousCamelCasePosition;
65
import org.netbeans.modules.csl.core.NextCamelCasePosition;
65
import org.netbeans.modules.csl.api.InstantRenameAction;
66
import org.netbeans.modules.csl.core.PreviousCamelCasePosition;
66
import org.netbeans.modules.csl.api.NextCamelCasePosition;
67
import org.netbeans.modules.csl.core.SelectCodeElementAction;
67
import org.netbeans.modules.csl.api.PreviousCamelCasePosition;
68
import org.netbeans.modules.csl.core.SelectNextCamelCasePosition;
68
import org.netbeans.modules.csl.api.SelectCodeElementAction;
69
import org.netbeans.modules.csl.core.SelectPreviousCamelCasePosition;
69
import org.netbeans.modules.csl.api.SelectNextCamelCasePosition;
70
import org.netbeans.modules.csl.editor.InstantRenameAction;
70
import org.netbeans.modules.csl.api.SelectPreviousCamelCasePosition;
71
import org.netbeans.modules.html.editor.api.HtmlKit;
71
import org.netbeans.modules.html.editor.api.HtmlKit;
72
import org.netbeans.modules.html.editor.api.gsf.HtmlParserResult;
72
import org.netbeans.modules.html.editor.api.gsf.HtmlParserResult;
73
import org.netbeans.modules.ruby.lexer.RubyTokenId;
73
import org.netbeans.modules.ruby.lexer.RubyTokenId;
 Lines 489-495    Link Here 
489
                }
489
                }
490
                final BaseDocument doc = (BaseDocument)target.getDocument();
490
                final BaseDocument doc = (BaseDocument)target.getDocument();
491
                doc.runAtomic(new Runnable() {
491
                doc.runAtomic(new Runnable() {
492
                    public void run() {
492
                    public @Override void run() {
493
                        try {
493
                        try {
494
                            Caret caret = target.getCaret();
494
                            Caret caret = target.getCaret();
495
                            int startPos;
495
                            int startPos;
(-)a/ruby.rhtml/test/unit/src/org/netbeans/modules/ruby/rhtml/RhtmlTestBase.java (-26 lines)
 Lines 29-37    Link Here 
29
package org.netbeans.modules.ruby.rhtml;
29
package org.netbeans.modules.ruby.rhtml;
30
30
31
import java.awt.event.ActionEvent;
31
import java.awt.event.ActionEvent;
32
import java.util.ArrayList;
33
import java.util.Collections;
34
import java.util.List;
35
import javax.swing.Action;
32
import javax.swing.Action;
36
import javax.swing.JEditorPane;
33
import javax.swing.JEditorPane;
37
import org.netbeans.api.editor.mimelookup.MimePath;
34
import org.netbeans.api.editor.mimelookup.MimePath;
 Lines 42-60    Link Here 
42
import org.netbeans.editor.Formatter;
39
import org.netbeans.editor.Formatter;
43
import org.netbeans.editor.ext.ExtFormatter;
40
import org.netbeans.editor.ext.ExtFormatter;
44
import org.netbeans.lib.lexer.test.TestLanguageProvider;
41
import org.netbeans.lib.lexer.test.TestLanguageProvider;
45
import org.netbeans.modules.csl.core.Language;
46
import org.netbeans.modules.csl.core.LanguageRegistry;
47
import org.netbeans.modules.html.editor.indent.HtmlIndentTaskFactory;
42
import org.netbeans.modules.html.editor.indent.HtmlIndentTaskFactory;
48
import org.netbeans.modules.ruby.RubyTestBase;
43
import org.netbeans.modules.ruby.RubyTestBase;
49
import org.netbeans.modules.ruby.rhtml.editor.RhtmlKit;
44
import org.netbeans.modules.ruby.rhtml.editor.RhtmlKit;
50
import org.netbeans.modules.ruby.rhtml.lexer.api.RhtmlTokenId;
45
import org.netbeans.modules.ruby.rhtml.lexer.api.RhtmlTokenId;
51
import org.openide.filesystems.FileObject;
46
import org.openide.filesystems.FileObject;
52
import org.netbeans.modules.csl.editor.codetemplates.CslCorePackageAccessor;
53
import org.netbeans.modules.csl.spi.DefaultLanguageConfig;
47
import org.netbeans.modules.csl.spi.DefaultLanguageConfig;
54
import org.netbeans.modules.ruby.RubyKeystrokeHandler;
55
import org.netbeans.modules.ruby.RubyRenameHandler;
56
import org.netbeans.modules.ruby.lexer.RubyTokenId;
48
import org.netbeans.modules.ruby.lexer.RubyTokenId;
57
import org.openide.filesystems.FileUtil;
58
49
59
/**
50
/**
60
 *
51
 *
 Lines 99-121    Link Here 
99
90
100
        Formatter.setFormatter(RhtmlKit.class, new ExtFormatter(RhtmlKit.class));
91
        Formatter.setFormatter(RhtmlKit.class, new ExtFormatter(RhtmlKit.class));
101
92
102
        LanguageRegistry registry = LanguageRegistry.getInstance();
103
        List<Action> actions = Collections.emptyList();
104
        if (!LanguageRegistry.getInstance().isSupported(RhtmlTokenId.MIME_TYPE)) {
105
            Language dl = new Language("org/netbeans/modules/ruby/jrubydoc.png", RhtmlTokenId.MIME_TYPE,
106
                    actions, new RhtmlLanguage(),
107
                    new RhtmlCompleter(), new RubyRenameHandler(), new RhtmlFinder(),
108
                    null, new RubyKeystrokeHandler(), null, null, null, true);
109
            List<Language> languages = new ArrayList<Language>();
110
            languages.add(dl);
111
            CslCorePackageAccessor.get().languageRegistryAddLanguages(languages);
112
113
            String mimeFolder = "Editors/" + dl.getMimeType();
114
            final FileObject root = FileUtil.getConfigFile(mimeFolder); // NOI18N
115
            if (root == null) {
116
                FileUtil.createFolder(FileUtil.getConfigRoot(), mimeFolder);
117
            }
118
        }
119
    }
93
    }
120
94
121
    @Override
95
    @Override
(-)a/ruby.testrunner/manifest.mf (-1 / +1 lines)
 Lines 2-6    Link Here 
2
AutoUpdate-Show-In-Client: false
2
AutoUpdate-Show-In-Client: false
3
OpenIDE-Module: org.netbeans.modules.ruby.testrunner
3
OpenIDE-Module: org.netbeans.modules.ruby.testrunner
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ruby/testrunner/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ruby/testrunner/Bundle.properties
5
OpenIDE-Module-Specification-Version: 1.6
5
OpenIDE-Module-Specification-Version: 1.7
6
6
(-)a/ruby.testrunner/nbproject/project.xml (-2 / +2 lines)
 Lines 26-33    Link Here 
26
                    <build-prerequisite/>
26
                    <build-prerequisite/>
27
                    <compile-dependency/>
27
                    <compile-dependency/>
28
                    <run-dependency>
28
                    <run-dependency>
29
                        <release-version>1</release-version>
29
                        <release-version>2</release-version>
30
                        <specification-version>1.8</specification-version>
30
                        <specification-version>1.20</specification-version>
31
                    </run-dependency>
31
                    </run-dependency>
32
                </dependency>
32
                </dependency>
33
                <dependency>
33
                <dependency>
(-)a/ruby/manifest.mf (-1 / +1 lines)
 Lines 2-7    Link Here 
2
OpenIDE-Module: org.netbeans.modules.ruby/1
2
OpenIDE-Module: org.netbeans.modules.ruby/1
3
OpenIDE-Module-Layer: org/netbeans/modules/ruby/layer.xml
3
OpenIDE-Module-Layer: org/netbeans/modules/ruby/layer.xml
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ruby/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ruby/Bundle.properties
5
OpenIDE-Module-Specification-Version: 1.17
5
OpenIDE-Module-Specification-Version: 1.18
6
AutoUpdate-Show-In-Client: false
6
AutoUpdate-Show-In-Client: false
7
7
(-)a/ruby/nbproject/project.xml (-2 / +2 lines)
 Lines 55-62    Link Here 
55
                    <build-prerequisite/>
55
                    <build-prerequisite/>
56
                    <compile-dependency/>
56
                    <compile-dependency/>
57
                    <run-dependency>
57
                    <run-dependency>
58
                        <release-version>1</release-version>
58
                        <release-version>2</release-version>
59
                        <specification-version>1.19</specification-version>
59
                        <specification-version>1.20</specification-version>
60
                    </run-dependency>
60
                    </run-dependency>
61
                </dependency>
61
                </dependency>
62
                <dependency>
62
                <dependency>
(-)a/web.core.syntax/nbproject/project.properties (-1 / +1 lines)
 Lines 47-53    Link Here 
47
javac.source=1.6
47
javac.source=1.6
48
javadoc.arch=${basedir}/arch.xml
48
javadoc.arch=${basedir}/arch.xml
49
49
50
spec.version.base=2.9.0
50
spec.version.base=2.10.0
51
51
52
test.config.validation.includes=\
52
test.config.validation.includes=\
53
**/AutoCompletionTest.class,**/CompletionTest.class
53
**/AutoCompletionTest.class,**/CompletionTest.class
(-)a/web.core.syntax/nbproject/project.xml (-2 / +2 lines)
 Lines 86-93    Link Here 
86
                    <build-prerequisite/>
86
                    <build-prerequisite/>
87
                    <compile-dependency/>
87
                    <compile-dependency/>
88
                    <run-dependency>
88
                    <run-dependency>
89
                        <release-version>1</release-version>
89
                        <release-version>2</release-version>
90
                        <specification-version>1.19</specification-version>
90
                        <specification-version>1.20</specification-version>
91
                    </run-dependency>
91
                    </run-dependency>
92
                </dependency>
92
                </dependency>
93
                <dependency>
93
                <dependency>
(-)a/web.core.syntax/src/org/netbeans/modules/web/core/syntax/JspKit.java (-22 / +8 lines)
 Lines 42-56    Link Here 
42
package org.netbeans.modules.web.core.syntax;
42
package org.netbeans.modules.web.core.syntax;
43
43
44
44
45
import java.util.List;
46
import java.util.Map;
45
import java.util.Map;
47
import org.netbeans.editor.ext.ExtKit;
46
import org.netbeans.editor.ext.ExtKit;
48
import org.netbeans.modules.csl.api.KeystrokeHandler;
47
import org.netbeans.modules.csl.api.KeystrokeHandler;
49
import org.netbeans.modules.csl.core.Language;
50
import org.netbeans.modules.csl.core.LanguageRegistry;
51
import org.netbeans.modules.csl.core.SelectCodeElementAction;
52
import org.netbeans.modules.csl.editor.InstantRenameAction;
53
import org.netbeans.modules.csl.editor.ToggleBlockCommentAction;
54
import org.netbeans.modules.editor.NbEditorDocument;
48
import org.netbeans.modules.editor.NbEditorDocument;
55
import org.netbeans.modules.editor.NbEditorKit;
49
import org.netbeans.modules.editor.NbEditorKit;
56
import org.netbeans.modules.web.core.syntax.deprecated.Jsp11Syntax;
50
import org.netbeans.modules.web.core.syntax.deprecated.Jsp11Syntax;
 Lines 81-86    Link Here 
81
import org.netbeans.editor.BaseKit.InsertBreakAction;
75
import org.netbeans.editor.BaseKit.InsertBreakAction;
82
import org.netbeans.editor.ext.ExtKit.ExtDefaultKeyTypedAction;
76
import org.netbeans.editor.ext.ExtKit.ExtDefaultKeyTypedAction;
83
import org.netbeans.editor.ext.ExtKit.ExtDeleteCharAction;
77
import org.netbeans.editor.ext.ExtKit.ExtDeleteCharAction;
78
import org.netbeans.modules.csl.api.InstantRenameAction;
79
import org.netbeans.modules.csl.api.SelectCodeElementAction;
80
import org.netbeans.modules.csl.api.ToggleBlockCommentAction;
81
import org.netbeans.modules.csl.api.UiUtils;
84
import org.netbeans.spi.lexer.MutableTextInput;
82
import org.netbeans.spi.lexer.MutableTextInput;
85
83
86
/**
84
/**
 Lines 333-350    Link Here 
333
        return new org.openide.util.HelpCtx(JspKit.class);
331
        return new org.openide.util.HelpCtx(JspKit.class);
334
    }
332
    }
335
333
336
    static KeystrokeHandler getBracketCompletion(Document doc, int offset) {
337
        BaseDocument baseDoc = (BaseDocument) doc;
338
        List<Language> list = LanguageRegistry.getInstance().getEmbeddedLanguages(baseDoc, offset);
339
        for (Language l : list) {
340
            if (l.getBracketCompletion() != null) {
341
                return l.getBracketCompletion();
342
            }
343
        }
344
345
        return null;
346
    }
347
348
    /**
334
    /**
349
     * Returns true if bracket completion is enabled in options.
335
     * Returns true if bracket completion is enabled in options.
350
     */
336
     */
 Lines 384-390    Link Here 
384
        @Override
370
        @Override
385
        protected Object beforeBreak(JTextComponent target, BaseDocument doc, Caret caret) {
371
        protected Object beforeBreak(JTextComponent target, BaseDocument doc, Caret caret) {
386
            if (completionSettingEnabled()) {
372
            if (completionSettingEnabled()) {
387
                KeystrokeHandler bracketCompletion = getBracketCompletion(doc, caret.getDot());
373
                KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, caret.getDot());
388
374
389
                if (bracketCompletion != null) {
375
                if (bracketCompletion != null) {
390
                    try {
376
                    try {
 Lines 468-474    Link Here 
468
                Caret caret, String str,
454
                Caret caret, String str,
469
                boolean overwrite) throws BadLocationException {
455
                boolean overwrite) throws BadLocationException {
470
            if (completionSettingEnabled()) {
456
            if (completionSettingEnabled()) {
471
                KeystrokeHandler bracketCompletion = getBracketCompletion(doc, dotPos);
457
                KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, dotPos);
472
458
473
                if (bracketCompletion != null) {
459
                if (bracketCompletion != null) {
474
                    // TODO - check if we're in a comment etc. and if so, do nothing
460
                    // TODO - check if we're in a comment etc. and if so, do nothing
 Lines 499-505    Link Here 
499
                BaseDocument doc = (BaseDocument) document;
485
                BaseDocument doc = (BaseDocument) document;
500
486
501
                if (completionSettingEnabled()) {
487
                if (completionSettingEnabled()) {
502
                    KeystrokeHandler bracketCompletion = getBracketCompletion(doc, dotPos);
488
                    KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, dotPos);
503
489
504
                    if (bracketCompletion != null) {
490
                    if (bracketCompletion != null) {
505
                        try {
491
                        try {
 Lines 580-586    Link Here 
580
        @Override
566
        @Override
581
         protected void charBackspaced(BaseDocument doc, int dotPos, Caret caret, char ch) throws BadLocationException {
567
         protected void charBackspaced(BaseDocument doc, int dotPos, Caret caret, char ch) throws BadLocationException {
582
              if (completionSettingEnabled()) {
568
              if (completionSettingEnabled()) {
583
                KeystrokeHandler bracketCompletion = getBracketCompletion(doc, dotPos);
569
                KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, dotPos);
584
570
585
                if (bracketCompletion != null) {
571
                if (bracketCompletion != null) {
586
                    bracketCompletion.charBackspaced(doc, dotPos, currentTarget, ch);
572
                    bracketCompletion.charBackspaced(doc, dotPos, currentTarget, ch);
(-)a/web.core.syntax/test/unit/src/org/netbeans/modules/web/core/syntax/formatting/JspIndenterTest.java (-2 lines)
 Lines 61-67    Link Here 
61
import org.netbeans.modules.csl.api.DataLoadersBridge;
61
import org.netbeans.modules.csl.api.DataLoadersBridge;
62
import org.netbeans.modules.csl.api.Formatter;
62
import org.netbeans.modules.csl.api.Formatter;
63
import org.netbeans.modules.csl.api.test.CslTestBase.IndentPrefs;
63
import org.netbeans.modules.csl.api.test.CslTestBase.IndentPrefs;
64
import org.netbeans.modules.csl.core.GsfIndentTaskFactory;
65
import org.netbeans.modules.css.editor.indent.CssIndentTaskFactory;
64
import org.netbeans.modules.css.editor.indent.CssIndentTaskFactory;
66
import org.netbeans.modules.css.formatting.api.support.AbstractIndenter;
65
import org.netbeans.modules.css.formatting.api.support.AbstractIndenter;
67
import org.netbeans.modules.css.lexer.api.CssTokenId;
66
import org.netbeans.modules.css.lexer.api.CssTokenId;
 Lines 143-149    Link Here 
143
        MockMimeLookup.setInstances(MimePath.parse("text/x-java"), factory, new JavacParserFactory(), new ClassParserFactory());
142
        MockMimeLookup.setInstances(MimePath.parse("text/x-java"), factory, new JavacParserFactory(), new ClassParserFactory());
144
        ExpressionLanguageIndentTaskFactory elReformatFactory = new ExpressionLanguageIndentTaskFactory();
143
        ExpressionLanguageIndentTaskFactory elReformatFactory = new ExpressionLanguageIndentTaskFactory();
145
        MockMimeLookup.setInstances(MimePath.parse("text/x-el"), elReformatFactory);
144
        MockMimeLookup.setInstances(MimePath.parse("text/x-el"), elReformatFactory);
146
        GsfIndentTaskFactory jsFactory = new GsfIndentTaskFactory();
147
        // adding javascript formatter makes some tests randomly fail;
145
        // adding javascript formatter makes some tests randomly fail;
148
        // for now I'm disabling
146
        // for now I'm disabling
149
        //MockMimeLookup.setInstances(MimePath.parse("text/javascript"), jsFactory, new GsfParserFactory());
147
        //MockMimeLookup.setInstances(MimePath.parse("text/javascript"), jsFactory, new GsfParserFactory());
(-)a/web.jsf.editor/manifest.mf (-1 / +1 lines)
 Lines 2-7    Link Here 
2
OpenIDE-Module: org.netbeans.modules.web.jsf.editor
2
OpenIDE-Module: org.netbeans.modules.web.jsf.editor
3
OpenIDE-Module-Layer: org/netbeans/modules/web/jsf/editor/resources/layer.xml
3
OpenIDE-Module-Layer: org/netbeans/modules/web/jsf/editor/resources/layer.xml
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/jsf/editor/resources/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/jsf/editor/resources/Bundle.properties
5
OpenIDE-Module-Specification-Version: 1.5
5
OpenIDE-Module-Specification-Version: 1.6
6
AutoUpdate-Show-In-Client: false
6
AutoUpdate-Show-In-Client: false
7
7
(-)a/web.jsf.editor/nbproject/project.xml (-2 / +2 lines)
 Lines 77-84    Link Here 
77
                    <build-prerequisite/>
77
                    <build-prerequisite/>
78
                    <compile-dependency/>
78
                    <compile-dependency/>
79
                    <run-dependency>
79
                    <run-dependency>
80
                        <release-version>1</release-version>
80
                        <release-version>2</release-version>
81
                        <specification-version>1.11</specification-version>
81
                        <specification-version>1.20</specification-version>
82
                    </run-dependency>
82
                    </run-dependency>
83
                </dependency>
83
                </dependency>
84
                <dependency>
84
                <dependency>
(-)a/web.jsf/nbproject/project.properties (-1 / +1 lines)
 Lines 38-44    Link Here 
38
# made subject to such option by the copyright holder.
38
# made subject to such option by the copyright holder.
39
39
40
javac.source=1.6
40
javac.source=1.6
41
spec.version.base=1.17.0
41
spec.version.base=1.18.0
42
42
43
43
44
test.qa-functional.cp.extra=\
44
test.qa-functional.cp.extra=\
(-)a/web.jsf/nbproject/project.xml (-2 / +2 lines)
 Lines 129-136    Link Here 
129
                    <build-prerequisite/>
129
                    <build-prerequisite/>
130
                    <compile-dependency/>
130
                    <compile-dependency/>
131
                    <run-dependency>
131
                    <run-dependency>
132
                        <release-version>1</release-version>
132
                        <release-version>2</release-version>
133
                        <specification-version>1.11</specification-version>
133
                        <specification-version>1.20</specification-version>
134
                    </run-dependency>
134
                    </run-dependency>
135
                </dependency>
135
                </dependency>
136
                <dependency>
136
                <dependency>
(-)a/xml.text/nbproject/project.properties (-1 / +1 lines)
 Lines 38-44    Link Here 
38
# made subject to such option by the copyright holder.
38
# made subject to such option by the copyright holder.
39
39
40
javac.source=1.6
40
javac.source=1.6
41
spec.version.base=1.22.0
41
spec.version.base=1.23.0
42
42
43
test.unit.cp.extra=${openide.dir}/core/openide.jar:${openide.loaders.dir}/core/openide-loaders.jar
43
test.unit.cp.extra=${openide.dir}/core/openide.jar:${openide.loaders.dir}/core/openide-loaders.jar
44
test.unit.run.cp.extra=${test.unit.cp.extra}
44
test.unit.run.cp.extra=${test.unit.cp.extra}
(-)a/xml.text/nbproject/project.xml (-2 / +2 lines)
 Lines 69-76    Link Here 
69
                    <build-prerequisite/>
69
                    <build-prerequisite/>
70
                    <compile-dependency/>
70
                    <compile-dependency/>
71
                    <run-dependency>
71
                    <run-dependency>
72
                        <release-version>1</release-version>
72
                        <release-version>2</release-version>
73
                        <specification-version>1.8</specification-version>
73
                        <specification-version>1.20</specification-version>
74
                    </run-dependency>
74
                    </run-dependency>
75
                </dependency>
75
                </dependency>
76
                <dependency>
76
                <dependency>
(-)a/xml.text/src/org/netbeans/modules/xml/text/syntax/XMLKit.java (-1 / +1 lines)
 Lines 57-63    Link Here 
57
57
58
// we depend on NetBeans editor stuff
58
// we depend on NetBeans editor stuff
59
import org.netbeans.editor.*;
59
import org.netbeans.editor.*;
60
import org.netbeans.modules.csl.editor.ToggleBlockCommentAction;
60
import org.netbeans.modules.csl.api.ToggleBlockCommentAction;
61
import org.netbeans.modules.editor.*;
61
import org.netbeans.modules.editor.*;
62
62
63
import org.netbeans.modules.xml.text.XmlCommentHandler;
63
import org.netbeans.modules.xml.text.XmlCommentHandler;

Return to bug 169991
By use of this website, you agree to the NetBeans Policies and Terms of Use. © 2014, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo