diff --git a/java.editor/nbproject/project.properties b/java.editor/nbproject/project.properties
--- a/java.editor/nbproject/project.properties
+++ b/java.editor/nbproject/project.properties
@@ -42,7 +42,7 @@
javadoc.title=Java Editor
-spec.version.base=2.47.0
+spec.version.base=2.48.0
test.qa-functional.cp.extra=${editor.dir}/modules/org-netbeans-modules-editor-fold.jar
javac.source=1.6
#test.unit.cp.extra=
diff --git a/java.editor/src/org/netbeans/modules/editor/java/BraceCompletion.java b/java.editor/src/org/netbeans/modules/editor/java/BraceCompletion.java
deleted file mode 100644
--- a/java.editor/src/org/netbeans/modules/editor/java/BraceCompletion.java
+++ /dev/null
@@ -1,993 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun
- * Microsystems, Inc. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.netbeans.modules.editor.java;
-
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Set;
-import java.util.prefs.Preferences;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.Caret;
-import javax.swing.text.Document;
-import javax.swing.text.JTextComponent;
-import org.netbeans.api.editor.mimelookup.MimeLookup;
-import org.netbeans.api.editor.settings.SimpleValueNames;
-import org.netbeans.api.java.lexer.JavaTokenId;
-import org.netbeans.api.lexer.PartType;
-import org.netbeans.api.lexer.Token;
-import org.netbeans.api.lexer.TokenHierarchy;
-import org.netbeans.api.lexer.TokenSequence;
-import org.netbeans.editor.BaseDocument;
-import org.netbeans.editor.Utilities;
-import org.netbeans.lib.editor.util.swing.DocumentUtilities;
-import org.netbeans.modules.editor.indent.api.Indent;
-import org.openide.util.Exceptions;
-
-/**
- * This static class groups the whole aspect of bracket
- * completion. It is defined to clearly separate the functionality
- * and keep actions clean.
- * The methods of the class are called from different actions as
- * KeyTyped, DeletePreviousChar.
- *
- * This class is similar to old BracketCompletion but works solely
- * with the token hierarchy.
- */
-class BraceCompletion {
-
- /**
- * A hook method called after a character was inserted into the
- * document. The function checks for special characters for
- * completion ()[]'"{} and other conditions and optionally performs
- * changes to the doc and or caret (complets braces, moves caret,
- * etc.)
- * @param doc the document where the change occurred
- * @param caretOffset position of the character that was inserted.
- * @param caret caret
- * @param ch the character that was inserted
- * @throws BadLocationException if caretOffset is not correct
- */
- static void charInserted(BaseDocument doc, int caretOffset, Caret caret, char ch) throws BadLocationException {
- if (!completionSettingEnabled()) {
- return;
- }
-
- if (ch == ')' || ch == ']' || ch == '(' || ch == '[' || ch == ';') {
- TokenSequence javaTS = javaTokenSequence(doc, caretOffset, false);
- if (javaTS != null) {
- switch (javaTS.token().id()) {
- case RPAREN:
- case RBRACKET:
- skipClosingBracket(doc, caret, ch, javaTS);
- break;
- case LPAREN:
- case LBRACKET:
- completeOpeningBracket(doc, caretOffset, caret, ch, javaTS);
- break;
- case SEMICOLON:
- moveSemicolon(doc, caretOffset, caret, javaTS);
- }
- }
- }
- }
-
- private static void moveSemicolon(BaseDocument doc, int caretOffset, Caret caret,
- TokenSequence ts) throws BadLocationException {
- int eolOffset = Utilities.getRowEnd(doc, caretOffset);
- int lastParenPos = caretOffset;
- int index = ts.index();
- // Move beyond semicolon
- while (ts.moveNext() && ts.offset() <= eolOffset) {
- Token token = ts.token();
- switch (token.id()) {
- case RPAREN:
- lastParenPos = ts.offset();
- break;
- case WHITESPACE:
- break;
- default:
- return; //
- }
- }
- // Restore ts position
- ts.moveIndex(index);
- ts.moveNext();
- if (isForLoopSemicolon(ts) || posWithinAnyQuote(doc, caretOffset)) {
- return;
- }
- doc.remove(caretOffset, 1);
- doc.insertString(lastParenPos, ";", null); // NOI18N
- caret.setDot(lastParenPos + 1);
- }
-
- private static boolean isForLoopSemicolon(TokenSequence ts) {
- Token token = ts.token();
- if (token == null || token.id() != JavaTokenId.SEMICOLON) {
- return false;
- }
- int parenDepth = 0; // parenthesis depth
- int braceDepth = 0; // brace depth
- boolean semicolonFound = false; // next semicolon
- int tsOrigIndex = ts.index();
- try {
- while (ts.movePrevious()) {
- token = ts.token();
- switch (token.id()) {
- case LPAREN:
- if (parenDepth == 0) { // could be a 'for ('
- while (ts.movePrevious()) {
- token = ts.token();
- switch (token.id()) {
- case WHITESPACE:
- case BLOCK_COMMENT:
- case JAVADOC_COMMENT:
- case LINE_COMMENT:
- break; // skip
- case FOR:
- return true;
- default:
- return false;
- }
- }
- return false;
- } else { // non-zero depth
- parenDepth--;
- }
- break;
-
- case RPAREN:
- parenDepth++;
- break;
-
- case LBRACE:
- if (braceDepth == 0) { // unclosed left brace
- return false;
- }
- braceDepth--;
- break;
-
- case RBRACE:
- braceDepth++;
- break;
-
- case SEMICOLON:
- if (semicolonFound) { // one semicolon already found
- return false;
- }
- semicolonFound = true;
- break;
- }
- }
- } finally {
- // Restore orig TS's location
- ts.moveIndex(tsOrigIndex);
- ts.moveNext();
- }
- return false;
- }
-
- /**
- * Hook called after a character *ch* was backspace-deleted from
- * *doc*. The function possibly removes bracket or quote pair if
- * appropriate.
- * @param doc the document
- * @param caretOffset position of the change
- * @param caret caret
- * @param ch the character that was deleted
- */
- static void charBackspaced(BaseDocument doc, int caretOffset, Caret caret, char ch) throws BadLocationException {
- if (!completionSettingEnabled()) {
- return;
- }
- // Get token (forward bias) behind removed char
- TokenSequence ts = javaTokenSequence(doc, caretOffset, false);
- if (ts == null) {
- return;
- }
- if (ch == '(' || ch == '[') {
- switch (ts.token().id()) {
- case RPAREN:
- if (tokenBalance(doc, JavaTokenId.LPAREN) != 0) {
- doc.remove(caretOffset, 1);
- }
- break;
- case RBRACKET:
- if (tokenBalance(doc, JavaTokenId.LBRACKET) != 0) {
- doc.remove(caretOffset, 1);
- }
- break;
- }
- } else if (ch == '\"') {
- if (ts.token().id() == JavaTokenId.STRING_LITERAL && ts.offset() == caretOffset) {
- doc.remove(caretOffset, 1);
- }
- } else if (ch == '\'') {
- if (ts.token().id() == JavaTokenId.CHAR_LITERAL && ts.offset() == caretOffset) {
- doc.remove(caretOffset, 1);
- }
- }
- }
-
- static int tokenBalance(BaseDocument doc, JavaTokenId leftTokenId) {
- TokenBalance tb = TokenBalance.get(doc);
- if (!tb.isTracked(JavaTokenId.language())) {
- tb.addTokenPair(JavaTokenId.language(), JavaTokenId.LPAREN, JavaTokenId.RPAREN);
- tb.addTokenPair(JavaTokenId.language(), JavaTokenId.LBRACKET, JavaTokenId.RBRACKET);
- tb.addTokenPair(JavaTokenId.language(), JavaTokenId.LBRACE, JavaTokenId.RBRACE);
- }
- int balance = tb.balance(JavaTokenId.language(), leftTokenId);
- assert (balance != Integer.MAX_VALUE);
- return balance;
- }
- /**
- * Resolve whether pairing right curly should be added automatically
- * at the caret position or not.
- *
- * There must be only whitespace or line comment or block comment
- * between the caret position
- * and the left brace and the left brace must be on the same line
- * where the caret is located.
- *
- * The caret must not be "contained" in the opened block comment token.
- *
- * @param doc document in which to operate.
- * @param caretOffset offset of the caret.
- * @return true if a right brace '}' should be added
- * or false if not.
- */
- static boolean isAddRightBrace(BaseDocument doc, int caretOffset)
- throws BadLocationException
- {
- if (!completionSettingEnabled()) {
- return false;
- }
- if (tokenBalance(doc, JavaTokenId.LBRACE) <= 0) {
- return false;
- }
- int caretRowStartOffset = Utilities.getRowStart(doc, caretOffset);
- TokenSequence ts = javaTokenSequence(doc, caretOffset, true);
- if (ts == null) {
- return false;
- }
- boolean first = true;
- do {
- if (ts.offset() < caretRowStartOffset) {
- return false;
- }
- switch (ts.token().id()) {
- case WHITESPACE:
- case LINE_COMMENT:
- break;
- case BLOCK_COMMENT:
- case JAVADOC_COMMENT:
- if (first && caretOffset > ts.offset() && caretOffset < ts.offset() + ts.token().length()) {
- // Caret contained within block comment -> do not add anything
- return false;
- }
- break; // Skip
- case LBRACE:
- return true;
- }
- first = false;
- } while (ts.movePrevious());
- return false;
- }
-
- /**
- * Returns position of the first unpaired closing paren/brace/bracket from the caretOffset
- * till the end of caret row. If there is no such element, position after the last non-white
- * character on the caret row is returned.
- */
- static int getRowOrBlockEnd(BaseDocument doc, int caretOffset, boolean[] insert) throws BadLocationException {
- int rowEnd = Utilities.getRowLastNonWhite(doc, caretOffset);
- if (rowEnd == -1 || caretOffset >= rowEnd) {
- return caretOffset;
- }
- rowEnd += 1;
- int parenBalance = 0;
- int braceBalance = 0;
- int bracketBalance = 0;
- TokenSequence ts = javaTokenSequence(doc, caretOffset, false);
- if (ts == null) {
- return caretOffset;
- }
- while (ts.offset() < rowEnd) {
- switch (ts.token().id()) {
- case SEMICOLON:
- return ts.offset() + 1;
- case LPAREN:
- parenBalance++;
- break;
- case RPAREN:
- if (parenBalance-- == 0) {
- return ts.offset();
- }
- break;
- case LBRACE:
- braceBalance++;
- break;
- case RBRACE:
- if (braceBalance-- == 0) {
- return ts.offset();
- }
- break;
- case LBRACKET:
- bracketBalance++;
- break;
- case RBRACKET:
- if (bracketBalance-- == 0) {
- return ts.offset();
- }
- break;
- }
- if (!ts.moveNext())
- break;
- }
-
- insert[0] = false;
- return rowEnd;
- }
-
- /**
- * Get token sequence positioned over a token.
- *
- * @param doc
- * @param offset
- * @param backwardBias
- * @return token sequence positioned over a token that "contains" the offset
- * or null if the document does not contain any java token sequence
- * or the offset is at doc-or-section-start-and-bwd-bias
- * or doc-or-section-end-and-fwd-bias.
- */
- private static TokenSequence javaTokenSequence(Document doc, int offset, boolean backwardBias) {
- TokenHierarchy hi = TokenHierarchy.get(doc);
- List> tsList = hi.embeddedTokenSequences(offset, backwardBias);
- // Go from inner to outer TSes
- for (int i = tsList.size() - 1; i >= 0; i--) {
- TokenSequence ts = tsList.get(i);
- if (ts.languagePath().innerLanguage() == JavaTokenId.language()) {
- TokenSequence javaInnerTS = (TokenSequence) ts;
- return javaInnerTS;
- }
- }
- return null;
- }
-
- /**
- * Counts the number of braces starting at caretOffset to the end of the
- * document. Every occurence of { increses the count by 1, every
- * occurrence of } decreses the count by 1. The result is returned.
- * @return The number of { - number of } (>0 more { than } ,<0 more } than {)
- */
- private static int braceBalance(BaseDocument doc)
- throws BadLocationException {
- return tokenBalance(doc, JavaTokenId.LBRACE);
- }
-
- /**
- * A hook to be called after closing bracket ) or ] was inserted into
- * the document. The method checks if the bracket should stay there
- * or be removed and some exisitng bracket just skipped.
- *
- * @param doc the document
- * @param caretOffset position of the inserted bracket
- * @param caret caret
- * @param bracket the bracket character ']' or ')'
- */
- private static void skipClosingBracket(BaseDocument doc, Caret caret, char rightBracketChar,
- TokenSequence innerTS) throws BadLocationException
- {
- JavaTokenId bracketId = bracketCharToId(rightBracketChar);
- int caretOffset = caret.getDot();
- if (isSkipClosingBracket(doc, caretOffset, bracketId)) {
- doc.remove(caretOffset - 1, 1);
- caret.setDot(caretOffset); // skip closing bracket
- }
- }
-
- private static Set STOP_TOKENS_FOR_SKIP_CLOSING_BRACKET = EnumSet.of(JavaTokenId.LBRACE, JavaTokenId.RBRACE, JavaTokenId.SEMICOLON);
-
- /**
- * Check whether the typed bracket should stay in the document
- * or be removed.
- *
- * This method is called by skipClosingBracket().
- *
- * @param doc document into which typing was done.
- * @param caretOffset
- */
- static boolean isSkipClosingBracket(BaseDocument doc, int caretOffset, JavaTokenId rightBracketId) throws BadLocationException {
- // First check whether the caret is not after the last char in the document
- // because no bracket would follow then so it could not be skipped.
- if (caretOffset == doc.getLength()) {
- return false; // no skip in this case
- }
- boolean skipClosingBracket = false; // by default do not remove
- // Examine token at the caret offset
- TokenSequence javaTS = javaTokenSequence(doc, caretOffset, false);
- if (javaTS != null && javaTS.token().id() == rightBracketId) {
- JavaTokenId leftBracketId = matching(rightBracketId);
- // Skip all the brackets of the same type that follow the last one
- do {
- if ( STOP_TOKENS_FOR_SKIP_CLOSING_BRACKET.contains(javaTS.token().id())
- || (javaTS.token().id() == JavaTokenId.WHITESPACE && javaTS.token().text().toString().contains("\n"))) {
- while (javaTS.token().id() != rightBracketId && javaTS.movePrevious())
- ;
- break;
- }
- } while (javaTS.moveNext());
- // token var points to the last bracket in a group of two or more right brackets
- // Attempt to find the left matching bracket for it
- // Search would stop on an extra opening left brace if found
- int braceBalance = 0; // balance of '{' and '}'
- int bracketBalance = -1; // balance of the brackets or parenthesis
- int numOfSemi = 0;
- boolean finished = false;
- while (!finished && javaTS.movePrevious()) {
- JavaTokenId id = javaTS.token().id();
- switch (id) {
- case LPAREN:
- case LBRACKET:
- if (id == leftBracketId) {
- bracketBalance++;
- if (bracketBalance == 0) {
- if (braceBalance != 0) {
- // Here the bracket is matched but it is located
- // inside an unclosed brace block
- // e.g. ... ->( } a()|)
- // which is in fact illegal but it's a question
- // of what's best to do in this case.
- // We chose to leave the typed bracket
- // by setting bracketBalance to 1.
- // It can be revised in the future.
- bracketBalance = 1;
- }
- finished = javaTS.offset() < caretOffset;
- }
- }
- break;
-
- case RPAREN:
- case RBRACKET:
- if (id == rightBracketId) {
- bracketBalance--;
- }
- break;
-
- case LBRACE:
- braceBalance++;
- if (braceBalance > 0) { // stop on extra left brace
- finished = true;
- }
- break;
-
- case RBRACE:
- braceBalance--;
- break;
-
- case SEMICOLON:
- numOfSemi++;
- break;
- }
- }
-
- if (bracketBalance == 0 && numOfSemi < 2) {
- finished = false;
- while (!finished && javaTS.movePrevious()) {
- switch (javaTS.token().id()) {
- case WHITESPACE:
- case LINE_COMMENT:
- case BLOCK_COMMENT:
- case JAVADOC_COMMENT:
- break;
- case FOR:
- bracketBalance--;
- default:
- finished = true;
- break;
- }
- }
- }
-
- skipClosingBracket = bracketBalance != 0;
-
- //commented out due to #147683:
-// if (bracketBalance != 0) { // not found matching bracket
-// // Remove the typed bracket as it's unmatched
-// skipClosingBracket = true;
-//
-// } else { // the bracket is matched
-// // Now check whether the bracket would be matched
-// // when the closing bracket would be removed
-// // i.e. starting from the original lastRBracketIndex token
-// // and search for the same bracket to the right in the text
-// // The search would stop on an extra right brace if found
-// braceBalance = 0;
-// bracketBalance = 1; // simulate one extra left bracket
-// finished = false;
-// // Relocate behind original rbracket and one token to right
-// if (lastRBracketIndex + 2 <= javaTS.tokenCount()) {
-// javaTS.moveIndex(lastRBracketIndex + 2);
-// } else { // mark as finished
-// finished = true;
-// }
-// while (!finished && javaTS.movePrevious()) {
-// JavaTokenId id = javaTS.token().id();
-// switch (id) {
-// case LPAREN:
-// case LBRACKET:
-// if (id == leftBracketId) {
-// bracketBalance++;
-// }
-// break;
-//
-// case RPAREN:
-// case RBRACKET:
-// if (id == rightBracketId) {
-// bracketBalance--;
-// if (bracketBalance == 0) {
-// if (braceBalance != 0) {
-// // Here the bracket is matched but it is located
-// // inside an unclosed brace block
-// // which is in fact illegal but it's a question
-// // of what's best to do in this case.
-// // We chose to leave the typed bracket
-// // by setting bracketBalance to -1.
-// // It can be revised in the future.
-// bracketBalance = -1;
-// }
-// finished = true;
-// }
-// }
-// break;
-//
-// case LBRACE:
-// braceBalance++;
-// break;
-//
-// case RBRACE:
-// braceBalance--;
-// if (braceBalance < 0) { // stop on extra right brace
-// finished = true;
-// }
-// break;
-// }
-// }
-// // If bracketBalance == 0 the bracket would be matched
-// // by the bracket that follows the last right bracket.
-// skipClosingBracket = (bracketBalance == 0);
-// }
- }
- return skipClosingBracket;
- }
-
- /**
- * Check for various conditions and possibly add a pairing bracket.
- * to the already inserted.
- * @param doc the document
- * @param caretOffset position of the opening bracket (already in the doc)
- * @param caret caret
- * @param bracket the bracket that was inserted
- */
- private static void completeOpeningBracket(BaseDocument doc, int caretOffset, Caret caret, char bracketChar,
- TokenSequence innerTS) throws BadLocationException
- {
- if (isCompletablePosition(doc, caretOffset + 1)) {
- doc.insertString(caretOffset + 1, String.valueOf(matching(bracketChar)), null);
- caret.setDot(caretOffset + 1);
- }
- }
-
- private static boolean isEscapeSequence(BaseDocument doc, int caretOffset) throws BadLocationException {
- if (caretOffset <= 0) {
- return false;
- }
-
- for (int i = 2; caretOffset - i >= 0; i += 2) {
- char[] previousChars = doc.getChars(caretOffset - i, 2);
- if (previousChars[1] != '\\')
- return false;
- if (previousChars[0] != '\\')
- return true;
- }
-
- char previousChar = doc.getChars(caretOffset - 1, 1)[0];
- return previousChar == '\\';
- }
-
- /**
- * Called to decide whether either single bracket should be inserted
- * or whether bracket pair should be inserted instead.
- * It's called before anything was inserted into the document.
- *
- * @param doc the document
- * @param caretOffset position of the opening bracket (already in the doc)
- * @param caret caret
- * @param bracket the character that was inserted
- * @return true if the method serviced insertions or removals or false
- * if there's nothing special to be done and the parent should handle the insertion regularly.
- */
- static boolean completeQuote(BaseDocument doc, int caretOffset, Caret caret, char bracket)
- throws BadLocationException
- {
- if (!completionSettingEnabled()) {
- return false;
- }
- if (isEscapeSequence(doc, caretOffset)) { // \" or \' typed
- return false;
- }
- // Examine token id at the caret offset
- TokenSequence javaTS = javaTokenSequence(doc, caretOffset, true);
- JavaTokenId id = (javaTS != null) ? javaTS.token().id() : null;
- int lastNonWhite = Utilities.getRowLastNonWhite(doc, caretOffset);
- // eol - true if the caret is at the end of line (ignoring whitespaces)
- boolean eol = lastNonWhite < caretOffset;
-
- // If caret within comment return false
- boolean caretInsideToken = (id != null) &&
- (javaTS.offset() + javaTS.token().length() > caretOffset ||
- javaTS.token().partType() == PartType.START);
- if (caretInsideToken && (id == JavaTokenId.BLOCK_COMMENT ||
- id == JavaTokenId.JAVADOC_COMMENT ||
- id == JavaTokenId.LINE_COMMENT)
- ) {
- return false;
- }
- boolean completablePosition = isQuoteCompletablePosition(doc, caretOffset);
- boolean insideString = caretInsideToken &&
- (id == JavaTokenId.STRING_LITERAL ||
- id == JavaTokenId.CHAR_LITERAL);
- if (insideString) {
- if (eol) {
- return false; // do not complete
- } else {
- //#69524
- char chr = doc.getChars(caretOffset, 1)[0];
- if (chr == bracket) {
- //#83044
- if (caretOffset > 0) {
- javaTS.move(caretOffset - 1);
- if (javaTS.moveNext()) {
- id = javaTS.token().id();
- if (id == JavaTokenId.STRING_LITERAL ||
- id == JavaTokenId.CHAR_LITERAL)
- {
- doc.insertString(caretOffset, String.valueOf(bracket), null); //NOI18N
- doc.remove(caretOffset, 1);
- return true;
- }
- }
- }
- //end of #83044
- }
- //end of #69524
- }
- }
-
- if ((completablePosition && !insideString) || eol) {
- doc.insertString(caretOffset, String.valueOf(bracket) + bracket, null); //NOI18N
- return true;
- }
-
- return false;
- }
-
- /**
- * Checks whether caretOffset is a position at which bracket and quote
- * completion is performed. Brackets and quotes are not completed
- * everywhere but just at suitable places .
- * @param doc the document
- * @param caretOffset position to be tested
- */
- private static boolean isCompletablePosition(BaseDocument doc, int caretOffset)
- throws BadLocationException
- {
- if (caretOffset == doc.getLength()) // there's no other character to test
- {
- return true;
- } else {
- // test that we are in front of ) , " or '
- char chr = doc.getChars(caretOffset, 1)[0];
- return (chr == ')' ||
- chr == ',' ||
- chr == '\"' ||
- chr == '\'' ||
- chr == ' ' ||
- chr == ']' ||
- chr == '}' ||
- chr == '\n' ||
- chr == '\t' ||
- chr == ';');
- }
- }
-
- private static boolean isQuoteCompletablePosition(BaseDocument doc, int caretOffset)
- throws BadLocationException
- {
- if (caretOffset == doc.getLength()) { // there's no other character to test
- return true;
- } else {
- // test that we are in front of ) , " or ' ... etc.
- int eolOffset = Utilities.getRowEnd(doc, caretOffset);
- if (caretOffset == eolOffset || eolOffset == -1) {
- return false;
- }
- int firstNonWhiteFwdOffset = Utilities.getFirstNonWhiteFwd(doc, caretOffset, eolOffset);
- if (firstNonWhiteFwdOffset == -1) {
- return false;
- }
- char chr = doc.getChars(firstNonWhiteFwdOffset, 1)[0];
- return (chr == ')' ||
- chr == ',' ||
- chr == '+' ||
- chr == '}' ||
- chr == ';');
- }
- }
-
- /**
- * Returns true if bracket completion is enabled in options.
- */
- static boolean completionSettingEnabled() {
- Preferences prefs = MimeLookup.getLookup(JavaKit.JAVA_MIME_TYPE).lookup(Preferences.class);
- return prefs.getBoolean(SimpleValueNames.COMPLETION_PAIR_CHARACTERS, false);
- }
-
- /**
- * Returns for an opening bracket or quote the appropriate closing
- * character.
- */
- private static char matching(char bracket) {
- switch (bracket) {
- case '(':
- return ')';
- case '[':
- return ']';
- case '\"':
- return '\"'; // NOI18N
- case '\'':
- return '\'';
- default:
- return ' ';
- }
- }
-
- private static JavaTokenId matching(JavaTokenId id) {
- switch (id) {
- case LPAREN:
- return JavaTokenId.RPAREN;
- case LBRACKET:
- return JavaTokenId.RBRACKET;
- case RPAREN:
- return JavaTokenId.LPAREN;
- case RBRACKET:
- return JavaTokenId.LBRACKET;
- default:
- return null;
- }
- }
-
- private static JavaTokenId bracketCharToId(char bracket) {
- switch (bracket) {
- case '(':
- return JavaTokenId.LPAREN;
- case ')':
- return JavaTokenId.RPAREN;
- case '[':
- return JavaTokenId.LBRACKET;
- case ']':
- return JavaTokenId.RBRACKET;
- case '{':
- return JavaTokenId.LBRACE;
- case '}':
- return JavaTokenId.RBRACE;
- default:
- throw new IllegalArgumentException("Not a bracket char '" + bracket + '\'');
- }
- }
-
- /**
- * posWithinString(doc, pos) iff position *pos* is within a string
- * literal in document doc.
- * @param doc the document
- * @param caretOffset position to be tested (before '\n' gets inserted into doc.
- */
- static boolean posWithinString(Document doc, int caretOffset) {
- return posWithinQuotes(doc, caretOffset, '"', JavaTokenId.STRING_LITERAL);
- }
-
- /**
- * Generalized posWithingString to any token and delimiting
- * character. It works for tokens are delimited by *quote* and
- * extend up to the other *quote* or whitespace in case of an
- * incomplete token.
- * @param doc the document
- * @param caretOffset position of typed quote
- */
- static boolean posWithinQuotes(Document doc, int caretOffset, char quote, JavaTokenId tokenId) {
- TokenSequence javaTS = javaTokenSequence(doc, caretOffset, false);
- if (javaTS != null) {
- if (javaTS.token().id() != tokenId) return false;
- if (caretOffset > javaTS.offset() && caretOffset < javaTS.offset() + javaTS.token().length()) return true;
- else return false;
- }
- return false;
- }
-
- static boolean posWithinAnyQuote(BaseDocument doc, int caretOffset) {
- TokenSequence javaTS = javaTokenSequence(doc, caretOffset - 1, false);
- if (javaTS != null) {
- JavaTokenId id = javaTS.token().id();
- if (id == JavaTokenId.STRING_LITERAL ||
- id == JavaTokenId.CHAR_LITERAL
- ) {
- char ch = DocumentUtilities.getText(doc).charAt(caretOffset - 1);
- return (caretOffset - javaTS.offset() == 1 || (ch != '"' && ch != '\''));
- }
- }
- return false;
- }
-
- static boolean isUnclosedStringAtLineEnd(BaseDocument doc, int caretOffset) {
- int lastNonWhiteOffset;
- try {
- lastNonWhiteOffset = Utilities.getRowLastNonWhite(doc, caretOffset);
- } catch (BadLocationException e) {
- return false;
- }
- TokenSequence javaTS = javaTokenSequence(doc, lastNonWhiteOffset, true);
- if (javaTS != null) {
- return (javaTS.token().id() == JavaTokenId.STRING_LITERAL);
- }
- return false;
- }
-
- static boolean blockCommentCompletion(JTextComponent target, BaseDocument doc, final int dotPosition) {
- return blockCommentCompletionImpl(target, doc, dotPosition, false);
- }
-
- static boolean javadocBlockCompletion(JTextComponent target, BaseDocument doc, final int dotPosition) {
- return blockCommentCompletionImpl(target, doc, dotPosition, true);
- }
-
- private static boolean blockCommentCompletionImpl(JTextComponent target, BaseDocument doc, final int dotPosition, boolean javadoc) {
- try {
- TokenHierarchy tokens = TokenHierarchy.get(doc);
- TokenSequence ts = tokens.tokenSequence();
- if (ts == null) {
- return false;
- }
- ts.move(dotPosition);
- if (!((ts.moveNext() || ts.movePrevious()) && ts.token().id() == (javadoc ? JavaTokenId.JAVADOC_COMMENT : JavaTokenId.BLOCK_COMMENT))) {
- return false;
- }
-
- int jdoffset = dotPosition - (javadoc ? 3 : 2);
- if (jdoffset >= 0) {
- CharSequence content = org.netbeans.lib.editor.util.swing.DocumentUtilities.getText(doc);
- if (isOpenBlockComment(content, dotPosition - 1, javadoc) && !isClosedBlockComment(content, dotPosition) && isAtRowEnd(content, dotPosition)) {
- // note that the formater will add one line of javadoc
- doc.insertString(dotPosition, "*/", null); // NOI18N
- Indent.get(doc).indentNewLine(dotPosition);
- target.setCaretPosition(dotPosition);
-
- return true;
- }
- }
- } catch (BadLocationException ex) {
- // ignore
- Exceptions.printStackTrace(ex);
- }
- return false;
- }
-
- private static boolean isOpenBlockComment(CharSequence content, int pos, boolean javadoc) {
- for (int i = pos; i >= 0; i--) {
- char c = content.charAt(i);
- if (c == '*' && (javadoc ? i - 2 >= 0 && content.charAt(i - 1) == '*' && content.charAt(i - 2) == '/' : i - 1 >= 0 && content.charAt(i - 1) == '/')) {
- // matched /*
- return true;
- } else if (c == '\n') {
- // no javadoc, matched start of line
- return false;
- } else if (c == '/' && i - 1 >= 0 && content.charAt(i - 1) == '*') {
- // matched javadoc enclosing tag
- return false;
- }
- }
-
- return false;
- }
-
- private static boolean isClosedBlockComment(CharSequence txt, int pos) {
- int length = txt.length();
- int quotation = 0;
- for (int i = pos; i < length; i++) {
- char c = txt.charAt(i);
- if (c == '*' && i < length - 1 && txt.charAt(i + 1) == '/') {
- if (quotation == 0 || i < length - 2) {
- return true;
- }
- // guess it is not just part of some text constant
- boolean isClosed = true;
- for (int j = i + 2; j < length; j++) {
- char cc = txt.charAt(j);
- if (cc == '\n') {
- break;
- } else if (cc == '"' && j < length - 1 && txt.charAt(j + 1) != '\'') {
- isClosed = false;
- break;
- }
- }
-
- if (isClosed) {
- return true;
- }
- } else if (c == '/' && i < length - 1 && txt.charAt(i + 1) == '*') {
- // start of another comment block
- return false;
- } else if (c == '\n') {
- quotation = 0;
- } else if (c == '"' && i < length - 1 && txt.charAt(i + 1) != '\'') {
- quotation = ++quotation % 2;
- }
- }
-
- return false;
- }
-
- private static boolean isAtRowEnd(CharSequence txt, int pos) {
- int length = txt.length();
- for (int i = pos; i < length; i++) {
- char c = txt.charAt(i);
- if (c == '\n') {
- return true;
- }
- if (!Character.isWhitespace(c)) {
- return false;
- }
- }
- return true;
- }
-}
diff --git a/java.editor/src/org/netbeans/modules/editor/java/JavaKit.java b/java.editor/src/org/netbeans/modules/editor/java/JavaKit.java
--- a/java.editor/src/org/netbeans/modules/editor/java/JavaKit.java
+++ b/java.editor/src/org/netbeans/modules/editor/java/JavaKit.java
@@ -307,75 +307,6 @@
super.install(c);
ClipboardHandler.install(c);
}
-
- /**
- * @Deprecated This action is no longer used. It is reimplemented as JavaDefaultKeyTypedInterceptor.
- */
- @Deprecated
- public static class JavaDefaultKeyTypedAction extends ExtDefaultKeyTypedAction {
-
- @Override
- protected void insertString(BaseDocument doc, int dotPos,
- Caret caret, String str,
- boolean overwrite) throws BadLocationException {
- char insertedChar = str.charAt(0);
- if (insertedChar == '\"' || insertedChar == '\''){
- boolean inserted = BraceCompletion.completeQuote(doc, dotPos, caret, insertedChar);
- if (inserted){
- caret.setDot(dotPos+1);
- }else{
- super.insertString(doc, dotPos, caret, str, overwrite);
-
- }
- } else {
- super.insertString(doc, dotPos, caret, str, overwrite);
- BraceCompletion.charInserted(doc, dotPos, caret, insertedChar);
- }
- }
-
- protected void replaceSelection(JTextComponent target,
- int dotPos,
- Caret caret,
- String str,
- boolean overwrite)
- throws BadLocationException {
- char insertedChar = str.charAt(0);
- Document doc = target.getDocument();
- if (insertedChar == '\"' || insertedChar == '\''){
- if (doc != null) {
- try {
- boolean inserted = false;
- int p0 = Math.min(caret.getDot(), caret.getMark());
- int p1 = Math.max(caret.getDot(), caret.getMark());
- if (p0 != p1) {
- doc.remove(p0, p1 - p0);
- }
- int caretPosition = caret.getDot();
- if (doc instanceof BaseDocument){
- inserted = BraceCompletion.completeQuote(
- (BaseDocument)doc,
- caretPosition,
- caret, insertedChar);
- }
- if (inserted){
- caret.setDot(caretPosition+1);
- } else {
- if (str != null && str.length() > 0) {
- doc.insertString(p0, str, null);
- }
- }
- } catch (BadLocationException e) {
- e.printStackTrace();
- }
- }
- } else {
- super.replaceSelection(target, dotPos, caret, str, overwrite);
- if (doc instanceof BaseDocument){
- BraceCompletion.charInserted((BaseDocument)doc, caret.getDot()-1, caret, insertedChar);
- }
- }
- }
- }
@EditorActionRegistration(name = generateGoToPopupAction, mimeType = JAVA_MIME_TYPE)
public static class JavaGenerateGoToPopupAction extends NbGenerateGoToPopupAction {
@@ -705,117 +636,7 @@
}
}
}
-
- /**
- * @Deprecated This action is no longer used. It is reimplemented as JavaTypedBreakInterceptor.
- */
- @Deprecated
- public static class JavaInsertBreakAction extends InsertBreakAction {
-
- static final long serialVersionUID = -1506173310438326380L;
- private boolean isJavadocTouched = false;
-
- @Override
- public void actionPerformed(ActionEvent evt, JTextComponent target) {
- try {
- super.actionPerformed(evt, target);
- Document doc = target.getDocument();
- if (isJavadocTouched && !org.netbeans.lib.editor.util.swing.DocumentUtilities.isWriteLocked(doc)) {
- // XXX temporary solution until the editor will provide a SPI to plug. See issue #115739
- // This must run outside the document lock
- Lookup.Result res = MimeLookup.getLookup(MimePath.parse("text/x-javadoc")).lookupResult(TextAction.class);
- ActionEvent newevt = new ActionEvent(target, ActionEvent.ACTION_PERFORMED, "fix-javadoc");
- for (TextAction action : res.allInstances()) {
- action.actionPerformed(newevt);
- }
- }
- } finally {
- isJavadocTouched = false;
- }
- }
-
- @Override
- protected Object beforeBreak(JTextComponent target, BaseDocument doc, Caret caret) {
- int dotPos = caret.getDot();
- if (BraceCompletion.posWithinString(doc, dotPos)) {
- try {
- doc.insertString(dotPos, "\" + \"", null); //NOI18N
- CodeStyle cs = CodeStyle.getDefault(doc);
- if (cs.wrapAfterBinaryOps()) {
- dotPos += 3;
- caret.setDot(dotPos);
- return new Integer(1);
- } else {
- dotPos += 1;
- caret.setDot(dotPos);
- return new Integer(3);
- }
- } catch (BadLocationException ex) {
- }
- } else {
- try {
- if (BraceCompletion.isAddRightBrace(doc, dotPos)) {
- boolean insert[] = {true};
- int end = BraceCompletion.getRowOrBlockEnd(doc, dotPos, insert);
- if (insert[0]) {
- doc.insertString(end, "}", null); // NOI18N
- Indent.get(doc).indentNewLine(end);
- }
- caret.setDot(dotPos);
- return Boolean.TRUE;
- }
- } catch (BadLocationException ex) {
- }
- }
- BraceCompletion.blockCommentCompletion(target, doc, dotPos);
- isJavadocTouched = BraceCompletion.javadocBlockCompletion(target, doc, dotPos);
- return null;
- }
-
- @Override
- protected void afterBreak(JTextComponent target, BaseDocument doc, Caret caret, Object cookie) {
- if (cookie != null) {
- if (cookie instanceof Integer) {
- // integer
- int nowDotPos = caret.getDot();
- caret.setDot(nowDotPos+((Integer)cookie).intValue());
- }
- }
- }
- }
-
- /**
- * @Deprecated This action is no longer used. It is reimplemented as JavaDeleteCharInterceptor.
- */
- @Deprecated
- public static class JavaDeleteCharAction extends ExtDeleteCharAction {
-
- public JavaDeleteCharAction(String nm, boolean nextChar) {
- super(nm, nextChar);
- }
-
- @Override
- protected void charBackspaced(BaseDocument doc, int dotPos, Caret caret, char ch)
- throws BadLocationException {
- BraceCompletion.charBackspaced(doc, dotPos, caret, ch);
- }
-
- @Override
- public void actionPerformed(ActionEvent evt, JTextComponent target) {
- target.putClientProperty(JavaDeleteCharAction.class, this);
-
- try {
- super.actionPerformed(evt, target);
- } finally {
- target.putClientProperty(JavaDeleteCharAction.class, null);
- }
- }
-
- public boolean getNextChar() {
- return nextChar;
- }
- }
-
+
@EditorActionRegistration(
name = expandAllJavadocFolds,
mimeType = JAVA_MIME_TYPE,
diff --git a/web.core.syntax/nbproject/project.properties b/web.core.syntax/nbproject/project.properties
--- a/web.core.syntax/nbproject/project.properties
+++ b/web.core.syntax/nbproject/project.properties
@@ -49,7 +49,7 @@
javac.source=1.6
javadoc.arch=${basedir}/arch.xml
-spec.version.base=2.33.0
+spec.version.base=2.34.0
test.config.validation.includes=\
**/AutoCompletionTest.class,**/CompletionTest.class
diff --git a/web.core.syntax/src/org/netbeans/modules/web/core/syntax/JspKit.java b/web.core.syntax/src/org/netbeans/modules/web/core/syntax/JspKit.java
--- a/web.core.syntax/src/org/netbeans/modules/web/core/syntax/JspKit.java
+++ b/web.core.syntax/src/org/netbeans/modules/web/core/syntax/JspKit.java
@@ -47,18 +47,15 @@
import java.util.Map;
import org.netbeans.editor.ext.ExtKit;
-import org.netbeans.modules.csl.api.KeystrokeHandler;
import org.netbeans.modules.editor.NbEditorDocument;
import org.netbeans.modules.editor.NbEditorKit;
import org.netbeans.modules.web.core.syntax.deprecated.Jsp11Syntax;
import java.awt.event.ActionEvent;
import java.beans.*;
import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
import javax.swing.Action;
import javax.swing.SwingUtilities;
import javax.swing.text.*;
-import org.netbeans.api.java.lexer.JavaTokenId;
import org.netbeans.api.lexer.TokenHierarchy;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.editor.BaseDocument;
@@ -71,16 +68,10 @@
import org.openide.filesystems.FileObject;
import org.openide.loaders.DataObject;
import org.netbeans.modules.web.core.syntax.deprecated.HtmlSyntax;
-import org.netbeans.modules.editor.java.JavaKit;
import org.netbeans.modules.web.core.api.JspColoringData;
import org.netbeans.api.jsp.lexer.JspTokenId;
import org.netbeans.api.lexer.InputAttributes;
-import org.netbeans.editor.BaseAction;
-import org.netbeans.editor.BaseKit.InsertBreakAction;
-import org.netbeans.editor.ext.ExtKit.ExtDefaultKeyTypedAction;
-import org.netbeans.editor.ext.ExtKit.ExtDeleteCharAction;
import org.netbeans.modules.csl.api.*;
-import org.netbeans.modules.web.core.syntax.gsf.JspCommentHandler;
import org.netbeans.spi.lexer.MutableTextInput;
/**
@@ -177,10 +168,6 @@
@Override
protected Action[] createActions() {
Action[] javaActions = new Action[] {
- new JspInsertBreakAction(),
- new JspDefaultKeyTypedAction(),
- new JspDeleteCharAction(deletePrevCharAction, false),
- new JspDeleteCharAction(deleteNextCharAction, true),
new SelectCodeElementAction(SelectCodeElementAction.selectNextElementAction, true),
new SelectCodeElementAction(SelectCodeElementAction.selectPreviousElementAction, false),
new InstantRenameAction(),
@@ -423,285 +410,5 @@
return new org.openide.util.HelpCtx(JspKit.class);
}
- /**
- * Returns true if bracket completion is enabled in options.
- */
- private static boolean completionSettingEnabled() {
- //return ((Boolean)Settings.getValue(JspKit.class, JavaSettingsNames.PAIR_CHARACTERS_COMPLETION)).booleanValue();
- return true;
- }
-
- public static class JspInsertBreakAction extends InsertBreakAction {
-
- @Override
- public void actionPerformed(ActionEvent e, JTextComponent target) {
- if (target != null) {
- TokenSequence javaTokenSequence;
- AbstractDocument adoc = (AbstractDocument)target.getDocument();
- adoc.readLock();
- try {
- javaTokenSequence = JspSyntaxSupport.tokenSequence(TokenHierarchy.get(target.getDocument()), JavaTokenId.language(), target.getCaret().getDot() - 1);
- } finally {
- adoc.readUnlock();
- }
-
- if (javaTokenSequence != null) {
- JavaKit jkit = (JavaKit) getKit(JavaKit.class);
- if (jkit != null) {
- Action action = jkit.getActionByName(DefaultEditorKit.insertBreakAction);
- if (action != null && action instanceof JavaKit.JavaInsertBreakAction) {
- ((JavaKit.JavaInsertBreakAction) action).actionPerformed(e, target);
- return;
- }
- }
- }
- }
- super.actionPerformed(e, target);
- }
-
- @Override
- protected Object beforeBreak(JTextComponent target, BaseDocument doc, Caret caret) {
- if (completionSettingEnabled()) {
- KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, caret.getDot());
-
- if (bracketCompletion != null) {
- try {
- int newOffset = bracketCompletion.beforeBreak(doc, caret.getDot(), target);
-
- if (newOffset >= 0) {
- return new Integer(newOffset);
- }
- } catch (BadLocationException ble) {
- Exceptions.printStackTrace(ble);
- }
- }
- }
-
- return null;
- }
-
- @Override
- protected void afterBreak(JTextComponent target, BaseDocument doc, Caret caret,
- Object cookie) {
- if (completionSettingEnabled()) {
- if (cookie != null) {
- if (cookie instanceof Integer) {
- // integer
- int dotPos = ((Integer) cookie).intValue();
- if (dotPos != -1) {
- caret.setDot(dotPos);
- } else {
- int nowDotPos = caret.getDot();
- caret.setDot(nowDotPos + 1);
- }
- }
- }
- }
- }
-
- }
-
- public static class JspDefaultKeyTypedAction extends ExtDefaultKeyTypedAction {
-
- private JTextComponent currentTarget;
-
- @Override
- public void actionPerformed(final ActionEvent e, final JTextComponent target) {
- // Preliminary checks that avoid interpreting e.g. Ctrl+W that would then invoke runAtomic()
- if ((target != null) && (e != null)) {
- // Check whether the modifiers are OK
- int mod = e.getModifiers();
- boolean ctrl = ((mod & ActionEvent.CTRL_MASK) != 0);
- // On the mac, norwegian and french keyboards use Alt to do bracket characters.
- // This replicates Apple's modification DefaultEditorKit.DefaultKeyTypedAction
- boolean alt = org.openide.util.Utilities.isMac() ? ((mod & ActionEvent.META_MASK) != 0) :
- ((mod & ActionEvent.ALT_MASK) != 0);
- if (alt || ctrl) {
- return;
- }
- // Check whether the target is enabled and editable
- if (!target.isEditable() || !target.isEnabled()) {
- target.getToolkit().beep();
- return;
- }
- }
-
- currentTarget = target;
- try {
- if (!triggerJavaDefaultKeyTypedAction(e, target)) {
- super.actionPerformed(e, target);
- } else {
- return; //java triggered this already
- }
- } finally {
- currentTarget = null;
- }
- }
-
- private boolean triggerJavaDefaultKeyTypedAction(final ActionEvent e, final JTextComponent target) {
- BaseDocument bdoc = (BaseDocument) target.getDocument();
- final boolean[] retcode = new boolean[1];
- bdoc.runAtomic(new Runnable() {
- public void run() {
- TokenSequence javaTokenSequence = JspSyntaxSupport.tokenSequence(TokenHierarchy.get(target.getDocument()), JavaTokenId.language(), target.getCaret().getDot() - 1);
- if (javaTokenSequence != null) {
- JavaKit jkit = (JavaKit) getKit(JavaKit.class);
- if (jkit != null) {
- Action action = jkit.getActionByName(DefaultEditorKit.defaultKeyTypedAction);
- if (action != null && action instanceof JavaKit.JavaDefaultKeyTypedAction) {
- ((JavaKit.JavaDefaultKeyTypedAction) action).actionPerformed(e, target);
- retcode[0] = true;
- }
- }
- }
- }
- });
- return retcode[0];
- }
-
- /** called under document atomic lock */
- @Override
- protected void insertString(BaseDocument doc, int dotPos,
- Caret caret, String str,
- boolean overwrite) throws BadLocationException {
- // see issue #211036 - inserted string can be empty since #204450
- if (str.isEmpty()) {
- return;
- }
-
- if (completionSettingEnabled()) {
- KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, dotPos);
-
- if (bracketCompletion != null) {
- // TODO - check if we're in a comment etc. and if so, do nothing
- boolean handled =
- bracketCompletion.beforeCharInserted(doc, dotPos, currentTarget,
- str.charAt(0));
-
- if (!handled) {
- super.insertString(doc, dotPos, caret, str, overwrite);
- handled = bracketCompletion.afterCharInserted(doc, dotPos, currentTarget,
- str.charAt(0));
- }
-
- return;
- }
- }
-
- super.insertString(doc, dotPos, caret, str, overwrite);
- }
-
- @Override
- protected void replaceSelection(JTextComponent target, int dotPos, Caret caret,
- String str, boolean overwrite) throws BadLocationException {
- //workaround for #209019 - regression of issue
- //#204450 - Rewrite actions to use TypingHooks SPI
- if(str.length() == 0) {
- //called from BaseKit.actionPerformed():1160 with empty str argument
- //==> ignore this call since we are going to be called a bit later
- //from HtmlKit.performTextInsertion() properly with the text typed
- return ;
- }
- char insertedChar = str.charAt(0);
- Document document = target.getDocument();
-
- if (document instanceof BaseDocument) {
- BaseDocument doc = (BaseDocument) document;
-
- if (completionSettingEnabled()) {
- KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, dotPos);
-
- if (bracketCompletion != null) {
- try {
- int caretPosition = caret.getDot();
-
- boolean handled =
- bracketCompletion.beforeCharInserted(doc, caretPosition,
- target, insertedChar);
-
- int p0 = Math.min(caret.getDot(), caret.getMark());
- int p1 = Math.max(caret.getDot(), caret.getMark());
-
- if (p0 != p1) {
- doc.remove(p0, p1 - p0);
- }
-
- if (!handled) {
- if (str.length() > 0) {
- doc.insertString(p0, str, null);
- handled = bracketCompletion.afterCharInserted(doc, dotPos, currentTarget, str.charAt(0));
- }
-
-
- }
- } catch (BadLocationException e) {
- e.printStackTrace();
- }
-
- return;
- }
- }
- }
-
- super.replaceSelection(target, dotPos, caret, str, overwrite);
- }
-
- }
-
- public static class JspDeleteCharAction extends ExtDeleteCharAction {
-
- JTextComponent currentTarget;
-
- public JspDeleteCharAction(String nm, boolean nextChar) {
- super(nm, nextChar);
- }
-
- @Override
- public void actionPerformed(ActionEvent e, JTextComponent target) {
- currentTarget = target;
- if (target!=null){
- TokenSequence javaTokenSequence;
- AbstractDocument adoc = (AbstractDocument)target.getDocument();
- adoc.readLock();
- try {
- javaTokenSequence = JspSyntaxSupport.tokenSequence(
- TokenHierarchy.get(target.getDocument()),
- JavaTokenId.language(),
- target.getCaret().getDot() - 1);
- } finally {
- adoc.readUnlock();
- }
-
- if (javaTokenSequence != null){
- JavaKit jkit = (JavaKit)getKit(JavaKit.class);
- if (jkit!=null){
- Action action = jkit.getActionByName(nextChar ? DefaultEditorKit.deleteNextCharAction : DefaultEditorKit.deletePrevCharAction);
- if (action != null && action instanceof JavaKit.JavaDeleteCharAction){
- ((JavaKit.JavaDeleteCharAction)action).actionPerformed(e, target);
- return;
- }
- }
- }
- }
- super.actionPerformed(e, target);
- currentTarget = null;
- }
-
- @Override
- protected void charBackspaced(BaseDocument doc, int dotPos, Caret caret, char ch) throws BadLocationException {
- if (completionSettingEnabled()) {
- KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, dotPos);
-
- if (bracketCompletion != null) {
- bracketCompletion.charBackspaced(doc, dotPos, currentTarget, ch);
- return;
- }
- }
-
- super.charBackspaced(doc, dotPos, caret, ch);
- }
-
- }
-
}