Fix part of issue #8423 Lint concatenation checker #19908

Helper2020 · 2024-03-08T22:27:27Z

Overview

This PR fixes or fixes part of Implement new linter checks #8423].
This PR adds Add a lint check to prevent the usage of string concatenation and promote string interpolation.

Essential Checklist

The PR title starts with "Fix #bugnum: " or "Fix part of #bugnum: ...", followed by a short, clear summary of the changes.
I have followed the instructions for making a code change.
I have assigned the correct reviewers to this PR (or will leave a comment with the phrase "@{{reviewer_username}} PTAL" if I don't have permissions to assign reviewers directly).
The linter/Karma presubmit checks pass on my local machine, and my PR follows the coding style guide).
"Allow edits from maintainers" is checked. (See here for instructions on how to enable it.)

oppiabot · 2024-03-08T22:27:30Z

Hi @Helper2020, can you complete the following:

The body of this PR is missing the overview section, please update it to include the overview.
The body of this PR is missing the proof that changes are correct section, please update it to include the section.
Thanks!

oppiabot · 2024-03-08T22:27:40Z

Assigning @vojtechjelinek for the first pass review of this PR. Thanks!

Helper2020 · 2024-03-08T22:28:34Z

@seanlip PTAL, @U8NWXD PTAL

oppiabot · 2024-03-08T22:31:38Z

Unassigning @Helper2020 since a re-review was requested. @Helper2020, please make sure you have addressed all review comments. Thanks!

seanlip

Thanks @Helper2020! Could you please fix the lint checks that are failing on CI? Thanks.

vojtechjelinek

Thanks! Left a few comments.

vojtechjelinek · 2024-03-10T11:51:34Z

scripts/linters/pylint_extensions.py

+            if (isinstance(left_inferred.value, str) and
+                isinstance(right_inferred.value, str)):
+                self.add_message('prefer-string-interpolation', node=node)


Suggested change

if (isinstance(left_inferred.value, str) and

isinstance(right_inferred.value, str)):

self.add_message('prefer-string-interpolation', node=node)

if (

isinstance(left_inferred.value, str) and

isinstance(right_inferred.value, str)

):

self.add_message('prefer-string-interpolation', node=node)

scripts/linters/pylint_extensions_test.py

oppiabot · 2024-03-10T11:55:18Z

Unassigning @vojtechjelinek since the review is done.

U8NWXD · 2024-03-10T18:58:59Z

@Helper2020 please correct the issues flagged by Oppiabot in #19908 (comment):

Hi @Helper2020, can you complete the following:

The body of this PR is missing the overview section, please update it to include the overview.

The body of this PR is missing the proof that changes are correct section, please update it to include the section.
Thanks!

I'm de-assigning myself for now until these issues and CI checks are fixed

Helper2020 · 2024-03-14T21:59:04Z

@vojtechjelinek I'm not sure how I can handle errors from .infer() without try-except blocks. Any suggestions?

vojtechjelinek · 2024-03-15T10:34:32Z

@vojtechjelinek I'm not sure how I can handle errors from .infer() without try-except blocks. Any suggestions?

Why can't you use try-except?

Helper2020 · 2024-03-17T01:37:14Z

@vojtechjelinek I'm not sure how I can handle errors from .infer() without try-except blocks. Any suggestions?

Why can't you use try-except?

I can, just according to the coding style guide, raising exceptions are rarely used.

Helper2020

PTAL @vojtechjelinek, PTAL @U8NWXD

core/domain/story_services.py

core/domain/email_manager.py

core/domain/suggestion_services.py

extensions/interactions/TextInput/TextInput.py

extensions/interactions/base_test.py

scripts/linters/pylint_extensions.py

scripts/linters/pylint_extensions_test.py

scripts/common.py

scripts/linters/html_linter.py

scripts/linters/js_ts_linter.py

seanlip

Sorry for the late reply. LGTM for my codeowner files, thanks @Helper2020!

seanlip · 2024-06-08T16:55:57Z

@Helper2020 Just a note, follow the syntax in the "essential checklist" if you want to assign reviewers, otherwise Oppiabot might not recognize it. I think the "PTAL" comes at the end not at the beginning.

vojtechjelinek

Thanks! Just one nit.

vojtechjelinek · 2024-06-09T16:03:27Z

core/domain/suggestion_services.py

+        score_category = ('%s%s%s' % (
+            suggestion_models.SCORE_TYPE_CONTENT,
+            suggestion_models.SCORE_CATEGORY_DELIMITER, exploration.category
+            ))


Suggested change

score_category = ('%s%s%s' % (

suggestion_models.SCORE_TYPE_CONTENT,

suggestion_models.SCORE_CATEGORY_DELIMITER, exploration.category

))

score_category = ('%s%s%s' % (

suggestion_models.SCORE_TYPE_CONTENT,

suggestion_models.SCORE_CATEGORY_DELIMITER, exploration.category

))

ditto below

oppiabot · 2024-06-09T16:07:59Z

Unassigning @vojtechjelinek since they have already approved the PR.

oppiabot · 2024-06-10T00:47:42Z

Unassigning @U8NWXD since they have already approved the PR.

Helper2020 · 2024-06-10T03:33:25Z

@U8NWXD For some reason the bot removed the pr from the merge queue.

* Added string concatentation class checker * Added string concatenation checker tests * Refactored String concatenation checker class * Fixed linting issues * Fixed symolic name conflict * Fixed linting issues * Fixing linting issues in pylint extenstions test file * Fixed any type error * Added try-except block and test case for inference errors * Shorted message id name * Added test case, one side str and other side is not * Fixed linting issues * Fixed linting issue email_services.py * Fixed refactor message strings email_services.py * removed string concactenations learner_group_test * Fixed string concatenation issues in acl_decorators_test.py * Fixed string concacention issue in cron_test.py * implemented suggestions cron_test.py * Implemented suggested changes in acl_decorators_test.py * Removed string concatenations in favor of string intropolations in state_domain_test.py * Replace string concatenations with string intropolation from stats_domain_test.py * Removed string concatenation in favor of string intropolation in general_purpose_linter.py * Removed string concactenation app_feedback_report_domain_test.py * Removed String concatenations from email_manager_test.py * Removed string concatenation in test_utils.py * Removed string concatenation in blog_domain_test.py * Removed string concatenation from story_domain * Removed string concantentations from tasks_test.py * Removes string concantentions in admin.py * Removed string concatentation from html.linter.py * Removed string concatenation in gae_models_test * Removed string concatenations from run_frontend_tests_test.py * Removed string concatenations from suggestion_registry_test.py * Removed string concatenation from feedback_domain_test * Removed string concatenations from email_manager.py * Removed string concatenations from story_node_jobs_test.py * Removed string concatenations from resourse_test * Removed string concatenation from exp_domain.py * Removed string concatactenation from topic_editor.py * Removed string concatenation js_ts_linter.py * Removed string concantenation from blog_domin.py * Removed string concatenation from utils_test.py * Removed string concatenation from dev_mode_email_services_test.py * Removed string concatenation from story_fetchers_test.py * Removed string concatenation from start.py * Removed string concatenation from contributor_dashboard_test.py * Removed string concatenation from feature_flag_services_test * Removed string concatenation from skill_domain_test * Removed string concatenation from generators_test.py * Removed string concatenation from dev_mode_email_services/py * Removed string concatenation from story_services.py * Fixed invalid data type error in test_util.py * Removed string concatenation from user_services_test.py * Removed string concatenation from question_domain.py * Removed string concatenation from profile.py * Removed string concatenations from exp_migration_jobs_test.py * Removed string concatenations from common.py * Minor refactor * Removed string concatenations from collection_domain.py * Removed string concatenations from profil_test.py * Removed string concatenations from update_configs.py * Removed string concatenation from acl_decorators.py * Removed string concatenations from blog_services_test * Removed string concatenation from platform_parameter_domain_test.py * Removed string concatenation from admin_test.py * Removed string concatenation from collection_services_test.py * Removed string concatenations from stetup_test.py * Removed string concatenations from check_overall_backend_test_coverage_test * Removed string concatenations from skill_mastery_test.py * Removed string concatenations email_services_test.py * Removed string concatenations gae_models_test * Removed string concatenation reader_test.py * Removed string concatenations run_typescript_checks.py * Removed string concatenations question_editor.py * Removed string concatenation contributor_admin_stats_job_test.py * Removed string concatenation base_test.py * Removed string concatenation gae_app_identity_services.py * Removed string concatenations takeout_service_test.py * Removed string concatenation story_domain_test.py * Removed string concatenation objects.py * Removed string concatenation topic_editor_test.py * Removed string concatenation story_services_test * Removed string concatenation run_frontend_tests.py * Removed string concatenations js_ts_linter_test.py * Added feature to string concanation linter to ignore datetime object * Fixed linting errors in pylint_extensions.py * Removed string concatenations feedback_services_test.py * Removed string concatenations linter_utils_test.py * Fixed linting errors in pylint_extensions_test.py * Removed string concatenations topics_and_skills_dashboard * Removed string concatenations suggestions_services_test/py * Removed string concatenations exp_services_test.py * Removed string concatenation from TextInput.py * Removed string concatenations from suggestion_services.py * Removed string concatenation gae_models.py * Fixed linting errors in gae_models.y * Removed string concatenation from summary_services_test.py * Implented suggested changes in pylint_extensions_test.py * Removed string concatenation from story_fetchers_test * Removed string concatenations suggestion_services_test.py * Removed white space from suggestion_services_test.py * Updated lint-concatenation message id and next message id value * Removed string concatenations from suggestion_test.py * Removed string concatenation suggestion_edit_state_contented_deletion_jobs.py * Removed string concatenation from common.py * Removed string concatenation user_validation_jobs_test.py * Removed string concatenation skill_mastery_test * Removed string concatenation reader_test/py * Removed string concatenations suggestion_edit_state_content_jobs_test.py * Fixed spacing in acl_decorators_test.py * Rephrased String concantenation checker message * Changed test function names in PreventStringConcatenationCheckerTests * deindent 4 spaces to match scope' * Indented by 4 to match scope * Refactor code * Implemented suggestions * Implemented suggested changes * Refactor line of code in js_ts_linter.py * Removed redudant occurances of the word of * Fixed string interpolation error * Refactored pylint_extensions because of missing coverage * Refactored code based on suggestions * Implemented suggested changes * Implemented suggested changes * Refactored code * Refactored code * Refactored code * Refactored code * refactored code * Refactored code * Refactored code in collection_domain.py * Refactored code exp_domain.py * Refactored code exp_services_test.py * Refactored code * Refactored code in platform_parameter_domain_test.py * Refactored code in skill_domain_test.py * Refactored code * Refactored code in collection_domain.py * Refactored string in story_domain_test.py * refactored string in story_fetchers_test * Refactored code in story_services_test * Refactored code in suggestion_registry_test * Refactor code suggestions_services_test * Refactored code in summary_services_test * Refactored code takeout_service_test * Refactored strings * Refactored strings * Refactored strings * Refactored strings * Refactored strings * Refactore strings * Refactored string * Refactored string * Refactored Strings * Refactored string in setup_test.py * Refactored strings in stetup_test.py * Refactored string in start.py * Fixed linting errors * Fixed skill_domain_test error * Refactored code in suggestion_test.py * Refactored string in task_test.py * Refactored String * Refactored email_manager_test * Refactores trings feedback_services_test.py * Refactored string story_domain.py * Refactored sring in suggestions_services_test.py * Implemented suggestions in story_services.py * Fixed idenation error * Refactored string in email_manager.py * Refactored code suggestion_services.py * Refactored code user_services_test.py * Refactored code TextInput.py * Refactored code in base_test * Refactored code in objects.py * Fixed linting issues in TextInput.py and base_test.py * Implemented suggestion for PreventStringConcatenationCheckerTest * Changed test function name in pylint_extensions_test * Indented part of string for readability in commpn.py * Refactored return string * Refactored return string in js_ts_linter.py * Refactored code to make this clearer

Helper2020 added 8 commits March 7, 2024 14:27

Added string concatentation class checker

a4bd2a4

Added string concatenation checker tests

1c9655c

Refactored String concatenation checker class

3b8f7b5

Fixed linting issues

908b6cb

Fixed symolic name conflict

7784f5d

Fixed linting issues

c3f9500

Fixing linting issues in pylint extenstions test file

4c0e4b1

Fixed any type error

aa15b24

Helper2020 requested a review from a team as a code owner March 8, 2024 22:27

Helper2020 requested a review from vojtechjelinek March 8, 2024 22:27

oppiabot bot assigned Helper2020 Mar 8, 2024

oppiabot bot assigned vojtechjelinek Mar 8, 2024

oppiabot bot assigned seanlip and U8NWXD and unassigned Helper2020 Mar 8, 2024

seanlip requested changes Mar 9, 2024

View reviewed changes

seanlip assigned Helper2020 and unassigned seanlip Mar 9, 2024

vojtechjelinek suggested changes Mar 10, 2024

View reviewed changes

oppiabot bot unassigned vojtechjelinek Mar 10, 2024

U8NWXD removed their assignment Mar 10, 2024

Helper2020 added 3 commits June 5, 2024 17:41

Refactored code in base_test

4346020

Refactored code in objects.py

9db20a8

Fixed linting issues in TextInput.py and base_test.py

736f314

oppiabot bot removed the PR: don't merge - HAS MERGE CONFLICTS label Jun 5, 2024

Helper2020 added 6 commits June 5, 2024 22:09

Implemented suggestion for PreventStringConcatenationCheckerTest

d9a0565

Changed test function name in pylint_extensions_test

5f7d97e

Indented part of string for readability in commpn.py

835c03c

Refactored return string

eb22aa7

Refactored return string in js_ts_linter.py

2a61247

Refactored code to make this clearer

614fb75

Helper2020 commented Jun 6, 2024

View reviewed changes

seanlip approved these changes Jun 8, 2024

View reviewed changes

seanlip assigned vojtechjelinek and U8NWXD Jun 8, 2024

vojtechjelinek approved these changes Jun 9, 2024

View reviewed changes

oppiabot bot unassigned vojtechjelinek Jun 9, 2024

U8NWXD approved these changes Jun 10, 2024

View reviewed changes

U8NWXD added this pull request to the merge queue Jun 10, 2024

oppiabot bot unassigned U8NWXD Jun 10, 2024

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 10, 2024

seanlip added this pull request to the merge queue Jun 10, 2024

Merged via the queue into oppia:develop with commit 879127f Jun 10, 2024
81 checks passed

Helper2020 deleted the lint-concatenation-checker branch June 10, 2024 18:57

Helper2020 mentioned this pull request Jul 8, 2024

Implement new linter checks #8423

Open

65 tasks

Uh oh!

Fix part of issue #8423 Lint concatenation checker #19908

Fix part of issue #8423 Lint concatenation checker #19908

Uh oh!

Conversation

Helper2020 commented Mar 8, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Overview

Essential Checklist

Uh oh!

oppiabot bot commented Mar 8, 2024

Uh oh!

oppiabot bot commented Mar 8, 2024

Uh oh!

Helper2020 commented Mar 8, 2024

Uh oh!

oppiabot bot commented Mar 8, 2024

Uh oh!

seanlip left a comment

Choose a reason for hiding this comment

Uh oh!

vojtechjelinek left a comment

Choose a reason for hiding this comment

Uh oh!

vojtechjelinek Mar 10, 2024

Choose a reason for hiding this comment

Uh oh!

Helper2020 May 20, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

oppiabot bot commented Mar 10, 2024

Uh oh!

U8NWXD commented Mar 10, 2024

Uh oh!

Helper2020 commented Mar 14, 2024

Uh oh!

vojtechjelinek commented Mar 15, 2024

Uh oh!

Helper2020 commented Mar 17, 2024

Uh oh!

Helper2020 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

seanlip left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

seanlip commented Jun 8, 2024

Uh oh!

vojtechjelinek left a comment

Choose a reason for hiding this comment

Uh oh!

vojtechjelinek Jun 9, 2024

Choose a reason for hiding this comment

Uh oh!

vojtechjelinek Jun 9, 2024

Choose a reason for hiding this comment

Uh oh!

oppiabot bot commented Jun 9, 2024

Uh oh!

oppiabot bot commented Jun 10, 2024

Uh oh!

Uh oh!

Helper2020 commented Jun 10, 2024

Uh oh!

Uh oh!

Uh oh!

Helper2020 commented Mar 8, 2024 •

edited

Loading

seanlip left a comment •

edited

Loading