Skip to content

Commit

Permalink
Add option "Insert space after comment marker on toggle line comment."
Browse files Browse the repository at this point in the history 
on Auto Completion Settings dialog, issue #711, #718.
  • Loading branch information
@zufuliu
zufuliu committed Sep 23, 2023
1 parent 3b2080a commit baf1cc1
Show file tree
Hide file tree
Showing 14 changed files with 94 additions and 71 deletions.
15 changes: 8 additions & 7 deletions locale/de/Notepad2.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1629,13 +1629,14 @@ BEGIN
AUTOCHECKBOX "Auto indent text.",IDC_AUTO_INDENT_TEXT,231,7,200,10,WS_TABSTOP
AUTOCHECKBOX "Auto close HTML and XML tags.",IDC_AUTO_CLOSE_TAGS,231,19,200,10,WS_TABSTOP
AUTOCHECKBOX "Auto insert space after typing comma (,) when appropriate.",IDC_AUTO_INSERT_SPACE_COMMA,231,31,218,10,WS_TABSTOP
GROUPBOX "Auto complete braces and quotes",IDC_STATIC,231,44,218,61
AUTOCHECKBOX "( )",IDC_AUTO_INSERT_PARENTHESIS,238,56,40,10,WS_TABSTOP
AUTOCHECKBOX "{ }",IDC_AUTO_INSERT_BRACE,290,56,40,10,WS_TABSTOP
AUTOCHECKBOX "[ ]",IDC_AUTO_INSERT_SQUARE_BRACKET,342,56,40,10,WS_TABSTOP
AUTOCHECKBOX "< >",IDC_AUTO_INSERT_ANGLE_BRACKET,394,56,40,10,WS_TABSTOP
AUTOCHECKBOX "Double quotes ("""").",IDC_AUTO_INSERT_DOUBLE_QUOTE,238,68,100,10,WS_TABSTOP
AUTOCHECKBOX "Single quotes ('').",IDC_AUTO_INSERT_SINGLE_QUOTE,238,80,100,10,WS_TABSTOP
AUTOCHECKBOX "Insert space after comment marker on toggle line comment.",IDC_AUTO_INSERT_SPACE_COMMENT,231,43,218,10,WS_TABSTOP
GROUPBOX "Auto complete braces and quotes",IDC_STATIC,231,56,218,49
AUTOCHECKBOX "( )",IDC_AUTO_INSERT_PARENTHESIS,238,68,40,10,WS_TABSTOP
AUTOCHECKBOX "{ }",IDC_AUTO_INSERT_BRACE,290,68,40,10,WS_TABSTOP
AUTOCHECKBOX "[ ]",IDC_AUTO_INSERT_SQUARE_BRACKET,342,68,40,10,WS_TABSTOP
AUTOCHECKBOX "< >",IDC_AUTO_INSERT_ANGLE_BRACKET,394,68,40,10,WS_TABSTOP
AUTOCHECKBOX "Double quotes ("""").",IDC_AUTO_INSERT_DOUBLE_QUOTE,238,80,100,10,WS_TABSTOP
AUTOCHECKBOX "Single quotes ('').",IDC_AUTO_INSERT_SINGLE_QUOTE,342,80,100,10,WS_TABSTOP
AUTOCHECKBOX "Backticks (``).",IDC_AUTO_INSERT_BACKTICK,238,92,100,10,WS_TABSTOP

GROUPBOX "Auto completion scanning word inside:",IDC_STATIC,231,111,218,26
Expand Down
15 changes: 8 additions & 7 deletions locale/fr-FR/Notepad2.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1629,13 +1629,14 @@ BEGIN
AUTOCHECKBOX "Indentation automatique du texte.",IDC_AUTO_INDENT_TEXT,231,7,200,10,WS_TABSTOP
AUTOCHECKBOX "Fermeture automatique des balises HTML et XML.",IDC_AUTO_CLOSE_TAGS,231,19,200,10,WS_TABSTOP
AUTOCHECKBOX "Instertion automatique d'espace après avoir tapé une virgule (,) si approprié.",IDC_AUTO_INSERT_SPACE_COMMA,231,31,218,10,WS_TABSTOP
GROUPBOX "Ajout automatique des parenthèses et guillemets fermants",IDC_STATIC,231,44,218,61
AUTOCHECKBOX "( )",IDC_AUTO_INSERT_PARENTHESIS,238,56,40,10,WS_TABSTOP
AUTOCHECKBOX "{ }",IDC_AUTO_INSERT_BRACE,290,56,40,10,WS_TABSTOP
AUTOCHECKBOX "[ ]",IDC_AUTO_INSERT_SQUARE_BRACKET,342,56,40,10,WS_TABSTOP
AUTOCHECKBOX "< >",IDC_AUTO_INSERT_ANGLE_BRACKET,394,56,40,10,WS_TABSTOP
AUTOCHECKBOX "Double guillemets ("""").",IDC_AUTO_INSERT_DOUBLE_QUOTE,238,68,100,10,WS_TABSTOP
AUTOCHECKBOX "Simple guillemets ('').",IDC_AUTO_INSERT_SINGLE_QUOTE,238,80,100,10,WS_TABSTOP
AUTOCHECKBOX "Insert space after comment marker on toggle line comment.",IDC_AUTO_INSERT_SPACE_COMMENT,231,43,218,10,WS_TABSTOP
GROUPBOX "Ajout automatique des parenthèses et guillemets fermants",IDC_STATIC,231,56,218,49
AUTOCHECKBOX "( )",IDC_AUTO_INSERT_PARENTHESIS,238,68,40,10,WS_TABSTOP
AUTOCHECKBOX "{ }",IDC_AUTO_INSERT_BRACE,290,68,40,10,WS_TABSTOP
AUTOCHECKBOX "[ ]",IDC_AUTO_INSERT_SQUARE_BRACKET,342,68,40,10,WS_TABSTOP
AUTOCHECKBOX "< >",IDC_AUTO_INSERT_ANGLE_BRACKET,394,68,40,10,WS_TABSTOP
AUTOCHECKBOX "Double guillemets ("""").",IDC_AUTO_INSERT_DOUBLE_QUOTE,238,80,100,10,WS_TABSTOP
AUTOCHECKBOX "Simple guillemets ('').",IDC_AUTO_INSERT_SINGLE_QUOTE,342,80,100,10,WS_TABSTOP
AUTOCHECKBOX "Backticks (``).",IDC_AUTO_INSERT_BACKTICK,238,92,100,10,WS_TABSTOP

GROUPBOX "Auto completion scanning word inside:",IDC_STATIC,231,111,218,26
Expand Down
15 changes: 8 additions & 7 deletions locale/it/Notepad2.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1629,13 +1629,14 @@ BEGIN
AUTOCHECKBOX "Indenta automaticamente testo.",IDC_AUTO_INDENT_TEXT,231,7,200,10,WS_TABSTOP
AUTOCHECKBOX "Chiudi automaticamente i tag HTML and XML.",IDC_AUTO_CLOSE_TAGS,231,19,200,10,WS_TABSTOP
AUTOCHECKBOX "Inserisci automaticamente 1 spazio dopo la virgola (,) se opportuno.",IDC_AUTO_INSERT_SPACE_COMMA,231,31,222,10,WS_TABSTOP
GROUPBOX "Chiudi automaticamente parentesi graffe e virgolette",IDC_STATIC,231,44,218,61
AUTOCHECKBOX "( )",IDC_AUTO_INSERT_PARENTHESIS,238,56,40,10,WS_TABSTOP
AUTOCHECKBOX "{ }",IDC_AUTO_INSERT_BRACE,290,56,40,10,WS_TABSTOP
AUTOCHECKBOX "[ ]",IDC_AUTO_INSERT_SQUARE_BRACKET,342,56,40,10,WS_TABSTOP
AUTOCHECKBOX "< >",IDC_AUTO_INSERT_ANGLE_BRACKET,394,56,40,10,WS_TABSTOP
AUTOCHECKBOX "Virgolette ("""").",IDC_AUTO_INSERT_DOUBLE_QUOTE,238,68,100,10,WS_TABSTOP
AUTOCHECKBOX "Apostrofi ('').",IDC_AUTO_INSERT_SINGLE_QUOTE,238,80,100,10,WS_TABSTOP
AUTOCHECKBOX "Insert space after comment marker on toggle line comment.",IDC_AUTO_INSERT_SPACE_COMMENT,231,43,218,10,WS_TABSTOP
GROUPBOX "Chiudi automaticamente parentesi graffe e virgolette",IDC_STATIC,231,56,218,49
AUTOCHECKBOX "( )",IDC_AUTO_INSERT_PARENTHESIS,238,68,40,10,WS_TABSTOP
AUTOCHECKBOX "{ }",IDC_AUTO_INSERT_BRACE,290,68,40,10,WS_TABSTOP
AUTOCHECKBOX "[ ]",IDC_AUTO_INSERT_SQUARE_BRACKET,342,68,40,10,WS_TABSTOP
AUTOCHECKBOX "< >",IDC_AUTO_INSERT_ANGLE_BRACKET,394,68,40,10,WS_TABSTOP
AUTOCHECKBOX "Virgolette ("""").",IDC_AUTO_INSERT_DOUBLE_QUOTE,238,80,100,10,WS_TABSTOP
AUTOCHECKBOX "Apostrofi ('').",IDC_AUTO_INSERT_SINGLE_QUOTE,342,80,100,10,WS_TABSTOP
AUTOCHECKBOX "Backticks (``).",IDC_AUTO_INSERT_BACKTICK,238,92,100,10,WS_TABSTOP

GROUPBOX "Scansiona parole per l'autocompletamento in:",IDC_STATIC,231,111,218,26
Expand Down
15 changes: 8 additions & 7 deletions locale/ja/Notepad2.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1629,13 +1629,14 @@ BEGIN
AUTOCHECKBOX "自動インデント(&I)",IDC_AUTO_INDENT_TEXT,231,7,200,10,WS_TABSTOP
AUTOCHECKBOX "自動閉じHTML/XMLタグ(&T)",IDC_AUTO_CLOSE_TAGS,231,19,200,10,WS_TABSTOP
AUTOCHECKBOX "空白の自動挿入 : カンマ(,)の後に適切なら",IDC_AUTO_INSERT_SPACE_COMMA,231,31,218,10,WS_TABSTOP
GROUPBOX "カッコと引用符の自動補完",IDC_STATIC,231,44,218,61
AUTOCHECKBOX "( )",IDC_AUTO_INSERT_PARENTHESIS,238,56,40,10,WS_TABSTOP
AUTOCHECKBOX "{ }",IDC_AUTO_INSERT_BRACE,290,56,40,10,WS_TABSTOP
AUTOCHECKBOX "[ ]",IDC_AUTO_INSERT_SQUARE_BRACKET,342,56,40,10,WS_TABSTOP
AUTOCHECKBOX "< >",IDC_AUTO_INSERT_ANGLE_BRACKET,394,56,40,10,WS_TABSTOP
AUTOCHECKBOX "ダブルクォート """"",IDC_AUTO_INSERT_DOUBLE_QUOTE,238,68,100,10,WS_TABSTOP
AUTOCHECKBOX "シングルクォート ''",IDC_AUTO_INSERT_SINGLE_QUOTE,238,80,100,10,WS_TABSTOP
AUTOCHECKBOX "Insert space after comment marker on toggle line comment.",IDC_AUTO_INSERT_SPACE_COMMENT,231,43,218,10,WS_TABSTOP
GROUPBOX "カッコと引用符の自動補完",IDC_STATIC,231,56,218,49
AUTOCHECKBOX "( )",IDC_AUTO_INSERT_PARENTHESIS,238,68,40,10,WS_TABSTOP
AUTOCHECKBOX "{ }",IDC_AUTO_INSERT_BRACE,290,68,40,10,WS_TABSTOP
AUTOCHECKBOX "[ ]",IDC_AUTO_INSERT_SQUARE_BRACKET,342,68,40,10,WS_TABSTOP
AUTOCHECKBOX "< >",IDC_AUTO_INSERT_ANGLE_BRACKET,394,68,40,10,WS_TABSTOP
AUTOCHECKBOX "ダブルクォート """".",IDC_AUTO_INSERT_DOUBLE_QUOTE,238,80,100,10,WS_TABSTOP
AUTOCHECKBOX "シングルクォート ''.",IDC_AUTO_INSERT_SINGLE_QUOTE,342,80,100,10,WS_TABSTOP
AUTOCHECKBOX "バッククォート ``",IDC_AUTO_INSERT_BACKTICK,238,92,100,10,WS_TABSTOP

GROUPBOX "以下の中の単語を補完候補として拾う:",IDC_STATIC,231,111,218,26
Expand Down
15 changes: 8 additions & 7 deletions locale/ko/Notepad2.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1629,13 +1629,14 @@ BEGIN
AUTOCHECKBOX "텍스트 자동 들여쓰기",IDC_AUTO_INDENT_TEXT,231,7,200,10,WS_TABSTOP
AUTOCHECKBOX "HTML 및 XML 태그 자동 닫기",IDC_AUTO_CLOSE_TAGS,231,19,200,10,WS_TABSTOP
AUTOCHECKBOX "해당하는 경우 쉼표(,)를 입력한 후 공백을 자동으로 삽입",IDC_AUTO_INSERT_SPACE_COMMA,231,31,218,10,WS_TABSTOP
GROUPBOX "괄호 및 따옴표 자동 완성",IDC_STATIC,231,44,218,61
AUTOCHECKBOX "( )",IDC_AUTO_INSERT_PARENTHESIS,238,56,40,10,WS_TABSTOP
AUTOCHECKBOX "{ }",IDC_AUTO_INSERT_BRACE,290,56,40,10,WS_TABSTOP
AUTOCHECKBOX "[ ]",IDC_AUTO_INSERT_SQUARE_BRACKET,342,56,40,10,WS_TABSTOP
AUTOCHECKBOX "< >",IDC_AUTO_INSERT_ANGLE_BRACKET,394,56,40,10,WS_TABSTOP
AUTOCHECKBOX "큰따옴표 ("""")",IDC_AUTO_INSERT_DOUBLE_QUOTE,238,68,100,10,WS_TABSTOP
AUTOCHECKBOX "작은따옴표 ('')",IDC_AUTO_INSERT_SINGLE_QUOTE,238,80,100,10,WS_TABSTOP
AUTOCHECKBOX "Insert space after comment marker on toggle line comment.",IDC_AUTO_INSERT_SPACE_COMMENT,231,43,218,10,WS_TABSTOP
GROUPBOX "괄호 및 따옴표 자동 완성",IDC_STATIC,231,56,218,49
AUTOCHECKBOX "( )",IDC_AUTO_INSERT_PARENTHESIS,238,68,40,10,WS_TABSTOP
AUTOCHECKBOX "{ }",IDC_AUTO_INSERT_BRACE,290,68,40,10,WS_TABSTOP
AUTOCHECKBOX "[ ]",IDC_AUTO_INSERT_SQUARE_BRACKET,342,68,40,10,WS_TABSTOP
AUTOCHECKBOX "< >",IDC_AUTO_INSERT_ANGLE_BRACKET,394,68,40,10,WS_TABSTOP
AUTOCHECKBOX "큰따옴표 ("""").",IDC_AUTO_INSERT_DOUBLE_QUOTE,238,80,100,10,WS_TABSTOP
AUTOCHECKBOX "작은따옴표 ('').",IDC_AUTO_INSERT_SINGLE_QUOTE,342,80,100,10,WS_TABSTOP
AUTOCHECKBOX "역따옴표 (``)",IDC_AUTO_INSERT_BACKTICK,238,92,100,10,WS_TABSTOP

GROUPBOX "내부에서 단어를 검색하여 자동 완성:",IDC_STATIC,231,111,218,26
Expand Down
15 changes: 8 additions & 7 deletions locale/pt-BR/Notepad2.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1629,13 +1629,14 @@ BEGIN
AUTOCHECKBOX "Auto indent text.",IDC_AUTO_INDENT_TEXT,231,7,200,10,WS_TABSTOP
AUTOCHECKBOX "Auto close HTML and XML tags.",IDC_AUTO_CLOSE_TAGS,231,19,200,10,WS_TABSTOP
AUTOCHECKBOX "Auto insert space after typing comma (,) when appropriate.",IDC_AUTO_INSERT_SPACE_COMMA,231,31,218,10,WS_TABSTOP
GROUPBOX "Auto complete braces and quotes",IDC_STATIC,231,44,218,61
AUTOCHECKBOX "( )",IDC_AUTO_INSERT_PARENTHESIS,238,56,40,10,WS_TABSTOP
AUTOCHECKBOX "{ }",IDC_AUTO_INSERT_BRACE,290,56,40,10,WS_TABSTOP
AUTOCHECKBOX "[ ]",IDC_AUTO_INSERT_SQUARE_BRACKET,342,56,40,10,WS_TABSTOP
AUTOCHECKBOX "< >",IDC_AUTO_INSERT_ANGLE_BRACKET,394,56,40,10,WS_TABSTOP
AUTOCHECKBOX "Double quotes ("""").",IDC_AUTO_INSERT_DOUBLE_QUOTE,238,68,100,10,WS_TABSTOP
AUTOCHECKBOX "Single quotes ('').",IDC_AUTO_INSERT_SINGLE_QUOTE,238,80,100,10,WS_TABSTOP
AUTOCHECKBOX "Insert space after comment marker on toggle line comment.",IDC_AUTO_INSERT_SPACE_COMMENT,231,43,218,10,WS_TABSTOP
GROUPBOX "Auto complete braces and quotes",IDC_STATIC,231,56,218,49
AUTOCHECKBOX "( )",IDC_AUTO_INSERT_PARENTHESIS,238,68,40,10,WS_TABSTOP
AUTOCHECKBOX "{ }",IDC_AUTO_INSERT_BRACE,290,68,40,10,WS_TABSTOP
AUTOCHECKBOX "[ ]",IDC_AUTO_INSERT_SQUARE_BRACKET,342,68,40,10,WS_TABSTOP
AUTOCHECKBOX "< >",IDC_AUTO_INSERT_ANGLE_BRACKET,394,68,40,10,WS_TABSTOP
AUTOCHECKBOX "Double quotes ("""").",IDC_AUTO_INSERT_DOUBLE_QUOTE,238,80,100,10,WS_TABSTOP
AUTOCHECKBOX "Single quotes ('').",IDC_AUTO_INSERT_SINGLE_QUOTE,342,80,100,10,WS_TABSTOP
AUTOCHECKBOX "Backticks (``).",IDC_AUTO_INSERT_BACKTICK,238,92,100,10,WS_TABSTOP

GROUPBOX "Auto completion scanning word inside:",IDC_STATIC,231,111,218,26
Expand Down
15 changes: 8 additions & 7 deletions locale/zh-Hans/Notepad2.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1629,13 +1629,14 @@ BEGIN
AUTOCHECKBOX "自动缩进文本",IDC_AUTO_INDENT_TEXT,231,7,200,10,WS_TABSTOP
AUTOCHECKBOX "自动闭合 HTML/XML 标签",IDC_AUTO_CLOSE_TAGS,231,19,200,10,WS_TABSTOP
AUTOCHECKBOX "如果适用，输入逗号(,)后自动插入空格",IDC_AUTO_INSERT_SPACE_COMMA,231,31,218,10,WS_TABSTOP
GROUPBOX "自动完成括号和引号",IDC_STATIC,231,44,218,61
AUTOCHECKBOX "( )",IDC_AUTO_INSERT_PARENTHESIS,238,56,40,10,WS_TABSTOP
AUTOCHECKBOX "{ }",IDC_AUTO_INSERT_BRACE,290,56,40,10,WS_TABSTOP
AUTOCHECKBOX "[ ]",IDC_AUTO_INSERT_SQUARE_BRACKET,342,56,40,10,WS_TABSTOP
AUTOCHECKBOX "< >",IDC_AUTO_INSERT_ANGLE_BRACKET,394,56,40,10,WS_TABSTOP
AUTOCHECKBOX "双引号("""").",IDC_AUTO_INSERT_DOUBLE_QUOTE,238,68,100,10,WS_TABSTOP
AUTOCHECKBOX "单引号('').",IDC_AUTO_INSERT_SINGLE_QUOTE,238,80,100,10,WS_TABSTOP
AUTOCHECKBOX "切换行注释时在注释符后插入空格",IDC_AUTO_INSERT_SPACE_COMMENT,231,43,218,10,WS_TABSTOP
GROUPBOX "自动完成括号和引号",IDC_STATIC,231,56,218,49
AUTOCHECKBOX "( )",IDC_AUTO_INSERT_PARENTHESIS,238,68,40,10,WS_TABSTOP
AUTOCHECKBOX "{ }",IDC_AUTO_INSERT_BRACE,290,68,40,10,WS_TABSTOP
AUTOCHECKBOX "[ ]",IDC_AUTO_INSERT_SQUARE_BRACKET,342,68,40,10,WS_TABSTOP
AUTOCHECKBOX "< >",IDC_AUTO_INSERT_ANGLE_BRACKET,394,68,40,10,WS_TABSTOP
AUTOCHECKBOX "双引号("""").",IDC_AUTO_INSERT_DOUBLE_QUOTE,238,80,100,10,WS_TABSTOP
AUTOCHECKBOX "单引号('').",IDC_AUTO_INSERT_SINGLE_QUOTE,342,80,100,10,WS_TABSTOP
AUTOCHECKBOX "反引号(``).",IDC_AUTO_INSERT_BACKTICK,238,92,100,10,WS_TABSTOP

GROUPBOX "自动完成时在以下内容中搜索单词：",IDC_STATIC,231,111,218,26
Expand Down
15 changes: 8 additions & 7 deletions locale/zh-Hant/Notepad2.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1629,13 +1629,14 @@ BEGIN
AUTOCHECKBOX "自動縮排文字",IDC_AUTO_INDENT_TEXT,231,7,200,10,WS_TABSTOP
AUTOCHECKBOX "自動閉合 HTML/XML 標籤",IDC_AUTO_CLOSE_TAGS,231,19,200,10,WS_TABSTOP
AUTOCHECKBOX "適當時輸入逗號 (,) 後新增空白",IDC_AUTO_INSERT_SPACE_COMMA,231,31,218,10,WS_TABSTOP
GROUPBOX "自動完成括弧和引號",IDC_STATIC,231,44,218,61
AUTOCHECKBOX "( )",IDC_AUTO_INSERT_PARENTHESIS,238,56,40,10,WS_TABSTOP
AUTOCHECKBOX "{ }",IDC_AUTO_INSERT_BRACE,290,56,40,10,WS_TABSTOP
AUTOCHECKBOX "[ ]",IDC_AUTO_INSERT_SQUARE_BRACKET,342,56,40,10,WS_TABSTOP
AUTOCHECKBOX "< >",IDC_AUTO_INSERT_ANGLE_BRACKET,394,56,40,10,WS_TABSTOP
AUTOCHECKBOX "雙引號 ("""").",IDC_AUTO_INSERT_DOUBLE_QUOTE,238,68,100,10,WS_TABSTOP
AUTOCHECKBOX "單引號 ('').",IDC_AUTO_INSERT_SINGLE_QUOTE,238,80,100,10,WS_TABSTOP
AUTOCHECKBOX "切換行注釋時在注釋符後新增空白",IDC_AUTO_INSERT_SPACE_COMMENT,231,43,218,10,WS_TABSTOP
GROUPBOX "自動完成括弧和引號",IDC_STATIC,231,56,218,49
AUTOCHECKBOX "( )",IDC_AUTO_INSERT_PARENTHESIS,238,68,40,10,WS_TABSTOP
AUTOCHECKBOX "{ }",IDC_AUTO_INSERT_BRACE,290,68,40,10,WS_TABSTOP
AUTOCHECKBOX "[ ]",IDC_AUTO_INSERT_SQUARE_BRACKET,342,68,40,10,WS_TABSTOP
AUTOCHECKBOX "< >",IDC_AUTO_INSERT_ANGLE_BRACKET,394,68,40,10,WS_TABSTOP
AUTOCHECKBOX "雙引號 ("""").",IDC_AUTO_INSERT_DOUBLE_QUOTE,238,80,100,10,WS_TABSTOP
AUTOCHECKBOX "單引號 ('').",IDC_AUTO_INSERT_SINGLE_QUOTE,342,80,100,10,WS_TABSTOP
AUTOCHECKBOX "反引號 (``).",IDC_AUTO_INSERT_BACKTICK,238,92,100,10,WS_TABSTOP

GROUPBOX "自動完成時在以下內容中搜索單詞：",IDC_STATIC,231,111,218,26
Expand Down
6 changes: 6 additions & 0 deletions src/Dialogs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2369,6 +2369,9 @@ static INT_PTR CALLBACK AutoCompletionSettingsDlgProc(HWND hwnd, UINT umsg, WPAR
if (mask & AutoInsertMask_SpaceAfterComma) {
CheckDlgButton(hwnd, IDC_AUTO_INSERT_SPACE_COMMA, BST_CHECKED);
}
if (mask & AutoInsertMask_SpaceAfterComment) {
CheckDlgButton(hwnd, IDC_AUTO_INSERT_SPACE_COMMENT, BST_CHECKED);
}

mask = autoCompletionConfig.iAsmLineCommentChar;
CheckRadioButton(hwnd, IDC_ASM_LINE_COMMENT_SEMICOLON, IDC_ASM_LINE_COMMENT_AT, IDC_ASM_LINE_COMMENT_SEMICOLON + mask);
Expand Down Expand Up @@ -2469,6 +2472,9 @@ static INT_PTR CALLBACK AutoCompletionSettingsDlgProc(HWND hwnd, UINT umsg, WPAR
if (IsButtonChecked(hwnd, IDC_AUTO_INSERT_SPACE_COMMA)) {
mask |= AutoInsertMask_SpaceAfterComma;
}
if (IsButtonChecked(hwnd, IDC_AUTO_INSERT_SPACE_COMMENT)) {
mask |= AutoInsertMask_SpaceAfterComment;
}

autoCompletionConfig.fAutoInsertMask = mask;
autoCompletionConfig.iAsmLineCommentChar = GetCheckedRadioButton(hwnd, IDC_ASM_LINE_COMMENT_SEMICOLON, IDC_ASM_LINE_COMMENT_AT) - IDC_ASM_LINE_COMMENT_SEMICOLON;
Expand Down
18 changes: 12 additions & 6 deletions src/Edit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3348,6 +3348,7 @@ void EditEncloseSelection(LPCWSTR pwszOpen, LPCWSTR pwszClose) {
}
}

extern EditAutoCompletionConfig autoCompletionConfig;
//=============================================================================
//
// EditToggleLineComments()
Expand All @@ -3367,8 +3368,13 @@ void EditToggleLineComments(LPCWSTR pwszComment, bool bInsertAtStart) {
char mszComment[32] = "";
const UINT cpEdit = SciCall_GetCodePage();
int cchComment = WideCharToMultiByte(cpEdit, 0, pwszComment, -1, mszComment, COUNTOF(mszComment), NULL, NULL) - 1;
const bool requiresSpace = mszComment[cchComment - 1] == ' ';
cchComment -= requiresSpace;
const char commentEnd = mszComment[cchComment - 1];
char commentPad = ' ';
if (commentEnd == ' ') {
cchComment -= 1;
} else if ((autoCompletionConfig.fAutoInsertMask & AutoInsertMask_SpaceAfterComment) == 0) {
commentPad = '\0';
}

const Sci_Line iLineStart = SciCall_LineFromPosition(iSelStart);
Sci_Line iLineEnd = SciCall_LineFromPosition(iSelEnd);
Expand Down Expand Up @@ -3408,7 +3414,7 @@ void EditToggleLineComments(LPCWSTR pwszComment, bool bInsertAtStart) {
const struct Sci_TextRangeFull tr = { { iIndentPos, min_pos(iIndentPos + 31, iLineEndPos) }, tchBuf };
SciCall_GetTextRangeFull(&tr);

if (StrStartsWithCaseEx(tchBuf, mszComment, cchComment) && (!requiresSpace || (uint8_t)(tchBuf[cchComment]) <= ' ')) {
if (StrStartsWithCaseEx(tchBuf, mszComment, cchComment) && (commentEnd != ' ' || (uint8_t)(tchBuf[cchComment]) <= ' ')) {
switch (iAction) {
case CommentAction_None:
iAction = CommentAction_Delete;
Expand All @@ -3418,7 +3424,7 @@ void EditToggleLineComments(LPCWSTR pwszComment, bool bInsertAtStart) {
Sci_Position iCommentPos = iIndentPos;
Sci_Position iEndPos = iIndentPos + cchComment;
// a line with [space/tab] comment only
if (tchBuf[cchComment] == ' ') {
if (commentPad == ' ' && tchBuf[cchComment] == ' ') {
// TODO: detect indentation space and alignment space
++iEndPos;
}
Expand All @@ -3430,7 +3436,7 @@ void EditToggleLineComments(LPCWSTR pwszComment, bool bInsertAtStart) {
case CommentAction_Add: {
const Sci_Position iCommentPos = SciCall_FindColumn(iLine, iCommentCol);
if (iCommentPos != iIndentPos) {
mszComment[cchComment] = ' ';
mszComment[cchComment] = commentPad;
SciCall_InsertText(iCommentPos, mszComment);
}
} break;
Expand All @@ -3444,7 +3450,7 @@ void EditToggleLineComments(LPCWSTR pwszComment, bool bInsertAtStart) {
case CommentAction_Add: {
const Sci_Position iCommentPos = SciCall_FindColumn(iLine, iCommentCol);
if (iCommentCol == 0 || iLineStart == iLineEnd || iIndentPos != iLineEndPos) {
mszComment[cchComment] = (iCommentPos == iLineEndPos) ? '\0' : ' ';
mszComment[cchComment] = (iCommentPos == iLineEndPos) ? '\0' : commentPad;
SciCall_InsertText(iCommentPos, mszComment);
} else {
char tchComment[1024] = "";
Expand Down
3 changes: 2 additions & 1 deletion src/Edit.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,9 @@ enum {
AutoInsertMask_SingleQuote = 32, // ''
AutoInsertMask_Backtick = 64, // ``
AutoInsertMask_SpaceAfterComma = 128, // ', '
AutoInsertMask_SpaceAfterComment = 256, // '// '
// default settings
AutoInsertMask_Default = 255,
AutoInsertMask_Default = 511,
};

// asm line comment
Expand Down
Loading

0 comments on commit baf1cc1

Please sign in to comment.