Skip to content

Commit 4a0380f

Browse files
committed
working on linting
1 parent f372e7a commit 4a0380f

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

packages/components/src/modifiers/hds-code-editor.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,12 @@ import { assert, warn } from '@ember/debug';
88
import { registerDestructor } from '@ember/destroyable';
99
import { task } from 'ember-concurrency';
1010
import config from 'ember-get-config';
11+
<<<<<<< HEAD
1112
import { Compartment } from '@codemirror/state';
1213
import { EditorView } from '@codemirror/view';
14+
=======
15+
import { linter } from '@codemirror/lint';
16+
>>>>>>> d7925fb42 (working on linting)
1317

1418
// hds-dark theme
1519
import hdsDarkTheme from './hds-code-editor/themes/hds-dark-theme.ts';
@@ -318,7 +322,7 @@ export default class HdsCodeEditorModifier extends Modifier<HdsCodeEditorSignatu
318322

319323
let lintingExtensions: Extension[] = [];
320324

321-
if (isLintingEnabled && language === 'json') {
325+
if (isLintingEnabled) {
322326
const [{ linter, lintGutter }, { syntaxTree }] = await Promise.all([
323327
import('@codemirror/lint'),
324328
import('@codemirror/language'),
@@ -362,7 +366,7 @@ export default class HdsCodeEditorModifier extends Modifier<HdsCodeEditorSignatu
362366
];
363367

364368
if (languageExtension !== undefined) {
365-
extensions = [languageExtension, ...extensions];
369+
extensions = [...extensions, languageExtension];
366370
}
367371

368372
if (lintingExtensions.length !== 0) {

showcase/app/controllers/components/code-editor.js

+9
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ export default class CodeEditorController extends Controller {
1717
{
1818
value: 'rego',
1919
label: 'Rego',
20+
isLintingEnabled: true,
2021
code: `package example.test
2122
import data.users
2223
@@ -36,6 +37,7 @@ deny { base64.decode(input.encoded) == "decoded" }
3637
{
3738
value: 'ruby',
3839
label: 'Ruby',
40+
isLintingEnabled: true,
3941
code: `require 'date'
4042
4143
file_name = 'example_file.txt'
@@ -51,6 +53,7 @@ end`,
5153
{
5254
value: 'shell',
5355
label: 'Shell',
56+
isLintingEnabled: true,
5457
code: `DIR="example_directory"
5558
LOG_FILE="script.log"
5659
@@ -64,6 +67,7 @@ fi`,
6467
{
6568
value: 'go',
6669
label: 'Go',
70+
isLintingEnabled: true,
6771
code: `package main
6872
6973
import "fmt"
@@ -76,6 +80,7 @@ func main() {
7680
{
7781
value: 'hcl',
7882
label: 'HCL',
83+
isLintingEnabled: true,
7984
code: `variable "region" {
8085
type = string
8186
default = "us-west-1"
@@ -84,6 +89,7 @@ func main() {
8489
{
8590
value: 'javascript',
8691
label: 'JavaScript',
92+
isLintingEnabled: true,
8793
code: `const message = 'Hello, world!';
8894
8995
function sayMessage() {
@@ -106,6 +112,7 @@ sayMessage();
106112
{
107113
value: 'sentinel',
108114
label: 'Sentinel',
115+
isLintingEnabled: true,
109116
code: `param allowed_regions = ["us-east-1", "us-west-2"]
110117
111118
main = rule { all tfplan.resources[*].instances as r { r.attributes.region in allowed_regions } }
@@ -114,13 +121,15 @@ main = rule { all tfplan.resources[*].instances as r { r.attributes.region in al
114121
{
115122
value: 'sql',
116123
label: 'SQL',
124+
isLintingEnabled: true,
117125
code: `SELECT 'Hello, world!';
118126
SELECT 'Welcome to SQL!';
119127
SELECT 'Enjoy coding!';`,
120128
},
121129
{
122130
value: 'yaml',
123131
label: 'YAML',
132+
isLintingEnabled: true,
124133
code: `app_config:
125134
name: ExampleApp
126135
version: 1.0.0

0 commit comments

Comments
 (0)