Skip to content

add missing eof line support #11

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Feb 28, 2023
Merged

add missing eof line support #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
720e971
add missing eof line support
zmully Feb 25, 2023
99437fc
run prettier
zmully Feb 25, 2023
3cab7cb
change to message line, update readme
zmully Feb 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 116 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,122 @@ index 0e05564..aa39060 100644

<!-- end:deleted-line-output -->

<!-- start:message-line-input -->

```diff
diff --git a/rename.md b/rename.md
index 0e05564..aa39060 100644
--- a/rename.md
+++ b/rename.md
@@ -1,2 +1 @@
newfile
-newline
+newline
\ No newline at end of file
diff --git a/rename2.md b/rename2.md
index 0e05564..aa39060 100644
--- a/rename2.md
+++ b/rename2.md
@@ -1,2 +1 @@
newfile2
-newline2
+newline2
\ No newline at end of file

```

<!-- end:message-line-input -->

<!-- start:message-line-output -->

```json
{
"type": "GitDiff",
"files": [
{
"type": "ChangedFile",
"chunks": [
{
"type": "Chunk",
"toFileRange": {
"start": 1,
"lines": 1
},
"fromFileRange": {
"start": 1,
"lines": 2
},
"changes": [
{
"type": "UnchangedLine",
"lineBefore": 1,
"lineAfter": 1,
"content": "newfile"
},
{
"type": "DeletedLine",
"lineBefore": 2,
"content": "newline"
},
{
"type": "AddedLine",
"lineAfter": 2,
"content": "newline"
},
{
"type": "MessageLine",
"content": "No newline at end of file"
}
]
}
],
"path": "rename.md"
},
{
"type": "ChangedFile",
"chunks": [
{
"type": "Chunk",
"toFileRange": {
"start": 1,
"lines": 1
},
"fromFileRange": {
"start": 1,
"lines": 2
},
"changes": [
{
"type": "UnchangedLine",
"lineBefore": 1,
"lineAfter": 1,
"content": "newfile2"
},
{
"type": "DeletedLine",
"lineBefore": 2,
"content": "newline2"
},
{
"type": "AddedLine",
"lineAfter": 2,
"content": "newline2"
},
{
"type": "MessageLine",
"content": "No newline at end of file"
}
]
}
],
"path": "rename2.md"
}
]
}
```

<!-- end:message-line-output -->

</details>

## AST Format
Expand Down
1 change: 1 addition & 0 deletions scripts/build-readme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const FIXTURES = [
'conflict-file',
'new-line',
'deleted-line',
'message-line',
];

let readmeReplacer = replacer().content(README_INPUT);
Expand Down
18 changes: 18 additions & 0 deletions src/__fixtures__/message-line
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
diff --git a/rename.md b/rename.md
index 0e05564..aa39060 100644
--- a/rename.md
+++ b/rename.md
@@ -1,2 +1 @@
newfile
-newline
+newline
\ No newline at end of file
diff --git a/rename2.md b/rename2.md
index 0e05564..aa39060 100644
--- a/rename2.md
+++ b/rename2.md
@@ -1,2 +1 @@
newfile2
-newline2
+newline2
\ No newline at end of file
87 changes: 87 additions & 0 deletions src/__tests__/__snapshots__/message-line.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`message-line parse \`message-line\` 1`] = `
{
"files": [
{
"chunks": [
{
"changes": [
{
"content": "newfile",
"lineAfter": 1,
"lineBefore": 1,
"type": "UnchangedLine",
},
{
"content": "newline",
"lineBefore": 2,
"type": "DeletedLine",
},
{
"content": "newline",
"lineAfter": 2,
"type": "AddedLine",
},
{
"content": "No newline at end of file",
"type": "MessageLine",
},
],
"fromFileRange": {
"lines": 2,
"start": 1,
},
"toFileRange": {
"lines": 1,
"start": 1,
},
"type": "Chunk",
},
],
"path": "rename.md",
"type": "ChangedFile",
},
{
"chunks": [
{
"changes": [
{
"content": "newfile2",
"lineAfter": 1,
"lineBefore": 1,
"type": "UnchangedLine",
},
{
"content": "newline2",
"lineBefore": 2,
"type": "DeletedLine",
},
{
"content": "newline2",
"lineAfter": 2,
"type": "AddedLine",
},
{
"content": "No newline at end of file",
"type": "MessageLine",
},
],
"fromFileRange": {
"lines": 2,
"start": 1,
},
"toFileRange": {
"lines": 1,
"start": 1,
},
"type": "Chunk",
},
],
"path": "rename2.md",
"type": "ChangedFile",
},
],
"type": "GitDiff",
}
`;
10 changes: 10 additions & 0 deletions src/__tests__/message-line.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { getFixture } from './test-utils';
import parseGitDiff from '../parse-git-diff';

describe('message-line', () => {
const fixture = getFixture('message-line');

it('parse `message-line`', () => {
expect(parseGitDiff(fixture)).toMatchSnapshot();
});
});
1 change: 1 addition & 0 deletions src/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ export const LineType = {
Added: 'AddedLine',
Deleted: 'DeletedLine',
Unchanged: 'UnchangedLine',
Message: 'MessageLine',
} as const;

export const FileType = {
Expand Down
8 changes: 8 additions & 0 deletions src/parse-git-diff.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ const CHAR_TYPE_MAP: Record<string, LineType> = {
'+': LineType.Added,
'-': LineType.Deleted,
' ': LineType.Unchanged,
'\\': LineType.Message,
};

function parseChanges(
Expand Down Expand Up @@ -291,6 +292,13 @@ function parseChanges(
};
break;
}
case LineType.Message: {
change = {
type,
content: content.trim(),
};
break;
}
}
changes.push(change);
}
Expand Down
10 changes: 9 additions & 1 deletion src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,15 @@ export interface UnchangedLine extends BaseChange<typeof LineType.Unchanged> {
lineAfter: number;
}

export type AnyLineChange = AddedLine | DeletedLine | UnchangedLine;
export interface MessageLine extends BaseChange<typeof LineType.Message> {
content: string;
}

export type AnyLineChange =
| AddedLine
| DeletedLine
| UnchangedLine
| MessageLine;

export interface ChunkRange {
start: number;
Expand Down