22import * as vscode from 'vscode' ;
33
44export async function activate ( context : vscode . ExtensionContext ) {
5+ devMode = context . extensionMode === vscode . ExtensionMode . Development ;
6+
57 let semicolonAtPosition = vscode . commands . registerTextEditorCommand ( 'auto-semicolon-vscode.position-insert-semicolon' ,
68 ( editor : vscode . TextEditor , textEdit : vscode . TextEditorEdit ) => {
79 return semicolonCommand ( editor , textEdit ) ;
@@ -33,16 +35,18 @@ export function deactivate() { }
3335type RegExpMatchArrayWithIndex = RegExpMatchArray & { index : number } ;
3436
3537// these variables will fill later
38+ let devMode = false ;
3639let autoSemicolonFormatsIncluded = true ;
3740let autoMoveFormatsIncluded = false ;
3841let commentDelimiter = '//' ;
42+ let commentDelimiterIndex = - 1 ;
3943
4044
4145type StringDictionary = {
42- [ key : string ] : string ;
46+ [ key : string ] : string ;
4347} ;
4448
45- const languagesDelimiter :StringDictionary = {
49+ const languagesDelimiter : StringDictionary = {
4650 "dotenv" : '#' ,
4751 "dockerfile" : '#' ,
4852 "snippets" : '#' ,
@@ -72,14 +76,7 @@ function isForStatementIgnored() {
7276 return getConfig ( ) . supportedLanguageId . ignores . theForStatement ;
7377}
7478
75- function isUnallowdEndsIncluded ( lineText : string ) {
76- let pos = lineText . lastIndexOf ( commentDelimiter ) ;
77-
78- // it it commented
79- if ( pos >= 0 ) {
80- lineText = lineText . substring ( 0 , pos ) ;
81- }
82-
79+ function isUnallowedEndsIncluded ( lineText : string ) {
8380 let lastCharacter = lineText [ lineText . length - 1 ] ;
8481
8582 let unallowedEnds = getConfig ( ) . autoInsertSemicolon . unallowedEnds . split ( "," ) ;
@@ -132,6 +129,11 @@ function semicolonCommand(editor: vscode.TextEditor, textEdit: vscode.TextEditor
132129function autoSemicolonCommand ( editor : vscode . TextEditor , textEdit : vscode . TextEditorEdit , forceToEnd : boolean ) {
133130 const selections : vscode . Selection [ ] = [ ] ;
134131 const languageId = vscode . window . activeTextEditor ?. document . languageId ;
132+
133+ autoSemicolonFormatsIncluded = isAutoSemicolonLanguageIdIncluded ( languageId ) ;
134+ autoMoveFormatsIncluded = isAutoMoveLanguageIdIncluded ( languageId ) ;
135+ commentDelimiter = getCommentDelimiter ( languageId ) ;
136+
135137 editor . edit ( ( ) => {
136138 try {
137139 editor . selections . forEach ( ( selection ) => {
@@ -142,10 +144,7 @@ function autoSemicolonCommand(editor: vscode.TextEditor, textEdit: vscode.TextEd
142144 let position : vscode . Position ;
143145 let match ;
144146
145- autoSemicolonFormatsIncluded = isAutoSemicolonLanguageIdIncluded ( languageId ) ;
146- autoMoveFormatsIncluded = isAutoMoveLanguageIdIncluded ( languageId ) ;
147- commentDelimiter = getCommentDelimiter ( languageId ) ;
148-
147+ commentDelimiterIndex = indexTagOutOfQuotes ( lineText , commentDelimiter ) ;
149148 position = newPosition ( line , selection . active . character + 1 ) ;
150149
151150 if ( lineText . length === 0 || ! languageId ) {
@@ -154,7 +153,7 @@ function autoSemicolonCommand(editor: vscode.TextEditor, textEdit: vscode.TextEd
154153 } else if ( ! autoSemicolonFormatsIncluded && ! autoMoveFormatsIncluded ) {
155154 textEdit . insert ( selection . active , ';' ) ;
156155
157- } else if ( ! forceToEnd && isCommented ( lineText , currentPos ) ) {
156+ } else if ( ! forceToEnd && commentDelimiterIndex >= 0 && commentDelimiterIndex < currentPos ) {
158157 textEdit . insert ( selection . active , ';' ) ;
159158
160159 } else if ( ! forceToEnd && isQuotesIgnored ( ) && isInStringLiteral ( lineText , currentPos ) ) {
@@ -174,7 +173,7 @@ function autoSemicolonCommand(editor: vscode.TextEditor, textEdit: vscode.TextEd
174173 let length = line . range . end . character + 1 ;
175174 if ( isBetweenTags ( '{' , '}' , lineText , currentPos ) ) {
176175 length = putSemicolonBefore ( '}' , textEdit , selection , line ) ;
177- } else if ( ! isUnallowdEndsIncluded ( lineText ) || currentPos === line . text . length ) {
176+ } else if ( ! isUnallowedEndsIncluded ( lineText ) || currentPos === line . text . length ) {
178177 length = autoSemicolonBeforeComment ( textEdit , selection , line ) + 1 ;
179178 }
180179
@@ -183,17 +182,20 @@ function autoSemicolonCommand(editor: vscode.TextEditor, textEdit: vscode.TextEd
183182 } else {
184183 // just move to the end
185184 let length = line . range . end . character + 1 ;
185+ if ( autoMoveFormatsIncluded ) {
186+ length = lineText . substring ( 0 , commentDelimiterIndex ) . trimEnd ( ) . length ;
187+ }
186188 position = newPosition ( line , length ) ;
187189 }
188190
189191 selection = new vscode . Selection ( position , position ) ;
190192 selections . push ( selection ) ;
191- } catch ( error ) {
192- // logIt(error.message);
193+ } catch ( error : any ) {
194+ logIt ( error . message ) ;
193195 }
194196 } ) ;
195- } catch ( error ) {
196- // logIt(error.message);
197+ } catch ( error : any ) {
198+ logIt ( error . message ) ;
197199 }
198200 } ) . then ( ( ) => {
199201 editor . selections = selections ;
@@ -215,7 +217,7 @@ function putSemicolonBefore(tag: string, textEdit: vscode.TextEditorEdit, select
215217 const lineTextTrimmed = lineText . substring ( 0 , posClose ) . trimEnd ( ) ;
216218 length = lineTextTrimmed . length ;
217219
218- if ( ! isUnallowdEndsIncluded ( lineTextTrimmed ) || currentPos === line . text . length ) {
220+ if ( ! isUnallowedEndsIncluded ( lineTextTrimmed ) || currentPos === line . text . length ) {
219221 lineText = lineText . replace ( lineTextTrimmed , lineTextTrimmed + ';' ) ;
220222 length += 1 ;
221223 textEdit . delete ( new vscode . Selection ( newPosition ( line , 0 ) , newPosition ( line , line . text . length ) ) ) ;
@@ -234,14 +236,13 @@ function putSemicolonBefore(tag: string, textEdit: vscode.TextEditorEdit, select
234236function autoSemicolonBeforeComment ( textEdit : vscode . TextEditorEdit , selection : vscode . Selection , line : vscode . TextLine , justMove : boolean = false ) : number {
235237 let lineText = line . text . trimEnd ( ) ;
236238 const currentPos = selection . active . character ;
237- const posClose = lineText . indexOf ( commentDelimiter , currentPos ) ;
238239 let length = lineText . length ;
239240
240- if ( posClose >= 0 ) {
241- const lineTextTrimmed = lineText . substring ( 0 , posClose ) . trimEnd ( ) ;
241+ if ( commentDelimiterIndex >= 0 ) {
242+ const lineTextTrimmed = lineText . substring ( 0 , commentDelimiterIndex ) . trimEnd ( ) ;
242243 length = lineTextTrimmed . length ;
243244
244- if ( ! isUnallowdEndsIncluded ( lineTextTrimmed ) || currentPos === length ) {
245+ if ( ! isUnallowedEndsIncluded ( lineTextTrimmed ) || currentPos === length ) {
245246 lineText = lineText . replace ( lineTextTrimmed , lineTextTrimmed + ';' ) ;
246247 length += 1 ;
247248 textEdit . delete ( new vscode . Selection ( newPosition ( line , 0 ) , newPosition ( line , line . text . length ) ) ) ;
@@ -294,8 +295,27 @@ function getCommentDelimiter(languageId: string | undefined): string {
294295 return delimiterDefault ;
295296}
296297
297- function isCommented ( lineText : string , currentPos : number ) : boolean {
298- return lineText . lastIndexOf ( commentDelimiter , currentPos ) >= 0 ;
298+ function indexTagOutOfQuotes ( line : string , tag : string ) : number {
299+ const regex = new RegExp ( `${ commentDelimiter } , 'g' ) ;
300+ const matches = [ ] ;
301+
302+ let match ;
303+ while ( ( match = regex . exec ( line ) ) !== null ) {
304+ // Check the preceding characters
305+ const precedingChars = line . slice ( 0 , match . index ) ;
306+ const quoteCount = ( precedingChars . match ( / [ ' " ` ] / g) || [ ] ) . length ;
307+
308+ // If the count of quotes is even, add the match
309+ if ( quoteCount % 2 == 0 ) {
310+ matches . push ( match ) ;
311+ }
312+ }
313+
314+ if ( matches . length == 0 ) {
315+ return - 1 ;
316+ }
317+
318+ return matches [ 0 ] . index ;
299319}
300320
301321function findTheForStatement ( lineText : string , currentPos : number ) : string [ ] | null {
@@ -338,9 +358,11 @@ function isEmpty(value: string | any[] | null | undefined): boolean {
338358 return ( value == null || value . length === 0 ) ;
339359}
340360
341- async function logIt ( message : string | any [ ] | null | undefined ) {
342- console . log ( message ) ;
343- // vscode.window.showWarningMessage(message?.toString());
361+ async function logIt ( message : string | any | any [ ] | null | undefined ) {
362+ if ( devMode ) {
363+ console . log ( message ) ;
364+ // vscode.window.showWarningMessage(message?.toString());
365+ }
344366}
345367
346368async function taskChecker ( context : vscode . ExtensionContext ) {
0 commit comments