Skip to content

Commit

Permalink
Merge pull request #528 from typed-ember/avoid-code-duplication
Browse files Browse the repository at this point in the history
  • Loading branch information
@dfreeman
dfreeman authored Jan 27, 2023
2 parents cc1a9f4 + dd01dce commit 4e06085
Show file tree
Hide file tree
Showing 7 changed files with 67 additions and 57 deletions.
13 changes: 8 additions & 5 deletions packages/core/__tests__/language-server/custom-extensions.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ describe('Language Server: custom file extensions', () => {
},
},
"severity": 1,
"source": "glint:ts(2322)",
"source": "glint",
"tags": [],
},
]
Expand All @@ -61,7 +61,7 @@ describe('Language Server: custom file extensions', () => {
},
},
"severity": 1,
"source": "glint:ts(2322)",
"source": "glint",
"tags": [],
},
]
Expand Down Expand Up @@ -170,7 +170,8 @@ describe('Language Server: custom file extensions', () => {

expect(diagnostics).toMatchObject([
{
source: 'glint:ts(2307)',
source: 'glint',
code: 2307,
range: {
start: { line: 0, character: 27 },
end: { line: 0, character: 36 },
Expand Down Expand Up @@ -198,7 +199,8 @@ describe('Language Server: custom file extensions', () => {
expect(diagnostics).toMatchObject([
{
message: "Cannot find module './other' or its corresponding type declarations.",
source: 'glint:ts(2307)',
source: 'glint',
code: 2307,
},
]);

Expand Down Expand Up @@ -246,7 +248,8 @@ describe('Language Server: custom file extensions', () => {
expect(diagnostics).toMatchObject([
{
message: "Cannot find module './other' or its corresponding type declarations.",
source: 'glint:ts(2307)',
source: 'glint',
code: 2307,
},
]);
});
Expand Down
74 changes: 37 additions & 37 deletions packages/core/__tests__/language-server/diagnostic-augmentation.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2554)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -85,7 +85,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2554)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -102,7 +102,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2554)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -119,7 +119,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2555)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -136,7 +136,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2554)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -153,7 +153,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2554)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -170,7 +170,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2555)",
"source": "glint",
"tags": [],
},
]
Expand Down Expand Up @@ -224,7 +224,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2322)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -242,7 +242,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2345)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -260,7 +260,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2345)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -278,7 +278,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2345)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -296,7 +296,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2322)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -314,7 +314,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2345)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -332,7 +332,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2345)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -350,7 +350,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2345)",
"source": "glint",
"tags": [],
},
]
Expand Down Expand Up @@ -412,7 +412,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2769)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -429,7 +429,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2769)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -446,7 +446,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2769)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -463,7 +463,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2769)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -480,7 +480,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2769)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -497,7 +497,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2769)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -514,7 +514,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2769)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -531,7 +531,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2769)",
"source": "glint",
"tags": [],
},
]
Expand Down Expand Up @@ -583,7 +583,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(7053)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -602,7 +602,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(7053)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -621,7 +621,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(7053)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -640,7 +640,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(7053)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -658,7 +658,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(7053)",
"source": "glint",
"tags": [],
},
]
Expand Down Expand Up @@ -714,7 +714,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2769)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -736,7 +736,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2769)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -758,7 +758,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2769)",
"source": "glint",
"tags": [],
},
]
Expand Down Expand Up @@ -819,7 +819,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2345)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -837,7 +837,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2345)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -856,7 +856,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2345)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -874,7 +874,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(2345)",
"source": "glint",
"tags": [],
},
]
Expand Down Expand Up @@ -919,7 +919,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(4111)",
"source": "glint",
"tags": [],
},
{
Expand All @@ -936,7 +936,7 @@ describe('Language Server: Diagnostic Augmentation', () => {
},
},
"severity": 1,
"source": "glint:ts(4111)",
"source": "glint",
"tags": [],
},
]
Expand Down
Loading

0 comments on commit 4e06085

Please sign in to comment.