Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/indentation of multiline string #1364

Merged
merged 19 commits into from
Jun 16, 2022

Conversation

Arrgentum
Copy link
Member

@Arrgentum Arrgentum commented Jun 15, 2022

Correct margins in a multiline string template

  • Correct indentation of the opening quotation mark
  • The same indentation of the opening and closing quotes

This pull request closes #811

Actions checklist

  • Correct check quotes in multiline string
  • Added tests on fixers

Arrgentum and others added 10 commits June 6, 2022 11:11
 * 1 new fix test
 * first corrected code

### Issue (#811)
    * corrected code StringLiteral
    * added test

### Issue(#811)
  *  search new bug in multiline string
### Whats added:
 * corrected the logic of checking MultilionString
 * added fix test in IndentationRuleFixTest.kt - MultilionStringExpected.kt, MultilionStringTest.kt
 * run diktat:fix@diktat

  ### Issue (#811)
### Whats added:
 * corrected the logic of checking MultilionString
 * added fix test in IndentationRuleFixTest.kt - MultilionStringExpected.kt, MultilionStringTest.kt
 * delete smoke tests
 * run diktat:fix@diktat

  ### Issue (#811)
### Whats added:
 * corrected the logic of checking MultilionString
 * added fix test in IndentationRuleFixTest.kt - MultilionStringExpected.kt, MultilionStringTest.kt
 * delete smoke tests
 * run diktat:fix@diktat

  ### Issue (#811)
### Whats added:
 * corrected the logic of checking MultilionString
 * added fix test in IndentationRuleFixTest.kt - MultilionStringExpected.kt, MultilionStringTest.kt
 * delete smoke tests
 * run diktat:fix@diktat

  ### Issue (#811)
### Whats added:
 * corrected the logic of checking MultilionString
 * added fix test in IndentationRuleFixTest.kt - MultilionStringExpected.kt, MultilionStringTest.kt
 * delete smoke tests

  ### Issue (#811)
### Whats added:
 * corrected the logic of checking MultilionString
 * added fix test in IndentationRuleFixTest.kt - MultilionStringExpected.kt, MultilionStringTest.kt
 * delete smoke tests
 * run install
 * mvn fix

  ### Issue (#811)
### Whats added:
 * corrected the logic of checking MultilionString
 * added fix test in IndentationRuleFixTest.kt - MultilionStringExpected.kt, MultilionStringTest.kt
 * delete smoke tests
 * run install
 * mvn fix

  ### Issue (#811)
@codecov
Copy link

codecov bot commented Jun 15, 2022

Codecov Report

Merging #1364 (c4fc884) into master (12a39ab) will decrease coverage by 0.03%.
The diff coverage is 70.96%.

@@             Coverage Diff              @@
##             master    #1364      +/-   ##
============================================
- Coverage     83.56%   83.53%   -0.04%     
- Complexity     2572     2579       +7     
============================================
  Files           106      106              
  Lines          7507     7523      +16     
  Branches       2076     2083       +7     
============================================
+ Hits           6273     6284      +11     
- Misses          357      358       +1     
- Partials        877      881       +4     
Flag Coverage Δ
unittests 83.53% <70.96%> (-0.04%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...kotlin/org/cqfn/diktat/ruleset/rules/DiktatRule.kt 66.66% <0.00%> (ø)
...at/ruleset/rules/chapter3/files/IndentationRule.kt 84.94% <75.86%> (-2.12%) ⬇️
...cqfn/diktat/ruleset/utils/PositionInTextLocator.kt 95.00% <0.00%> (+2.50%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 12a39ab...c4fc884. Read the comment docs.

Arrgentum and others added 3 commits June 15, 2022 18:54
### Whats added:
 * corrected the logic of checking MultilionString
 * added fix test in IndentationRuleFixTest.kt - MultilionStringExpected.kt, MultilionStringTest.kt
 * delete smoke tests
 * run install
 * mvn fix

  ### Issue (#811)
 * corrected the logic of checking MultilionString
 * added fix test in IndentationRuleFixTest.kt - MultilionStringExpected.kt, MultilionStringTest.kt
 * run install
 * mvn fix
Arrgentum and others added 2 commits June 16, 2022 14:45
 * corrected the logic of checking MultilionString
 * added fix test in IndentationRuleFixTest.kt - MultilionStringExpected.kt, MultilionStringTest.kt
 * corrected all WarnTest
 * run install
 * mvn fix
Arrgentum added 3 commits June 16, 2022 16:33
 * corrected the logic of checking MultilionString
 * added fix test in IndentationRuleFixTest.kt - MultilionStringExpected.kt, MultilionStringTest.kt
 * corrected all incorrect multiline string
 * run install
 * mvn fix
 * corrected the logic of checking MultilionString
 * added fix test in IndentationRuleFixTest.kt - MultilionStringExpected.kt, MultilionStringTest.kt
 * corrected all incorrect multiline string
 * run install
 * mvn fix
 * corrected the logic of checking MultilionString
 * added fix test in IndentationRuleFixTest.kt - MultilionStringExpected.kt, MultilionStringTest.kt
 * corrected all incorrect multiline string
 * run install
 * mvn fix
@Arrgentum Arrgentum merged commit 998d0e9 into master Jun 16, 2022
@Arrgentum Arrgentum deleted the bugfix/indentation_of_multiline_string branch June 16, 2022 14:38
@Arrgentum Arrgentum self-assigned this Jun 17, 2022
This was referenced Jun 21, 2022
0x6675636b796f75676974687562 added a commit that referenced this pull request Jul 18, 2022
### What's done:

 * Dead code dropped (originally introduced as a part of #1364).
 * See also 998d0e9.
 * Original issue: #811.
0x6675636b796f75676974687562 added a commit that referenced this pull request Jul 18, 2022
### What's done:

 * Dead code dropped (originally introduced as a part of #1364).
 * See also 998d0e9.
 * Original issue: #811.
0x6675636b796f75676974687562 added a commit that referenced this pull request Aug 15, 2022
### What's done:

 * Fixes the false-positive warnings reported for single-line string templates.
 * Closes #1490.
 * See #811 (the original feature request).
 * See #1364 (the pull request which introduced the regression).
 * See 998d0e9 (the commit which introduced the regression).
0x6675636b796f75676974687562 added a commit that referenced this pull request Aug 15, 2022
### What's done:

 * Fixes the false-positive warnings reported for single-line string templates.
 * Closes #1490.
 * See #811 (the original feature request).
 * See #1364 (the pull request which introduced the regression).
 * See 998d0e9 (the commit which introduced the regression).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Changing indentation of multiline string works incorrect
3 participants