Merge pull request #12 from kevv87/feat/remove-in6-code

Remove IN6 code

Author: me-cr

example_files/example_lint_cfg.json

@@ -9,7 +9,6 @@
     "in1": { "indentation_spaces": 4 },
     "in2": {},
     "in3": {},
-    "in6": {},
     "in9": {},
     "in10": {}
 }

src/lint/mod.rs

@@ -7,8 +7,7 @@ use rules::{instantiate_rules, CurrentRules, RuleType};
 use rules::{spacing::{SpBraceOptions, SpPunctOptions, NspFunparOptions,
                       NspInparenOptions, NspUnaryOptions, NspTrailingOptions},
                       indentation::{LongLineOptions, IN1Options, IN3Options,
-                                    IN2Options, IN9Options, IN6Options,
-                                    IN10Options},
+                                    IN2Options, IN9Options, IN10Options},
                     };
 use crate::analysis::{DMLError, IsolatedAnalysis, LocalDMLError};
 use crate::analysis::parsing::tree::TreeElement;
@@ -67,8 +66,6 @@ pub struct LintCfg {
     #[serde(default)]
     pub in3: Option<IN3Options>,
     #[serde(default)]
-    pub in6: Option<IN6Options>,
-    #[serde(default)]
     pub in9: Option<IN9Options>,
     #[serde(default)]
     pub in10: Option<IN10Options>,
@@ -87,7 +84,6 @@ impl Default for LintCfg {
             in1: Some(IN1Options{indentation_spaces: INDENTATION_LEVEL_DEFAULT}),
             in2: Some(IN2Options{}),
             in3: Some(IN3Options{indentation_spaces: INDENTATION_LEVEL_DEFAULT}),
-            in6: Some(IN6Options{indentation_spaces: INDENTATION_LEVEL_DEFAULT}),
             in9: Some(IN9Options{indentation_spaces: INDENTATION_LEVEL_DEFAULT}),
             in10: Some(IN10Options{indentation_spaces: INDENTATION_LEVEL_DEFAULT}),
         }
@@ -147,9 +143,6 @@ pub fn begin_style_check(ast: TopAst, file: String, rules: &CurrentRules) -> Res
         rules.nsp_trailing.check(&mut linting_errors, row, line);
     }
 
-    // Continuation line check
-    rules.in6.check(&mut linting_errors, &lines);
-
     post_process_linting_errors(&mut linting_errors);
 
     Ok(linting_errors.into_iter().map(|e| e.error).collect())

src/lint/rules/indentation.rs

@@ -4,7 +4,7 @@ use crate::analysis::parsing::{statement::{self, CompoundContent, ForContent,
                                SwitchCase, WhileContent},
                                structure::ObjectStatementsContent,
                                types::{BitfieldsContent, LayoutContent, StructTypeContent}};
-use crate::span::{Range, ZeroIndexed, Row, Column};
+use crate::span::{Range, ZeroIndexed};
 use crate::analysis::LocalDMLError;
 use crate::analysis::parsing::tree::{ZeroRange, Content, TreeElement};
 use serde::{Deserialize, Serialize};
@@ -27,9 +27,6 @@ pub fn setup_indentation_size(cfg: &mut LintCfg) {
     if let Some(in3) = &mut cfg.in3 {
         in3.indentation_spaces = indentation_spaces;
     }
-    if let Some(in6) = &mut cfg.in6 {
-        in6.indentation_spaces = indentation_spaces;
-    }
     if let Some(in9) = &mut cfg.in9 {
         in9.indentation_spaces = indentation_spaces;
     }
@@ -251,92 +248,6 @@ impl Rule for IN3Rule {
     }
 }
 
-// IN6: Continuation Line
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
-pub struct IN6Options {
-    #[serde(default = "default_indentation_spaces")]
-    pub indentation_spaces: u32,
-}
-
-pub struct IN6Rule {
-    pub enabled: bool,
-    pub indentation_spaces: u32,
-}
-
-impl IN6Rule {
-    pub fn from_options(options: &Option<IN6Options>) -> IN6Rule {
-        match options {
-            Some(in6) => IN6Rule {
-                enabled: true,
-                indentation_spaces: in6.indentation_spaces,
-            },
-            None => IN6Rule {
-                enabled: false,
-                indentation_spaces: 0,
-            },
-        }
-    }
-
-    pub fn check(&self, acc: &mut Vec<DMLStyleError>, lines: &[&str]) {
-        if !self.enabled {
-            return;
-        }
-
-        let arithmetic_operators = ["+", "-", "*", "/", "%", "="];
-        let comparison_operators = ["==", "!=", "<", ">", "<=", ">="];
-        let logical_operators = ["&&", "||"];
-        let bitwise_operators = ["&", "|", "<<", ">>"];
-
-        let operators = [
-            &arithmetic_operators[..],
-            &comparison_operators[..],
-            &logical_operators[..],
-            &bitwise_operators[..],
-        ];
-
-        for (i, line) in lines.iter().enumerate() {
-            if let Some(last_char) = line.trim().chars().last() {
-                if operators.iter().any(|ops| ops.contains(&last_char.to_string().as_str())) {
-                    let next_line = lines.get(i + 1);
-                    if let Some(next_line) = next_line {
-                        let expected_indent = line.chars().take_while(|c| c.is_whitespace()).count() + self.indentation_spaces as usize;
-                        let actual_indent = next_line.chars().take_while(|c| c.is_whitespace()).count();
-                        if actual_indent != expected_indent {
-                            let msg = IN6Rule::description().to_owned();
-                            let dmlerror = DMLStyleError {
-                                error: LocalDMLError {
-                                    range: Range::new(
-                                        Row::new_zero_indexed((i + 1) as u32),
-                                        Row::new_zero_indexed((i + 1) as u32),
-                                        Column::new_zero_indexed(0),
-                                        Column::new_zero_indexed(next_line.len() as u32)
-                                    ),
-                                    description: msg,
-                                },
-                                rule_type: Self::get_rule_type(),
-                            };
-                            acc.push(dmlerror);
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-impl Rule for IN6Rule {
-    fn name() -> &'static str {
-        "IN6_CONTINUATION_LINE"
-    }
-
-    fn description() -> &'static str {
-        "Continuation line not indented correctly."
-    }
-    fn get_rule_type() -> RuleType {
-        RuleType::IN6
-    }
-}
-
 pub struct IN9Rule {
     pub enabled: bool,
     indentation_spaces: u32

src/lint/rules/mod.rs

@@ -7,7 +7,7 @@ pub mod tests;
 use spacing::{SpBracesRule,
     SpPunctRule, NspFunparRule, NspInparenRule,
     NspUnaryRule, NspTrailingRule};
-use indentation::{LongLinesRule, IN2Rule, IN3Rule, IN6Rule, IN9Rule, IN10Rule};
+use indentation::{LongLinesRule, IN2Rule, IN3Rule, IN9Rule, IN10Rule};
 use crate::lint::LintCfg;
 
 pub struct CurrentRules {
@@ -20,7 +20,6 @@ pub struct CurrentRules {
     pub long_lines: LongLinesRule,
     pub in2: IN2Rule,
     pub in3: IN3Rule,
-    pub in6: IN6Rule,
     pub in9: IN9Rule,
     pub in10: IN10Rule
 }
@@ -36,7 +35,6 @@ pub fn  instantiate_rules(cfg: &LintCfg) -> CurrentRules {
         long_lines: LongLinesRule::from_options(&cfg.long_lines),
         in2: IN2Rule { enabled: cfg.in2.is_some() },
         in3: IN3Rule::from_options(&cfg.in3),
-        in6: IN6Rule::from_options(&cfg.in6),
         in9: IN9Rule::from_options(&cfg.in9),
         in10: IN10Rule::from_options(&cfg.in10)
     }

src/lint/rules/tests/indentation/in6.rs

@@ -1,6 +1,5 @@
 pub mod in2;
 pub mod in3;
-pub mod in6;
 pub mod in9;
 pub mod in10;