diff --git a/go.mod b/go.mod
index a51c9d0..eb68b7e 100644
--- a/go.mod
+++ b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/hashicorp/go-version v1.6.0
 	github.com/hashicorp/hcl/v2 v2.17.0
 	github.com/hashicorp/terraform-registry-address v0.2.0
-	github.com/terraform-linters/tflint-plugin-sdk v0.16.1
+	github.com/terraform-linters/tflint-plugin-sdk v0.16.2-0.20230605170513-64de942491dc
 	github.com/zclconf/go-cty v1.13.2
 )
 
diff --git a/go.sum b/go.sum
index 54c34cd..03d6672 100644
--- a/go.sum
+++ b/go.sum
@@ -407,8 +407,8 @@ github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1F
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/terraform-linters/tflint-plugin-sdk v0.16.1 h1:fBfLL8KzP3pkQrNp3iQxaGoKBoMo2sFYoqmhuo6yc+A=
-github.com/terraform-linters/tflint-plugin-sdk v0.16.1/go.mod h1:ltxVy04PRwptL6P/Ugz2ZeTNclYapClrLn/kVFXJGzo=
+github.com/terraform-linters/tflint-plugin-sdk v0.16.2-0.20230605170513-64de942491dc h1:z0PQWOWfWOYps2Oo7nT/v9XASazFZITnMA+oGWZzB78=
+github.com/terraform-linters/tflint-plugin-sdk v0.16.2-0.20230605170513-64de942491dc/go.mod h1:ltxVy04PRwptL6P/Ugz2ZeTNclYapClrLn/kVFXJGzo=
 github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8=
 github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU=
diff --git a/rules/terraform_comment_syntax.go b/rules/terraform_comment_syntax.go
index ff162ef..eeb689f 100644
--- a/rules/terraform_comment_syntax.go
+++ b/rules/terraform_comment_syntax.go
@@ -79,10 +79,13 @@ func (r *TerraformCommentSyntaxRule) checkComments(runner tflint.Runner, filenam
 		}
 
 		if strings.HasPrefix(string(token.Bytes), "//") {
-			if err := runner.EmitIssue(
+			if err := runner.EmitIssueWithFix(
 				r,
 				"Single line comments should begin with #",
 				token.Range,
+				func(f tflint.Fixer) error {
+					return f.ReplaceText(f.RangeTo("//", filename, token.Range.Start), "#")
+				},
 			); err != nil {
 				return err
 			}
diff --git a/rules/terraform_comment_syntax_test.go b/rules/terraform_comment_syntax_test.go
index a120121..ded48ea 100644
--- a/rules/terraform_comment_syntax_test.go
+++ b/rules/terraform_comment_syntax_test.go
@@ -13,6 +13,7 @@ func Test_TerraformCommentSyntaxRule(t *testing.T) {
 		Content  string
 		JSON     bool
 		Expected helper.Issues
+		Fixed    string
 	}{
 		{
 			Name:     "hash comment",
@@ -48,6 +49,7 @@ func Test_TerraformCommentSyntaxRule(t *testing.T) {
 					},
 				},
 			},
+			Fixed: `# foo`,
 		},
 		{
 			Name: "end-of-line hash comment",
@@ -82,6 +84,11 @@ variable "foo" {
 			}
 
 			helper.AssertIssues(t, tc.Expected, runner.Issues)
+			want := map[string]string{}
+			if tc.Fixed != "" {
+				want[filename] = tc.Fixed
+			}
+			helper.AssertChanges(t, want, runner.Changes())
 		})
 	}
 }
diff --git a/rules/terraform_deprecated_index.go b/rules/terraform_deprecated_index.go
index e302970..c6996a7 100644
--- a/rules/terraform_deprecated_index.go
+++ b/rules/terraform_deprecated_index.go
@@ -72,15 +72,18 @@ func (r *TerraformDeprecatedIndexRule) Check(runner tflint.Runner) error {
 			r.checkLegacyTraversalIndex(runner, expr.Traversal, file.Bytes)
 		case *hclsyntax.SplatExpr:
 			if strings.HasPrefix(string(expr.MarkerRange.SliceBytes(file.Bytes)), ".") {
-				if err := runner.EmitIssue(
+				if err := runner.EmitIssueWithFix(
 					r,
 					"List items should be accessed using square brackets",
 					expr.MarkerRange,
+					func(f tflint.Fixer) error {
+						return f.ReplaceText(expr.MarkerRange, "[*]")
+					},
 				); err != nil {
 					return hcl.Diagnostics{
 						{
 							Severity: hcl.DiagError,
-							Summary:  "failed to call EmitIssue()",
+							Summary:  "failed to call EmitIssueWithFix()",
 							Detail:   err.Error(),
 						},
 					}
@@ -98,17 +101,20 @@ func (r *TerraformDeprecatedIndexRule) Check(runner tflint.Runner) error {
 
 func (r *TerraformDeprecatedIndexRule) checkLegacyTraversalIndex(runner tflint.Runner, traversal hcl.Traversal, file []byte) hcl.Diagnostics {
 	for _, t := range traversal {
-		if _, ok := t.(hcl.TraverseIndex); ok {
+		if tn, ok := t.(hcl.TraverseIndex); ok {
 			if strings.HasPrefix(string(t.SourceRange().SliceBytes(file)), ".") {
-				if err := runner.EmitIssue(
+				if err := runner.EmitIssueWithFix(
 					r,
 					"List items should be accessed using square brackets",
 					t.SourceRange(),
+					func(f tflint.Fixer) error {
+						return f.ReplaceText(t.SourceRange(), "[", f.ValueText(tn.Key), "]")
+					},
 				); err != nil {
 					return hcl.Diagnostics{
 						{
 							Severity: hcl.DiagError,
-							Summary:  "failed to call EmitIssue()",
+							Summary:  "failed to call EmitIssueWithFix()",
 							Detail:   err.Error(),
 						},
 					}
diff --git a/rules/terraform_deprecated_index_test.go b/rules/terraform_deprecated_index_test.go
index c44bc5e..6765f3e 100644
--- a/rules/terraform_deprecated_index_test.go
+++ b/rules/terraform_deprecated_index_test.go
@@ -13,12 +13,13 @@ func Test_TerraformDeprecatedIndexRule(t *testing.T) {
 		Content  string
 		JSON     bool
 		Expected helper.Issues
+		Fixed    string
 	}{
 		{
 			Name: "deprecated dot index style",
 			Content: `
 locals {
-  list = ["a"]
+  list  = ["a"]
   value = list.0
 }
 `,
@@ -39,13 +40,19 @@ locals {
 					},
 				},
 			},
+			Fixed: `
+locals {
+  list  = ["a"]
+  value = list[0]
+}
+`,
 		},
 		{
 			Name: "deprecated dot splat index style",
 			Content: `
 locals {
-  maplist = [{a = "b"}]
-  values = maplist.*.a
+  maplist = [{ a = "b" }]
+  values  = maplist.*.a
 }
 `,
 			Expected: helper.Issues{
@@ -56,21 +63,27 @@ locals {
 						Filename: "config.tf",
 						Start: hcl.Pos{
 							Line:   4,
-							Column: 19,
+							Column: 20,
 						},
 						End: hcl.Pos{
 							Line:   4,
-							Column: 21,
+							Column: 22,
 						},
 					},
 				},
 			},
+			Fixed: `
+locals {
+  maplist = [{ a = "b" }]
+  values  = maplist[*].a
+}
+`,
 		},
 		{
 			Name: "attribute access",
 			Content: `
 locals {
-  map = {a = "b"}
+  map   = { a = "b" }
   value = map.a
 }
 `,
@@ -90,9 +103,9 @@ locals {
 			Content: `
 locals {
   servers = <<EOF
-%{ for ip in aws_instance.example[*].private_ip }
+%{for ip in aws_instance.example[*].private_ip}
 server ${ip}
-%{ endfor }
+%{endfor}
 EOF
 }
 `,
@@ -101,14 +114,14 @@ EOF
 		{
 			Name: "directive: invalid",
 			Content: `
-		locals {
-		  servers = <<EOF
-		%{ for ip in aws_instance.example.*.private_ip }
-		server ${ip}
-		%{ endfor }
-		EOF
-		}
-		`,
+locals {
+  servers = <<EOF
+%{for ip in aws_instance.example.*.private_ip}
+server ${ip}
+%{endfor}
+EOF
+}
+`,
 			Expected: helper.Issues{
 				{
 					Rule:    NewTerraformDeprecatedIndexRule(),
@@ -117,22 +130,31 @@ EOF
 						Filename: "config.tf",
 						Start: hcl.Pos{
 							Line:   4,
-							Column: 36,
+							Column: 33,
 						},
 						End: hcl.Pos{
 							Line:   4,
-							Column: 38,
+							Column: 35,
 						},
 					},
 				},
 			},
+			Fixed: `
+locals {
+  servers = <<EOF
+%{for ip in aws_instance.example[*].private_ip}
+server ${ip}
+%{endfor}
+EOF
+}
+`,
 		},
 		{
 			Name: "legacy splat and legacy index",
 			Content: `
 locals {
   nested_list = [["a"]]
-  value = nested_list.*.0
+  value       = nested_list.*.0
 }
 `,
 			Expected: helper.Issues{
@@ -143,11 +165,11 @@ locals {
 						Filename: "config.tf",
 						Start: hcl.Pos{
 							Line:   4,
-							Column: 22,
+							Column: 28,
 						},
 						End: hcl.Pos{
 							Line:   4,
-							Column: 24,
+							Column: 30,
 						},
 					},
 				},
@@ -158,21 +180,27 @@ locals {
 						Filename: "config.tf",
 						Start: hcl.Pos{
 							Line:   4,
-							Column: 24,
+							Column: 30,
 						},
 						End: hcl.Pos{
 							Line:   4,
-							Column: 26,
+							Column: 32,
 						},
 					},
 				},
 			},
+			Fixed: `
+locals {
+  nested_list = [["a"]]
+  value       = nested_list[*][0]
+}
+`,
 		},
 		{
 			Name: "complex expression",
 			Content: `
 locals {
-  create_namespace = true
+  create_namespace     = true
   kubernetes_namespace = local.create_namespace ? join("", kubernetes_namespace.default.*.id) : var.kubernetes_namespace
 }
 `,
@@ -193,6 +221,12 @@ locals {
 					},
 				},
 			},
+			Fixed: `
+locals {
+  create_namespace     = true
+  kubernetes_namespace = local.create_namespace ? join("", kubernetes_namespace.default[*].id) : var.kubernetes_namespace
+}
+`,
 		},
 		{
 			Name: "json invalid",
@@ -221,6 +255,13 @@ locals {
 					},
 				},
 			},
+			Fixed: `
+			{
+				"locals": {
+					"list": ["a"],
+					"value": "${list[0]}"
+				}
+			}`,
 		},
 		{
 			Name: "json valid",
@@ -264,6 +305,11 @@ locals {
 			}
 
 			helper.AssertIssues(t, tc.Expected, runner.Issues)
+			want := map[string]string{}
+			if tc.Fixed != "" {
+				want[filename] = tc.Fixed
+			}
+			helper.AssertChanges(t, want, runner.Changes())
 		})
 	}
 }
diff --git a/rules/terraform_deprecated_interpolation.go b/rules/terraform_deprecated_interpolation.go
index f0c68c0..b004b32 100644
--- a/rules/terraform_deprecated_interpolation.go
+++ b/rules/terraform_deprecated_interpolation.go
@@ -60,20 +60,24 @@ func (r *TerraformDeprecatedInterpolationRule) Check(runner tflint.Runner) error
 }
 
 func (r *TerraformDeprecatedInterpolationRule) checkForDeprecatedInterpolationsInExpr(runner tflint.Runner, expr hcl.Expression) hcl.Diagnostics {
-	if _, ok := expr.(*hclsyntax.TemplateWrapExpr); !ok {
+	wrapExpr, ok := expr.(*hclsyntax.TemplateWrapExpr)
+	if !ok {
 		return nil
 	}
 
-	err := runner.EmitIssue(
+	err := runner.EmitIssueWithFix(
 		r,
 		"Interpolation-only expressions are deprecated in Terraform v0.12.14",
 		expr.Range(),
+		func(f tflint.Fixer) error {
+			return f.ReplaceText(expr.Range(), f.TextAt(wrapExpr.Wrapped.Range()))
+		},
 	)
 	if err != nil {
 		return hcl.Diagnostics{
 			{
 				Severity: hcl.DiagError,
-				Summary:  "failed to call EmitIssue()",
+				Summary:  "failed to call EmitIssueWithFix()",
 				Detail:   err.Error(),
 			},
 		}
diff --git a/rules/terraform_deprecated_interpolation_test.go b/rules/terraform_deprecated_interpolation_test.go
index 7148fcc..032f759 100644
--- a/rules/terraform_deprecated_interpolation_test.go
+++ b/rules/terraform_deprecated_interpolation_test.go
@@ -12,12 +12,13 @@ func Test_TerraformDeprecatedInterpolationRule(t *testing.T) {
 		Name     string
 		Content  string
 		Expected helper.Issues
+		Fixed    string
 	}{
 		{
 			Name: "deprecated single interpolation",
 			Content: `
 resource "null_resource" "a" {
-	triggers = "${var.triggers}"
+  triggers = "${var.triggers}"
 }`,
 			Expected: helper.Issues{
 				{
@@ -25,17 +26,21 @@ resource "null_resource" "a" {
 					Message: "Interpolation-only expressions are deprecated in Terraform v0.12.14",
 					Range: hcl.Range{
 						Filename: "config.tf",
-						Start:    hcl.Pos{Line: 3, Column: 13},
-						End:      hcl.Pos{Line: 3, Column: 30},
+						Start:    hcl.Pos{Line: 3, Column: 14},
+						End:      hcl.Pos{Line: 3, Column: 31},
 					},
 				},
 			},
+			Fixed: `
+resource "null_resource" "a" {
+  triggers = var.triggers
+}`,
 		},
 		{
 			Name: "deprecated single interpolation in provider block",
 			Content: `
 provider "null" {
-	foo = "${var.triggers["foo"]}"
+  foo = "${var.triggers["foo"]}"
 }`,
 			Expected: helper.Issues{
 				{
@@ -43,17 +48,21 @@ provider "null" {
 					Message: "Interpolation-only expressions are deprecated in Terraform v0.12.14",
 					Range: hcl.Range{
 						Filename: "config.tf",
-						Start:    hcl.Pos{Line: 3, Column: 8},
-						End:      hcl.Pos{Line: 3, Column: 32},
+						Start:    hcl.Pos{Line: 3, Column: 9},
+						End:      hcl.Pos{Line: 3, Column: 33},
 					},
 				},
 			},
+			Fixed: `
+provider "null" {
+  foo = var.triggers["foo"]
+}`,
 		},
 		{
 			Name: "deprecated single interpolation in locals block",
 			Content: `
 locals {
-	foo = "${var.triggers["foo"]}"
+  foo = "${var.triggers["foo"]}"
 }`,
 			Expected: helper.Issues{
 				{
@@ -61,19 +70,23 @@ locals {
 					Message: "Interpolation-only expressions are deprecated in Terraform v0.12.14",
 					Range: hcl.Range{
 						Filename: "config.tf",
-						Start:    hcl.Pos{Line: 3, Column: 8},
-						End:      hcl.Pos{Line: 3, Column: 32},
+						Start:    hcl.Pos{Line: 3, Column: 9},
+						End:      hcl.Pos{Line: 3, Column: 33},
 					},
 				},
 			},
+			Fixed: `
+locals {
+  foo = var.triggers["foo"]
+}`,
 		},
 		{
 			Name: "deprecated single interpolation in nested block",
 			Content: `
 resource "null_resource" "a" {
-	provisioner "local-exec" {
-		single = "${var.triggers["greeting"]}"
-	}
+  provisioner "local-exec" {
+    single = "${var.triggers["greeting"]}"
+  }
 }`,
 			Expected: helper.Issues{
 				{
@@ -81,17 +94,23 @@ resource "null_resource" "a" {
 					Message: "Interpolation-only expressions are deprecated in Terraform v0.12.14",
 					Range: hcl.Range{
 						Filename: "config.tf",
-						Start:    hcl.Pos{Line: 4, Column: 12},
-						End:      hcl.Pos{Line: 4, Column: 41},
+						Start:    hcl.Pos{Line: 4, Column: 14},
+						End:      hcl.Pos{Line: 4, Column: 43},
 					},
 				},
 			},
+			Fixed: `
+resource "null_resource" "a" {
+  provisioner "local-exec" {
+    single = var.triggers["greeting"]
+  }
+}`,
 		},
 		{
 			Name: "interpolation as template",
 			Content: `
 resource "null_resource" "a" {
-	triggers = "${var.triggers} "
+  triggers = "${var.triggers} "
 }`,
 			Expected: helper.Issues{},
 		},
@@ -99,7 +118,7 @@ resource "null_resource" "a" {
 			Name: "interpolation in array",
 			Content: `
 resource "null_resource" "a" {
-	triggers = ["${var.triggers}"]
+  triggers = ["${var.triggers}"]
 }`,
 			Expected: helper.Issues{
 				{
@@ -107,20 +126,55 @@ resource "null_resource" "a" {
 					Message: "Interpolation-only expressions are deprecated in Terraform v0.12.14",
 					Range: hcl.Range{
 						Filename: "config.tf",
-						Start:    hcl.Pos{Line: 3, Column: 14},
-						End:      hcl.Pos{Line: 3, Column: 31},
+						Start:    hcl.Pos{Line: 3, Column: 15},
+						End:      hcl.Pos{Line: 3, Column: 32},
 					},
 				},
 			},
+			Fixed: `
+resource "null_resource" "a" {
+  triggers = [var.triggers]
+}`,
 		},
 		{
 			Name: "new interpolation syntax",
 			Content: `
 resource "null_resource" "a" {
-	triggers = var.triggers
+  triggers = var.triggers
 }`,
 			Expected: helper.Issues{},
 		},
+		{
+			Name: "nested wraps",
+			Content: `
+resource "null_resource" "a" {
+  triggers = "${"${var.triggers}"}"
+}`,
+			Expected: helper.Issues{
+				{
+					Rule:    NewTerraformDeprecatedInterpolationRule(),
+					Message: "Interpolation-only expressions are deprecated in Terraform v0.12.14",
+					Range: hcl.Range{
+						Filename: "config.tf",
+						Start:    hcl.Pos{Line: 3, Column: 14},
+						End:      hcl.Pos{Line: 3, Column: 36},
+					},
+				},
+				{
+					Rule:    NewTerraformDeprecatedInterpolationRule(),
+					Message: "Interpolation-only expressions are deprecated in Terraform v0.12.14",
+					Range: hcl.Range{
+						Filename: "config.tf",
+						Start:    hcl.Pos{Line: 3, Column: 17},
+						End:      hcl.Pos{Line: 3, Column: 34},
+					},
+				},
+			},
+			Fixed: `
+resource "null_resource" "a" {
+  triggers = var.triggers
+}`,
+		},
 	}
 
 	rule := NewTerraformDeprecatedInterpolationRule()
@@ -134,6 +188,11 @@ resource "null_resource" "a" {
 			}
 
 			helper.AssertIssues(t, tc.Expected, runner.Issues)
+			want := map[string]string{}
+			if tc.Fixed != "" {
+				want["config.tf"] = tc.Fixed
+			}
+			helper.AssertChanges(t, want, runner.Changes())
 		})
 	}
 }
diff --git a/rules/terraform_empty_list_equality.go b/rules/terraform_empty_list_equality.go
index 37389cc..0d37c71 100644
--- a/rules/terraform_empty_list_equality.go
+++ b/rules/terraform_empty_list_equality.go
@@ -5,7 +5,6 @@ import (
 	"github.com/hashicorp/hcl/v2/hclsyntax"
 	"github.com/terraform-linters/tflint-plugin-sdk/tflint"
 	"github.com/terraform-linters/tflint-ruleset-terraform/project"
-	"github.com/zclconf/go-cty/cty"
 )
 
 // TerraformEmptyListEqualityRule checks whether is there a comparison with an empty list
@@ -59,23 +58,23 @@ func (r *TerraformEmptyListEqualityRule) Check(runner tflint.Runner) error {
 // checkEmptyList visits all blocks that can contain expressions and checks for comparisons with static empty list
 func (r *TerraformEmptyListEqualityRule) checkEmptyList(runner tflint.Runner) hcl.Diagnostics {
 	return runner.WalkExpressions(tflint.ExprWalkFunc(func(expr hcl.Expression) hcl.Diagnostics {
-		if binaryOpExpr, ok := expr.(*hclsyntax.BinaryOpExpr); ok && binaryOpExpr.Op.Type == cty.Bool {
+		if binaryOpExpr, ok := expr.(*hclsyntax.BinaryOpExpr); ok && (binaryOpExpr.Op == hclsyntax.OpEqual || binaryOpExpr.Op == hclsyntax.OpNotEqual) {
 			if tupleConsExpr, ok := binaryOpExpr.LHS.(*hclsyntax.TupleConsExpr); ok && len(tupleConsExpr.Exprs) == 0 {
-				if err := r.emitIssue(binaryOpExpr.Range(), runner); err != nil {
+				if err := r.emitIssue(binaryOpExpr, binaryOpExpr.RHS, runner); err != nil {
 					return hcl.Diagnostics{
 						{
 							Severity: hcl.DiagError,
-							Summary:  "failed to call EmitIssue()",
+							Summary:  "failed to call EmitIssueWithFix()",
 							Detail:   err.Error(),
 						},
 					}
 				}
 			} else if tupleConsExpr, ok := binaryOpExpr.RHS.(*hclsyntax.TupleConsExpr); ok && len(tupleConsExpr.Exprs) == 0 {
-				if err := r.emitIssue(binaryOpExpr.Range(), runner); err != nil {
+				if err := r.emitIssue(binaryOpExpr, binaryOpExpr.LHS, runner); err != nil {
 					return hcl.Diagnostics{
 						{
 							Severity: hcl.DiagError,
-							Summary:  "failed to call EmitIssue()",
+							Summary:  "failed to call EmitIssueWithFix()",
 							Detail:   err.Error(),
 						},
 					}
@@ -87,10 +86,20 @@ func (r *TerraformEmptyListEqualityRule) checkEmptyList(runner tflint.Runner) hc
 }
 
 // emitIssue emits issue for comparison with static empty list
-func (r *TerraformEmptyListEqualityRule) emitIssue(exprRange hcl.Range, runner tflint.Runner) error {
-	return runner.EmitIssue(
+func (r *TerraformEmptyListEqualityRule) emitIssue(binaryOpExpr *hclsyntax.BinaryOpExpr, hs hcl.Expression, runner tflint.Runner) error {
+	var opStr string
+	if binaryOpExpr.Op == hclsyntax.OpEqual {
+		opStr = "=="
+	} else {
+		opStr = "!="
+	}
+
+	return runner.EmitIssueWithFix(
 		r,
 		"Comparing a collection with an empty list is invalid. To detect an empty collection, check its length.",
-		exprRange,
+		binaryOpExpr.Range(),
+		func(f tflint.Fixer) error {
+			return f.ReplaceText(binaryOpExpr.Range(), "length(", f.TextAt(hs.Range()), ") ", opStr, " 0")
+		},
 	)
 }
diff --git a/rules/terraform_empty_list_equality_test.go b/rules/terraform_empty_list_equality_test.go
index ccacafb..7aa6942 100644
--- a/rules/terraform_empty_list_equality_test.go
+++ b/rules/terraform_empty_list_equality_test.go
@@ -12,13 +12,14 @@ func Test_TerraformEmptyListEqualityRule(t *testing.T) {
 		Name     string
 		Content  string
 		Expected helper.Issues
+		Fixed    string
 	}{
 		{
 			Name: "comparing with [] is not recommended",
 			Content: `
 resource "aws_db_instance" "mysql" {
-	count = [] == [] ? 0 : 1
-    instance_class = "m4.2xlarge"
+  count          = [] == [] ? 0 : 1
+  instance_class = "m4.2xlarge"
 }`,
 			Expected: helper.Issues{
 				{
@@ -26,18 +27,23 @@ resource "aws_db_instance" "mysql" {
 					Message: "Comparing a collection with an empty list is invalid. To detect an empty collection, check its length.",
 					Range: hcl.Range{
 						Filename: "resource.tf",
-						Start:    hcl.Pos{Line: 3, Column: 10},
-						End:      hcl.Pos{Line: 3, Column: 18},
+						Start:    hcl.Pos{Line: 3, Column: 20},
+						End:      hcl.Pos{Line: 3, Column: 28},
 					},
 				},
 			},
+			Fixed: `
+resource "aws_db_instance" "mysql" {
+  count          = length([]) == 0 ? 0 : 1
+  instance_class = "m4.2xlarge"
+}`,
 		},
 		{
 			Name: "multiple comparisons with [] are not recommended",
 			Content: `
 resource "aws_db_instance" "mysql" {
-	count = [] == [] || [] == [] ? 1 : 0
-	instance_class = "m4.2xlarge"
+  count          = [] == [] || [] == [] ? 1 : 0
+  instance_class = "m4.2xlarge"
 }`,
 			Expected: helper.Issues{
 				{
@@ -45,8 +51,8 @@ resource "aws_db_instance" "mysql" {
 					Message: "Comparing a collection with an empty list is invalid. To detect an empty collection, check its length.",
 					Range: hcl.Range{
 						Filename: "resource.tf",
-						Start:    hcl.Pos{Line: 3, Column: 10},
-						End:      hcl.Pos{Line: 3, Column: 18},
+						Start:    hcl.Pos{Line: 3, Column: 20},
+						End:      hcl.Pos{Line: 3, Column: 28},
 					},
 				},
 				{
@@ -54,18 +60,23 @@ resource "aws_db_instance" "mysql" {
 					Message: "Comparing a collection with an empty list is invalid. To detect an empty collection, check its length.",
 					Range: hcl.Range{
 						Filename: "resource.tf",
-						Start:    hcl.Pos{Line: 3, Column: 22},
-						End:      hcl.Pos{Line: 3, Column: 30},
+						Start:    hcl.Pos{Line: 3, Column: 32},
+						End:      hcl.Pos{Line: 3, Column: 40},
 					},
 				},
 			},
+			Fixed: `
+resource "aws_db_instance" "mysql" {
+  count          = length([]) == 0 || length([]) == 0 ? 1 : 0
+  instance_class = "m4.2xlarge"
+}`,
 		},
 		{
 			Name: "comparing with [] inside parenthesis is not recommended",
 			Content: `
 resource "aws_db_instance" "mysql" {
-	count = ([] == []) ? 1 : 0
-	instance_class = "m4.2xlarge"
+  count          = ([] == []) ? 1 : 0
+  instance_class = "m4.2xlarge"
 }`,
 			Expected: helper.Issues{
 				{
@@ -73,21 +84,26 @@ resource "aws_db_instance" "mysql" {
 					Message: "Comparing a collection with an empty list is invalid. To detect an empty collection, check its length.",
 					Range: hcl.Range{
 						Filename: "resource.tf",
-						Start:    hcl.Pos{Line: 3, Column: 11},
-						End:      hcl.Pos{Line: 3, Column: 19},
+						Start:    hcl.Pos{Line: 3, Column: 21},
+						End:      hcl.Pos{Line: 3, Column: 29},
 					},
 				},
 			},
+			Fixed: `
+resource "aws_db_instance" "mysql" {
+  count          = (length([]) == 0) ? 1 : 0
+  instance_class = "m4.2xlarge"
+}`,
 		},
 		{
 			Name: "negatively comparing with [] is not recommended",
 			Content: `
 variable "my_list" {
-	type = list(string)
+  type = list(string)
 }
 resource "aws_db_instance" "mysql" {
-	count = var.my_list != [] ? 1 : 0
-    instance_class = "m4.2xlarge"
+  count          = var.my_list != [] ? 1 : 0
+  instance_class = "m4.2xlarge"
 }`,
 			Expected: helper.Issues{
 				{
@@ -95,24 +111,65 @@ resource "aws_db_instance" "mysql" {
 					Message: "Comparing a collection with an empty list is invalid. To detect an empty collection, check its length.",
 					Range: hcl.Range{
 						Filename: "resource.tf",
-						Start:    hcl.Pos{Line: 6, Column: 10},
-						End:      hcl.Pos{Line: 6, Column: 27},
+						Start:    hcl.Pos{Line: 6, Column: 20},
+						End:      hcl.Pos{Line: 6, Column: 37},
 					},
 				},
 			},
+			Fixed: `
+variable "my_list" {
+  type = list(string)
+}
+resource "aws_db_instance" "mysql" {
+  count          = length(var.my_list) != 0 ? 1 : 0
+  instance_class = "m4.2xlarge"
+}`,
 		},
 		{
 			Name: "checking if length is 0 is recommended",
 			Content: `
 variable "my_list" {
-	type = list(string)
+  type = list(string)
 }
 resource "aws_db_instance" "mysql" {
-	count = length(var.my_list) == 0 ? 1 : 0
-	instance_class = "m4.2xlarge"
+  count          = length(var.my_list) == 0 ? 1 : 0
+  instance_class = "m4.2xlarge"
 }`,
 			Expected: helper.Issues{},
 		},
+		{
+			Name: "multiple comparisons with [] are not recommended",
+			Content: `
+resource "aws_db_instance" "mysql" {
+  count          = [] == ([] == [] ? [] : []) ? 1 : 0
+  instance_class = "m4.2xlarge"
+}`,
+			Expected: helper.Issues{
+				{
+					Rule:    NewTerraformEmptyListEqualityRule(),
+					Message: "Comparing a collection with an empty list is invalid. To detect an empty collection, check its length.",
+					Range: hcl.Range{
+						Filename: "resource.tf",
+						Start:    hcl.Pos{Line: 3, Column: 20},
+						End:      hcl.Pos{Line: 3, Column: 46},
+					},
+				},
+				{
+					Rule:    NewTerraformEmptyListEqualityRule(),
+					Message: "Comparing a collection with an empty list is invalid. To detect an empty collection, check its length.",
+					Range: hcl.Range{
+						Filename: "resource.tf",
+						Start:    hcl.Pos{Line: 3, Column: 27},
+						End:      hcl.Pos{Line: 3, Column: 35},
+					},
+				},
+			},
+			Fixed: `
+resource "aws_db_instance" "mysql" {
+  count          = length((length([]) == 0 ? [] : [])) == 0 ? 1 : 0
+  instance_class = "m4.2xlarge"
+}`,
+		},
 	}
 
 	rule := NewTerraformEmptyListEqualityRule()
@@ -126,6 +183,11 @@ resource "aws_db_instance" "mysql" {
 			}
 
 			helper.AssertIssues(t, tc.Expected, runner.Issues)
+			want := map[string]string{}
+			if tc.Fixed != "" {
+				want["resource.tf"] = tc.Fixed
+			}
+			helper.AssertChanges(t, want, runner.Changes())
 		})
 	}
 }
diff --git a/rules/terraform_required_providers.go b/rules/terraform_required_providers.go
index a96c4f9..a5c3773 100644
--- a/rules/terraform_required_providers.go
+++ b/rules/terraform_required_providers.go
@@ -6,6 +6,7 @@ import (
 	"github.com/hashicorp/hcl/v2"
 	tfaddr "github.com/hashicorp/terraform-registry-address"
 	"github.com/terraform-linters/tflint-plugin-sdk/hclext"
+	tfsdk "github.com/terraform-linters/tflint-plugin-sdk/terraform"
 	"github.com/terraform-linters/tflint-plugin-sdk/tflint"
 	"github.com/terraform-linters/tflint-ruleset-terraform/project"
 	"github.com/terraform-linters/tflint-ruleset-terraform/terraform"
@@ -186,10 +187,20 @@ func (r *TerraformRequiredProvidersRule) Check(rr tflint.Runner) error {
 		}
 
 		if val.Type() == cty.String {
-			if err := runner.EmitIssue(
+			if err := runner.EmitIssueWithFix(
 				r,
 				fmt.Sprintf("Legacy version constraint for provider %q in `required_providers`", name),
 				requiredProvider.Expr.Range(),
+				func(f tflint.Fixer) error {
+					if tfsdk.IsJSONFilename(requiredProvider.Expr.Range().Filename) {
+						return tflint.ErrFixNotSupported
+					}
+
+					return f.ReplaceText(requiredProvider.Expr.Range(), fmt.Sprintf(`{
+						source  = "hashicorp/%s" 
+						version = %s
+					}`, name, f.TextAt(requiredProvider.Expr.Range()).Bytes))
+				},
 			); err != nil {
 				return err
 			}
@@ -209,10 +220,26 @@ func (r *TerraformRequiredProvidersRule) Check(rr tflint.Runner) error {
 				continue
 			}
 		} else if *config.Source {
-			if err := runner.EmitIssue(
+			if err := runner.EmitIssueWithFix(
 				r,
 				fmt.Sprintf("Missing `source` for provider %q in `required_providers`", name),
 				requiredProvider.Expr.Range(),
+				func(f tflint.Fixer) error {
+					if tfsdk.IsJSONFilename(requiredProvider.Expr.Range().Filename) {
+						return tflint.ErrFixNotSupported
+					}
+
+					kvs, diags := hcl.ExprMap(requiredProvider.Expr)
+					if diags.HasErrors() {
+						return diags
+					}
+					if len(kvs) == 0 {
+						return f.ReplaceText(requiredProvider.Expr.Range(), fmt.Sprintf(`{
+							source = "hashicorp/%s"
+						}`, name))
+					}
+					return f.InsertTextBefore(kvs[0].Key.StartRange(), fmt.Sprintf(`source = "hashicorp/%s"`+"\n", name))
+				},
 			); err != nil {
 				return err
 			}
diff --git a/rules/terraform_required_providers_test.go b/rules/terraform_required_providers_test.go
index 8476d7a..388ef88 100644
--- a/rules/terraform_required_providers_test.go
+++ b/rules/terraform_required_providers_test.go
@@ -11,8 +11,10 @@ func Test_TerraformRequiredProvidersRule(t *testing.T) {
 	cases := []struct {
 		Name     string
 		Content  string
+		JSON     bool
 		Config   string
 		Expected helper.Issues
+		Fixed    string
 	}{
 		{
 			Name: "no version",
@@ -41,7 +43,7 @@ provider "template" {}
 			Name: "implicit provider - resource",
 			Content: `
 resource "random_string" "foo" {
-	length = 16
+  length = 16
 }
 `,
 			Expected: helper.Issues{
@@ -66,7 +68,7 @@ resource "random_string" "foo" {
 			Name: "implicit provider - data source",
 			Content: `
 data "template_file" "foo" {
-	template = ""
+  template = ""
 }
 `,
 			Expected: helper.Issues{
@@ -91,12 +93,12 @@ data "template_file" "foo" {
 			Name: "required_providers object",
 			Content: `
 terraform {
-	required_providers {
-		template = {
-			source  = "hashicorp/template"
-			version = "~> 2" 
-		}
-	}
+  required_providers {
+    template = {
+      source  = "hashicorp/template"
+      version = "~> 2" 
+    }
+  }
 }
 provider "template" {} 
 `,
@@ -106,9 +108,9 @@ provider "template" {}
 			Name: "legacy required_providers string",
 			Content: `
 terraform {
-	required_providers {
-		template = "~> 2"
-	}
+  required_providers {
+    template = "~> 2"
+  }
 }
 provider "template" {} 
 `,
@@ -120,25 +122,36 @@ provider "template" {}
 						Filename: "module.tf",
 						Start: hcl.Pos{
 							Line:   4,
-							Column: 14,
+							Column: 16,
 						},
 						End: hcl.Pos{
 							Line:   4,
-							Column: 20,
+							Column: 22,
 						},
 					},
 				},
 			},
+			Fixed: `
+terraform {
+  required_providers {
+    template = {
+      source  = "hashicorp/template"
+      version = "~> 2"
+    }
+  }
+}
+provider "template" {}
+`,
 		},
 		{
 			Name: "required_providers object missing version",
 			Content: `
 terraform {
-	required_providers {
-		template = {
-			source = "hashicorp/template"
-		}
-	}
+  required_providers {
+    template = {
+      source = "hashicorp/template"
+    }
+  }
 }
 
 provider "template" {} 
@@ -151,11 +164,11 @@ provider "template" {}
 						Filename: "module.tf",
 						Start: hcl.Pos{
 							Line:   4,
-							Column: 14,
+							Column: 16,
 						},
 						End: hcl.Pos{
 							Line:   6,
-							Column: 4,
+							Column: 6,
 						},
 					},
 				},
@@ -165,20 +178,20 @@ provider "template" {}
 			Name: "required_providers object missing version ignored",
 			Content: `
 terraform {
-	required_providers {
-		template = {
-			source = "hashicorp/template"
-		}
-	}
+  required_providers {
+    template = {
+      source = "hashicorp/template"
+    }
+  }
 }
 
 provider "template" {} 
 `,
 			Config: `
 rule "terraform_required_providers" {
-	enabled = true
+  enabled = true
 
-	version = false
+  version = false
 }
 `,
 			Expected: helper.Issues{},
@@ -187,11 +200,11 @@ rule "terraform_required_providers" {
 			Name: "required_providers object missing source",
 			Content: `
 terraform {
-	required_providers {
-		template = {
-			version = "~> 2"
-		}
-	}
+  required_providers {
+    template = {
+      version = "~> 2"
+    }
+  }
 }
 
 provider "template" {} 
@@ -204,34 +217,46 @@ provider "template" {}
 						Filename: "module.tf",
 						Start: hcl.Pos{
 							Line:   4,
-							Column: 14,
+							Column: 16,
 						},
 						End: hcl.Pos{
 							Line:   6,
-							Column: 4,
+							Column: 6,
 						},
 					},
 				},
 			},
+			Fixed: `
+terraform {
+  required_providers {
+    template = {
+      source  = "hashicorp/template"
+      version = "~> 2"
+    }
+  }
+}
+
+provider "template" {}
+`,
 		},
 		{
 			Name: "required_providers object missing source ignored",
 			Content: `
 terraform {
-	required_providers {
-		template = {
-			version = "~> 2"
-		}
-	}
+  required_providers {
+    template = {
+      version = "~> 2"
+    }
+  }
 }
 
 provider "template" {} 
 `,
 			Config: `
 rule "terraform_required_providers" {
-	enabled = true
+  enabled = true
 
-	source = false
+  source = false
 }
 `,
 			Expected: helper.Issues{},
@@ -240,9 +265,9 @@ rule "terraform_required_providers" {
 			Name: "required_providers empty object",
 			Content: `
 terraform {
-	required_providers {
-		template = {}
-	}
+  required_providers {
+    template = {}
+  }
 }
 
 provider "template" {} 
@@ -255,11 +280,11 @@ provider "template" {}
 						Filename: "module.tf",
 						Start: hcl.Pos{
 							Line:   4,
-							Column: 14,
+							Column: 16,
 						},
 						End: hcl.Pos{
 							Line:   4,
-							Column: 16,
+							Column: 18,
 						},
 					},
 				},
@@ -270,21 +295,32 @@ provider "template" {}
 						Filename: "module.tf",
 						Start: hcl.Pos{
 							Line:   4,
-							Column: 14,
+							Column: 16,
 						},
 						End: hcl.Pos{
 							Line:   4,
-							Column: 16,
+							Column: 18,
 						},
 					},
 				},
 			},
+			Fixed: `
+terraform {
+  required_providers {
+    template = {
+      source = "hashicorp/template"
+    }
+  }
+}
+
+provider "template" {}
+`,
 		},
 		{
 			Name: "single provider with alias",
 			Content: `
 provider "template" {
-	alias = "b"
+  alias = "b"
 }
 `,
 			Expected: helper.Issues{
@@ -311,14 +347,14 @@ provider "template" {
 terraform {
   required_providers {
     template = {
-			source = "hashicorp/template"
-			version = "~> 2"
-		}
+      source = "hashicorp/template"
+      version = "~> 2"
+    }
   }
 }
 
 provider "template" {
-	version = "~> 2"
+  version = "~> 2"
 } 
 `,
 			Expected: helper.Issues{
@@ -345,15 +381,15 @@ provider "template" {
 terraform {
   required_providers {
     template = {
-			source = "hashicorp/template"
-			version = "~> 2"
-			configuration_aliases = [template.alias]
-		}
+      source = "hashicorp/template"
+      version = "~> 2"
+      configuration_aliases = [template.alias]
+    }
   }
 }
 
 data "template_file" "foo" {
-	provider = template.alias
+  provider = template.alias
 }
 `,
 			Expected: helper.Issues{},
@@ -364,15 +400,15 @@ data "template_file" "foo" {
 terraform {
   required_providers {
     template = {
-			source = "hashicorp/template"
-			version = "~> 2"
-		}
+      source = "hashicorp/template"
+      version = "~> 2"
+    }
   }
 }
 
 provider "template" {
-	alias   = "foo"
-	version = "~> 2"
+  alias   = "foo"
+  version = "~> 2"
 } 
 `,
 			Expected: helper.Issues{
@@ -404,11 +440,11 @@ data "terraform_remote_state" "foo" {}
 			Name: "builtin provider",
 			Content: `
 terraform {
-	required_providers {
-		test = {
-			source = "terraform.io/builtin/test"
-		}
-	}
+  required_providers {
+    test = {
+      source = "terraform.io/builtin/test"
+    }
+  }
 }
 resource "test_assertions" "foo" {}
 `,
@@ -478,14 +514,51 @@ resource "google_compute_instance" "foo" {
 				},
 			},
 		},
+		{
+			Name: "JSON syntax",
+			Content: `
+{
+  "terraform": {
+    "required_providers": {
+      "template": "~> 2"
+	}
+  },
+  "provider": {
+    "template": {}
+  }
+}`,
+			JSON: true,
+			Expected: helper.Issues{
+				{
+					Rule:    NewTerraformRequiredProvidersRule(),
+					Message: "Legacy version constraint for provider \"template\" in `required_providers`",
+					Range: hcl.Range{
+						Filename: "module.tf.json",
+						Start: hcl.Pos{
+							Line:   5,
+							Column: 19,
+						},
+						End: hcl.Pos{
+							Line:   5,
+							Column: 25,
+						},
+					},
+				},
+			},
+		},
 	}
 
 	rule := NewTerraformRequiredProvidersRule()
 
 	for _, tc := range cases {
 		t.Run(tc.Name, func(t *testing.T) {
+			filename := "module.tf"
+			if tc.JSON {
+				filename += ".json"
+			}
+
 			runner := testRunner(t, map[string]string{
-				"module.tf":   tc.Content,
+				filename:      tc.Content,
 				".tflint.hcl": tc.Config,
 			})
 
@@ -494,6 +567,11 @@ resource "google_compute_instance" "foo" {
 			}
 
 			helper.AssertIssues(t, tc.Expected, runner.Runner.(*helper.Runner).Issues)
+			want := map[string]string{}
+			if tc.Fixed != "" {
+				want[filename] = tc.Fixed
+			}
+			helper.AssertChanges(t, want, runner.Runner.(*helper.Runner).Changes())
 		})
 	}
 }
diff --git a/rules/terraform_unused_declarations.go b/rules/terraform_unused_declarations.go
index 5387a7c..dc490ce 100644
--- a/rules/terraform_unused_declarations.go
+++ b/rules/terraform_unused_declarations.go
@@ -74,28 +74,31 @@ func (r *TerraformUnusedDeclarationsRule) Check(rr tflint.Runner) error {
 	}
 
 	for _, variable := range decl.Variables {
-		if err := runner.EmitIssue(
+		if err := runner.EmitIssueWithFix(
 			r,
 			fmt.Sprintf(`variable "%s" is declared but not used`, variable.Labels[0]),
 			variable.DefRange,
+			func(f tflint.Fixer) error { return f.RemoveExtBlock(variable) },
 		); err != nil {
 			return err
 		}
 	}
 	for _, data := range decl.DataResources {
-		if err := runner.EmitIssue(
+		if err := runner.EmitIssueWithFix(
 			r,
 			fmt.Sprintf(`data "%s" "%s" is declared but not used`, data.Labels[0], data.Labels[1]),
 			data.DefRange,
+			func(f tflint.Fixer) error { return f.RemoveExtBlock(data) },
 		); err != nil {
 			return err
 		}
 	}
 	for _, local := range decl.Locals {
-		if err := runner.EmitIssue(
+		if err := runner.EmitIssueWithFix(
 			r,
 			fmt.Sprintf(`local.%s is declared but not used`, local.Name),
 			local.DefRange,
+			func(f tflint.Fixer) error { return f.RemoveAttribute(local.Attribute) },
 		); err != nil {
 			return err
 		}
diff --git a/rules/terraform_unused_declarations_test.go b/rules/terraform_unused_declarations_test.go
index 71c3272..f66bdff 100644
--- a/rules/terraform_unused_declarations_test.go
+++ b/rules/terraform_unused_declarations_test.go
@@ -13,6 +13,7 @@ func Test_TerraformUnusedDeclarationsRule(t *testing.T) {
 		Content  string
 		JSON     bool
 		Expected helper.Issues
+		Fixed    string
 	}{
 		{
 			Name: "unused variable",
@@ -32,6 +33,10 @@ output "u" { value = var.used }
 					},
 				},
 			},
+			Fixed: `
+variable "used" {}
+output "u" { value = var.used }
+`,
 		},
 		{
 			Name: "unused data source",
@@ -51,13 +56,17 @@ output "u" { value = data.null_data_source.used }
 					},
 				},
 			},
+			Fixed: `
+data "null_data_source" "used" {}
+output "u" { value = data.null_data_source.used }
+`,
 		},
 		{
 			Name: "unused local source",
 			Content: `
 locals {
-	not_used = ""
-	used = ""
+  not_used = ""
+  used = ""
 }
 output "u" { value = local.used }
 `,
@@ -67,20 +76,26 @@ output "u" { value = local.used }
 					Message: `local.not_used is declared but not used`,
 					Range: hcl.Range{
 						Filename: "config.tf",
-						Start:    hcl.Pos{Line: 3, Column: 2},
-						End:      hcl.Pos{Line: 3, Column: 15},
+						Start:    hcl.Pos{Line: 3, Column: 3},
+						End:      hcl.Pos{Line: 3, Column: 16},
 					},
 				},
 			},
+			Fixed: `
+locals {
+  used = ""
+}
+output "u" { value = local.used }
+`,
 		},
 		{
 			Name: "variable used in resource",
 			Content: `
 variable "used" {}
 resource "null_resource" "n" {
-	triggers = {
-		u = var.used
-	}
+  triggers = {
+    u = var.used
+  }
 }
 `,
 			Expected: helper.Issues{},
@@ -90,8 +105,8 @@ resource "null_resource" "n" {
 			Content: `
 variable "used" {}
 module "m" {
-	source = "./module"
-	u = var.used
+  source = "./module"
+  u = var.used
 }
 `,
 			Expected: helper.Issues{},
@@ -101,8 +116,8 @@ module "m" {
 			Content: `
 variable "used" {}
 module "m" {
-	source = "./module"
-	u = var.used
+  source = "./module"
+  u = var.used
 }
 `,
 			Expected: helper.Issues{},
@@ -112,8 +127,8 @@ module "m" {
 			Content: `
 locals { used = "used" }
 module "m" {
-	source = "./module"
-	u = local.used
+  source = "./module"
+  u = local.used
 }
 `,
 			Expected: helper.Issues{},
@@ -123,7 +138,7 @@ module "m" {
 			Content: `
 variable "aws_region" {}
 provider "aws" {
-	region = var.aws_region
+  region = var.aws_region
 }
 `,
 			Expected: helper.Issues{},
@@ -135,8 +150,8 @@ variable "used" {}
 resource "null_resource" "n" {
   triggers = {
     u = var.used
-	}
-  
+  }
+
   lifecycle {
     ignore_changes = [triggers]
   }
@@ -152,14 +167,14 @@ resource "null_resource" "n" {
 			Name: "additional traversal",
 			Content: `
 variable "v" {
-	type = object({ foo = string })
+  type = object({ foo = string })
 }
 output "v" {
-	value = var.v.foo
+  value = var.v.foo
 }
 data "terraform_remote_state" "d" {}
 output "d" {
-	value = data.terraform_remote_state.d.outputs.foo
+  value = data.terraform_remote_state.d.outputs.foo
 }
 `,
 			Expected: helper.Issues{},
@@ -177,13 +192,34 @@ output "d" {
         }]
       }
     }
-	},
+  },
   "variable": {
     "again": {}
   }
 }`,
 			Expected: helper.Issues{},
 		},
+		{
+			Name: "json with unused variable",
+			JSON: true,
+			Content: `
+{
+  "variable": {
+    "again": {}
+  }
+}`,
+			Expected: helper.Issues{
+				{
+					Rule:    NewTerraformUnusedDeclarationsRule(),
+					Message: `variable "again" is declared but not used`,
+					Range: hcl.Range{
+						Filename: "config.tf.json",
+						Start:    hcl.Pos{Line: 4, Column: 14},
+						End:      hcl.Pos{Line: 4, Column: 15},
+					},
+				},
+			},
+		},
 	}
 
 	rule := NewTerraformUnusedDeclarationsRule()
@@ -201,7 +237,14 @@ output "d" {
 				t.Fatalf("Unexpected error occurred: %s", err)
 			}
 
-			helper.AssertIssues(t, tc.Expected, runner.Runner.(*helper.Runner).Issues)
+			helperRunner := runner.Runner.(*helper.Runner)
+
+			helper.AssertIssues(t, tc.Expected, helperRunner.Issues)
+			want := map[string]string{}
+			if tc.Fixed != "" {
+				want[filename] = tc.Fixed
+			}
+			helper.AssertChanges(t, want, helperRunner.Changes())
 		})
 	}
 }
diff --git a/terraform/ruleset.go b/terraform/ruleset.go
index 4c7d037..9b66d88 100644
--- a/terraform/ruleset.go
+++ b/terraform/ruleset.go
@@ -107,14 +107,7 @@ func (r *RuleSet) ApplyConfig(body *hclext.BodyContent) error {
 	return nil
 }
 
-// Check runs inspection for each rule by applying Runner.
-func (r *RuleSet) Check(rr tflint.Runner) error {
-	runner := NewRunner(rr)
-
-	for _, rule := range r.EnabledRules {
-		if err := rule.Check(runner); err != nil {
-			return fmt.Errorf("Failed to check `%s` rule: %s", rule.Name(), err)
-		}
-	}
-	return nil
+// NewRunner injects a custom runner
+func (r *RuleSet) NewRunner(runner tflint.Runner) (tflint.Runner, error) {
+	return NewRunner(runner), nil
 }
diff --git a/terraform/runner.go b/terraform/runner.go
index 48f1ab4..48d41c4 100644
--- a/terraform/runner.go
+++ b/terraform/runner.go
@@ -93,8 +93,9 @@ func (r *Runner) GetLocals() (map[string]*Local, hcl.Diagnostics) {
 
 			for name, attr := range attrs {
 				locals[name] = &Local{
-					Name:     attr.Name,
-					DefRange: attr.Range,
+					Name:      attr.Name,
+					Attribute: attr,
+					DefRange:  attr.Range,
 				}
 			}
 		}
diff --git a/terraform/runner_test.go b/terraform/runner_test.go
index 1f630ea..e7bd206 100644
--- a/terraform/runner_test.go
+++ b/terraform/runner_test.go
@@ -165,6 +165,7 @@ locals {
 
 			opts := []cmp.Option{
 				cmpopts.IgnoreFields(hcl.Pos{}, "Byte"),
+				cmpopts.IgnoreFields(Local{}, "Attribute"),
 			}
 			if diff := cmp.Diff(got, test.want, opts...); diff != "" {
 				t.Error(diff)
diff --git a/terraform/terraform.go b/terraform/terraform.go
index a35ec68..c919c5a 100644
--- a/terraform/terraform.go
+++ b/terraform/terraform.go
@@ -59,8 +59,9 @@ func decodeModuleCall(block *hclext.Block) (*ModuleCall, hcl.Diagnostics) {
 
 // Local represents a single entry from a "locals" block.
 type Local struct {
-	Name     string
-	DefRange hcl.Range
+	Name      string
+	Attribute *hcl.Attribute
+	DefRange  hcl.Range
 }
 
 // ProviderRef represents a reference to a provider like `provider = google.europe` in a resource or module.