MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

commenter/mysql Lexer fix

Browse Source
This commit is contained in:
Gregory Shrago
2009-12-22 21:56:36 +03:00
parent 9eaeaeda11
commit 6d4bf49187
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByLineCommentHandler.java
+7 -3
View File
@@ -261,7 +261,8 @@ public class CommentByLineCommentHandler implements CodeInsightActionHandler {
lineStart = CharArrayUtil.shiftForward(chars, lineStart, " \t");
boolean commented;
if (prefix != null) {
commented = CharArrayUtil.regionMatches(chars, lineStart, prefix);
commented = CharArrayUtil.regionMatches(chars, lineStart, prefix) ||
prefix.endsWith(" ") && CharArrayUtil.regionMatches(chars, lineStart, prefix.trim()+"\n");
if (commented) {
myStartOffsets[line - myStartLine] = lineStart;
myEndOffsets[line - myStartLine] = -1;
@@ -404,9 +405,12 @@ public class CommentByLineCommentHandler implements CodeInsightActionHandler {
String prefix = commenter.getLineCommentPrefix();
if (prefix != null) {
CharSequence chars = myDocument.getCharsSequence();
assert CharArrayUtil.regionMatches(chars, startOffset, prefix);
boolean skipNewLine = false;
boolean commented = CharArrayUtil.regionMatches(chars, startOffset, prefix) ||
(skipNewLine = (prefix.endsWith(" ") && CharArrayUtil.regionMatches(chars, startOffset, prefix.trim() + "\n")));
assert commented;
int position = 0;//text.indexOf(prefix);
myDocument.deleteString(position + startOffset , position + startOffset + prefix.length());
myDocument.deleteString(position + startOffset , position + startOffset + (skipNewLine? prefix.trim().length():prefix.length()));
return;
}
String text = myDocument.getCharsSequence().subSequence(startOffset, endOffset).toString();