Skip to content

Commit 24519eb

Browse files
authored
lint: maximum name length #3109
Problem: extremelyLongNamesThatExplainTooMuchShouldLiveInTheDocstringNotTheName() Solution: Enforce lessLongName by lint rule. https://eslint.org/docs/latest/rules/id-length
1 parent 0447fcd commit 24519eb

File tree

50 files changed

+224
-215
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+224
-215
lines changed

.eslintrc.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,16 @@ module.exports = {
1919
],
2020
rules: {
2121
curly: 2, // Enforce braces on "if"/"for"/etc.
22+
'id-length': [
23+
'error',
24+
{
25+
min: 1,
26+
max: 40,
27+
exceptionPatterns: [
28+
'^codecatalyst_', // CodeCatalyst telemetry names are verbose :(
29+
],
30+
},
31+
],
2232
// https://typescript-eslint.io/rules/naming-convention/
2333
'@typescript-eslint/naming-convention': [
2434
'error',

src/cloudWatchLogs/commands/viewLogStream.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export class DefaultSelectLogStreamWizardContext implements SelectLogStreamWizar
8181
},
8282
request,
8383
}),
84-
response => convertDescribeLogStreamsToQuickPickItems(response)
84+
response => convertDescribeLogToQuickPickItems(response)
8585
)
8686

8787
const controller = new picker.IteratingQuickPickController(qp, populator)
@@ -112,7 +112,7 @@ export class DefaultSelectLogStreamWizardContext implements SelectLogStreamWizar
112112
}
113113
}
114114

115-
export function convertDescribeLogStreamsToQuickPickItems(
115+
export function convertDescribeLogToQuickPickItems(
116116
response: CloudWatchLogs.DescribeLogStreamsResponse
117117
): vscode.QuickPickItem[] {
118118
return (response.logStreams ?? []).map<vscode.QuickPickItem>(stream => ({

src/codewhisperer/activation.ts

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ export async function activate(context: ExtContext): Promise<void> {
186186
if (isInlineCompletionEnabled() && e.uri.fsPath !== InlineCompletionService.instance.filePath()) {
187187
return
188188
}
189-
RecommendationHandler.instance.reportUserDecisionOfCurrentRecommendation(vscode.window.activeTextEditor, -1)
189+
RecommendationHandler.instance.reportUserDecisionOfRecommendation(vscode.window.activeTextEditor, -1)
190190
RecommendationHandler.instance.clearRecommendations()
191191
}),
192192

@@ -246,11 +246,11 @@ export async function activate(context: ExtContext): Promise<void> {
246246
) || false
247247
const notificationLastShown: number =
248248
context.extensionContext.globalState.get<number | undefined>(
249-
CodeWhispererConstants.accessTokenMigrationDoNotShowAgainLastShown
249+
CodeWhispererConstants.accessTokenMigrationDoNotShowLastShown
250250
) || 1
251251

252252
//Add 7 days to notificationLastShown to determine whether warn message should show
253-
if (doNotShowAgain || notificationLastShown + (1000 * 60 * 60 * 24 * 7) >= Date.now()) {
253+
if (doNotShowAgain || notificationLastShown + 1000 * 60 * 60 * 24 * 7 >= Date.now()) {
254254
return
255255
} else if (t <= CodeWhispererConstants.accessTokenCutOffDate) {
256256
vscode.window
@@ -275,7 +275,7 @@ export async function activate(context: ExtContext): Promise<void> {
275275
}
276276
})
277277
context.extensionContext.globalState.update(
278-
CodeWhispererConstants.accessTokenMigrationDoNotShowAgainLastShown,
278+
CodeWhispererConstants.accessTokenMigrationDoNotShowLastShown,
279279
Date.now()
280280
)
281281
} else {
@@ -311,7 +311,7 @@ export async function activate(context: ExtContext): Promise<void> {
311311

312312
async function showCodeWhispererWelcomeMessage(): Promise<void> {
313313
const filePath = isCloud9()
314-
? context.extensionContext.asAbsolutePath(CodeWhispererConstants.welcomeCodeWhispererCloud9ReadmeFileSource)
314+
? context.extensionContext.asAbsolutePath(CodeWhispererConstants.welcomeCodeWhispererCloud9Readme)
315315
: context.extensionContext.asAbsolutePath(CodeWhispererConstants.welcomeCodeWhispererReadmeFileSource)
316316
const readmeUri = vscode.Uri.file(filePath)
317317
await vscode.commands.executeCommand('markdown.showPreviewToSide', readmeUri)
@@ -330,13 +330,12 @@ export async function activate(context: ExtContext): Promise<void> {
330330
vscode.workspace.getConfiguration('editor').get('suggest.showMethods') || false
331331
const isAutomatedTriggerEnabled: boolean = getAutoTriggerStatus()
332332
const isManualTriggerEnabled: boolean = await getManualTriggerStatus()
333-
const isIncludeSuggestionsWithCodeReferencesEnabled =
334-
codewhispererSettings.isIncludeSuggestionsWithCodeReferencesEnabled()
333+
const isSuggestionsWithCodeReferencesEnabled = codewhispererSettings.isSuggestionsWithCodeReferencesEnabled()
335334
return {
336335
isShowMethodsEnabled,
337336
isManualTriggerEnabled,
338337
isAutomatedTriggerEnabled,
339-
isIncludeSuggestionsWithCodeReferencesEnabled,
338+
isSuggestionsWithCodeReferencesEnabled,
340339
}
341340
}
342341

@@ -617,7 +616,7 @@ export async function activate(context: ExtContext): Promise<void> {
617616

618617
export async function shutdown() {
619618
if (isCloud9()) {
620-
RecommendationHandler.instance.reportUserDecisionOfCurrentRecommendation(vscode.window.activeTextEditor, -1)
619+
RecommendationHandler.instance.reportUserDecisionOfRecommendation(vscode.window.activeTextEditor, -1)
621620
RecommendationHandler.instance.clearRecommendations()
622621
}
623622
if (isInlineCompletionEnabled()) {

src/codewhisperer/commands/invokeRecommendation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export async function invokeRecommendation(
5858
vsCodeState.isIntelliSenseActive = false
5959
RecommendationHandler.instance.isGenerateRecommendationInProgress = true
6060
try {
61-
RecommendationHandler.instance.reportUserDecisionOfCurrentRecommendation(editor, -1)
61+
RecommendationHandler.instance.reportUserDecisionOfRecommendation(editor, -1)
6262
RecommendationHandler.instance.clearRecommendations()
6363
await RecommendationHandler.instance.getRecommendations(
6464
client,

src/codewhisperer/commands/onAcceptance.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export async function onAcceptance(acceptanceEntry: OnRecommendationAcceptanceEn
3232
const start = acceptanceEntry.range.start
3333
const end = isCloud9() ? acceptanceEntry.editor.selection.active : acceptanceEntry.range.end
3434
const languageId = acceptanceEntry.editor.document.languageId
35-
RecommendationHandler.instance.reportUserDecisionOfCurrentRecommendation(
35+
RecommendationHandler.instance.reportUserDecisionOfRecommendation(
3636
acceptanceEntry.editor,
3737
acceptanceEntry.acceptIndex
3838
)

src/codewhisperer/commands/onInlineAcceptance.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export async function onInlineAcceptance(
8484
const start = acceptanceEntry.range.start
8585
const end = acceptanceEntry.editor.selection.active
8686
const languageId = acceptanceEntry.editor.document.languageId
87-
RecommendationHandler.instance.reportUserDecisionOfCurrentRecommendation(
87+
RecommendationHandler.instance.reportUserDecisionOfRecommendation(
8888
acceptanceEntry.editor,
8989
acceptanceEntry.acceptIndex
9090
)

src/codewhisperer/models/constants.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ export const licenseFilter = 'CodeWhisperer suggestions were filtered due to ref
103103
*/
104104
export const welcomeCodeWhispererReadmeFileSource = 'resources/markdown/WelcomeToCodeWhisperer.md'
105105

106-
export const welcomeCodeWhispererCloud9ReadmeFileSource = 'resources/markdown/WelcomeToCodeWhispererCloud9.md'
106+
export const welcomeCodeWhispererCloud9Readme = 'resources/markdown/WelcomeToCodeWhispererCloud9.md'
107107

108108
export const welcomeMessageKey = 'CODEWHISPERER_WELCOME_MESSAGE'
109109

@@ -242,7 +242,7 @@ export const accessTokenMigrationDoNotShowAgain = `Don\'t Show Again`
242242

243243
export const accessTokenMigrationDoNotShowAgainKey = 'CODEWHISPERER_ACCESS_TOKEN_MIGRATION_DO_NOT_SHOW_AGAIN'
244244

245-
export const accessTokenMigrationDoNotShowAgainLastShown =
245+
export const accessTokenMigrationDoNotShowLastShown =
246246
'CODEWHISPERER_ACCESS_TOKEN_MIGRATION_DO_NOT_SHOW_AGAIN_LAST_SHOWN_TIME'
247247

248248
export const accessTokenMigrationDoNotShowAgainInfo = `You will not receive this notification again. If you would like to continue using CodeWhisperer after January 31, 2023, you can still connect with AWS. [Learn More](https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/codewhisper-setup-general.html).`

src/codewhisperer/models/model.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export interface ConfigurationEntry {
6565
readonly isShowMethodsEnabled: boolean
6666
readonly isManualTriggerEnabled: boolean
6767
readonly isAutomatedTriggerEnabled: boolean
68-
readonly isIncludeSuggestionsWithCodeReferencesEnabled: boolean
68+
readonly isSuggestionsWithCodeReferencesEnabled: boolean
6969
}
7070

7171
export interface InlineCompletionItem {

src/codewhisperer/service/inlineCompletion.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ export class InlineCompletion {
136136

137137
RecommendationHandler.instance.cancelPaginatedRequest()
138138
// report all recommendation as rejected
139-
RecommendationHandler.instance.reportUserDecisionOfCurrentRecommendation(editor, -1)
139+
RecommendationHandler.instance.reportUserDecisionOfRecommendation(editor, -1)
140140
}
141141

142142
async rejectRecommendation(
@@ -329,7 +329,7 @@ export class InlineCompletion {
329329
config: ConfigurationEntry,
330330
autoTriggerType?: CodewhispererAutomatedTriggerType
331331
) {
332-
RecommendationHandler.instance.reportUserDecisionOfCurrentRecommendation(editor, -1)
332+
RecommendationHandler.instance.reportUserDecisionOfRecommendation(editor, -1)
333333
RecommendationHandler.instance.clearRecommendations()
334334
this.setCodeWhispererStatusBarLoading()
335335
const isManualTrigger = triggerType === 'OnDemand'
@@ -355,7 +355,7 @@ export class InlineCompletion {
355355
)
356356
this.setCompletionItems(editor)
357357
if (RecommendationHandler.instance.checkAndResetCancellationTokens()) {
358-
RecommendationHandler.instance.reportUserDecisionOfCurrentRecommendation(editor, -1)
358+
RecommendationHandler.instance.reportUserDecisionOfRecommendation(editor, -1)
359359
RecommendationHandler.instance.clearRecommendations()
360360
break
361361
}
@@ -397,7 +397,7 @@ export class InlineCompletion {
397397
RecommendationHandler.instance.recommendations.forEach((r, i) => {
398398
RecommendationHandler.instance.setSuggestionState(i, 'Discard')
399399
})
400-
RecommendationHandler.instance.reportUserDecisionOfCurrentRecommendation(editor, -1)
400+
RecommendationHandler.instance.reportUserDecisionOfRecommendation(editor, -1)
401401
RecommendationHandler.instance.clearRecommendations()
402402
if (this._timer !== undefined) {
403403
clearTimeout(this._timer)
@@ -427,7 +427,7 @@ export class InlineCompletion {
427427
RecommendationHandler.instance.recommendations.forEach((r, i) => {
428428
RecommendationHandler.instance.setSuggestionState(i, 'Discard')
429429
})
430-
RecommendationHandler.instance.reportUserDecisionOfCurrentRecommendation(editor, -1)
430+
RecommendationHandler.instance.reportUserDecisionOfRecommendation(editor, -1)
431431
RecommendationHandler.instance.clearRecommendations()
432432
}
433433
if (this._timer !== undefined) {
@@ -448,7 +448,7 @@ export class InlineCompletion {
448448
showTimedMessage(CodeWhispererConstants.noSuggestions, 2000)
449449
}
450450
}
451-
RecommendationHandler.instance.reportUserDecisionOfCurrentRecommendation(editor, -1)
451+
RecommendationHandler.instance.reportUserDecisionOfRecommendation(editor, -1)
452452
RecommendationHandler.instance.clearRecommendations()
453453
}
454454
}

src/codewhisperer/service/inlineCompletionService.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { getPrefixSuffixOverlap } from '../util/commonUtil'
2222
import globals from '../../shared/extensionGlobals'
2323
import { AuthUtil } from '../util/authUtil'
2424

25-
class CodeWhispererInlineCompletionItemProvider implements vscode.InlineCompletionItemProvider {
25+
class CWInlineCompletionItemProvider implements vscode.InlineCompletionItemProvider {
2626
private activeItemIndex: number | undefined
2727
public nextMove: number
2828

@@ -86,7 +86,7 @@ class CodeWhispererInlineCompletionItemProvider implements vscode.InlineCompleti
8686
return index
8787
}
8888

89-
truncateSuggestionOverlapWithRightContext(document: vscode.TextDocument, suggestion: string): string {
89+
truncateOverlapWithRightContext(document: vscode.TextDocument, suggestion: string): string {
9090
let rightContextRange: vscode.Range | undefined = undefined
9191
const pos = RecommendationHandler.instance.startPos
9292
if (suggestion.split(/\r?\n/).length > 1) {
@@ -110,7 +110,7 @@ class CodeWhispererInlineCompletionItemProvider implements vscode.InlineCompleti
110110
if (!r.content.startsWith(prefix)) {
111111
return undefined
112112
}
113-
const truncatedSuggestion = this.truncateSuggestionOverlapWithRightContext(document, r.content)
113+
const truncatedSuggestion = this.truncateOverlapWithRightContext(document, r.content)
114114
if (truncatedSuggestion.length === 0) {
115115
if (RecommendationHandler.instance.getSuggestionState(index) !== 'Showed') {
116116
RecommendationHandler.instance.setSuggestionState(index, 'Discard')
@@ -210,7 +210,7 @@ const hideCommand = Commands.declare(
210210
)
211211

212212
export class InlineCompletionService {
213-
private inlineCompletionProvider?: CodeWhispererInlineCompletionItemProvider
213+
private inlineCompletionProvider?: CWInlineCompletionItemProvider
214214
private inlineCompletionProviderDisposable?: vscode.Disposable
215215
private maxPage = 100
216216
private statusBar: vscode.StatusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 1)
@@ -289,7 +289,7 @@ export class InlineCompletionService {
289289
vsCodeState.isCodeWhispererEditing = false
290290
ReferenceInlineProvider.instance.removeInlineReference()
291291
RecommendationHandler.instance.cancelPaginatedRequest()
292-
RecommendationHandler.instance.reportUserDecisionOfCurrentRecommendation(editor, -1)
292+
RecommendationHandler.instance.reportUserDecisionOfRecommendation(editor, -1)
293293
RecommendationHandler.instance.clearRecommendations()
294294
this.disposeInlineCompletion()
295295
this.setCodeWhispererStatusBarOk()
@@ -312,7 +312,7 @@ export class InlineCompletionService {
312312
RecommendationHandler.instance.recommendations.forEach((r, i) => {
313313
RecommendationHandler.instance.setSuggestionState(i, 'Discard')
314314
})
315-
RecommendationHandler.instance.reportUserDecisionOfCurrentRecommendation(editor, -1)
315+
RecommendationHandler.instance.reportUserDecisionOfRecommendation(editor, -1)
316316
RecommendationHandler.instance.clearRecommendations()
317317
} else if (RecommendationHandler.instance.recommendations.length > 0) {
318318
RecommendationHandler.instance.moveStartPositionToSkipSpaces(editor)
@@ -349,7 +349,7 @@ export class InlineCompletionService {
349349
page
350350
)
351351
if (RecommendationHandler.instance.checkAndResetCancellationTokens()) {
352-
RecommendationHandler.instance.reportUserDecisionOfCurrentRecommendation(editor, -1)
352+
RecommendationHandler.instance.reportUserDecisionOfRecommendation(editor, -1)
353353
RecommendationHandler.instance.clearRecommendations()
354354
this.setCodeWhispererStatusBarOk()
355355
return
@@ -377,7 +377,7 @@ export class InlineCompletionService {
377377
if (vscode.window.activeTextEditor) {
378378
vscode.window.showTextDocument(vscode.window.activeTextEditor.document)
379379
}
380-
this.inlineCompletionProvider = new CodeWhispererInlineCompletionItemProvider(
380+
this.inlineCompletionProvider = new CWInlineCompletionItemProvider(
381381
this.inlineCompletionProvider?.getActiveItemIndex,
382382
indexShift
383383
)

0 commit comments

Comments
 (0)