mirror of
https://github.com/mermaid-js/mermaid.git
synced 2025-01-28 07:03:17 +08:00
fixed hash error loc & line properties
This commit is contained in:
parent
2a38d46fd9
commit
38e048b94e
@ -145,8 +145,6 @@ export const merge = (
|
|||||||
error.hash = {
|
error.hash = {
|
||||||
text: `merge ${otherBranch}`,
|
text: `merge ${otherBranch}`,
|
||||||
token: `merge ${otherBranch}`,
|
token: `merge ${otherBranch}`,
|
||||||
line: '1',
|
|
||||||
loc: { first_line: 1, last_line: 1, first_column: 1, last_column: 1 },
|
|
||||||
expected: ['branch abc'],
|
expected: ['branch abc'],
|
||||||
};
|
};
|
||||||
throw error;
|
throw error;
|
||||||
@ -158,8 +156,6 @@ export const merge = (
|
|||||||
error.hash = {
|
error.hash = {
|
||||||
text: `merge ${otherBranch}`,
|
text: `merge ${otherBranch}`,
|
||||||
token: `merge ${otherBranch}`,
|
token: `merge ${otherBranch}`,
|
||||||
line: '1',
|
|
||||||
loc: { first_line: 1, last_line: 1, first_column: 1, last_column: 1 },
|
|
||||||
expected: ['commit'],
|
expected: ['commit'],
|
||||||
};
|
};
|
||||||
throw error;
|
throw error;
|
||||||
@ -171,8 +167,6 @@ export const merge = (
|
|||||||
error.hash = {
|
error.hash = {
|
||||||
text: `merge ${otherBranch}`,
|
text: `merge ${otherBranch}`,
|
||||||
token: `merge ${otherBranch}`,
|
token: `merge ${otherBranch}`,
|
||||||
line: '1',
|
|
||||||
loc: { first_line: 1, last_line: 1, first_column: 1, last_column: 1 },
|
|
||||||
expected: [`branch ${otherBranch}`],
|
expected: [`branch ${otherBranch}`],
|
||||||
};
|
};
|
||||||
throw error;
|
throw error;
|
||||||
@ -184,8 +178,6 @@ export const merge = (
|
|||||||
error.hash = {
|
error.hash = {
|
||||||
text: `merge ${otherBranch}`,
|
text: `merge ${otherBranch}`,
|
||||||
token: `merge ${otherBranch}`,
|
token: `merge ${otherBranch}`,
|
||||||
line: '1',
|
|
||||||
loc: { first_line: 1, last_line: 1, first_column: 1, last_column: 1 },
|
|
||||||
expected: ['"commit"'],
|
expected: ['"commit"'],
|
||||||
};
|
};
|
||||||
throw error;
|
throw error;
|
||||||
@ -195,8 +187,6 @@ export const merge = (
|
|||||||
error.hash = {
|
error.hash = {
|
||||||
text: `merge ${otherBranch}`,
|
text: `merge ${otherBranch}`,
|
||||||
token: `merge ${otherBranch}`,
|
token: `merge ${otherBranch}`,
|
||||||
line: '1',
|
|
||||||
loc: { first_line: 1, last_line: 1, first_column: 1, last_column: 1 },
|
|
||||||
expected: ['branch abc'],
|
expected: ['branch abc'],
|
||||||
};
|
};
|
||||||
throw error;
|
throw error;
|
||||||
@ -210,8 +200,6 @@ export const merge = (
|
|||||||
error.hash = {
|
error.hash = {
|
||||||
text: `merge ${otherBranch} ${customId} ${overrideType} ${customTags?.join(' ')}`,
|
text: `merge ${otherBranch} ${customId} ${overrideType} ${customTags?.join(' ')}`,
|
||||||
token: `merge ${otherBranch} ${customId} ${overrideType} ${customTags?.join(' ')}`,
|
token: `merge ${otherBranch} ${customId} ${overrideType} ${customTags?.join(' ')}`,
|
||||||
line: '1',
|
|
||||||
loc: { first_line: 1, last_line: 1, first_column: 1, last_column: 1 },
|
|
||||||
expected: [
|
expected: [
|
||||||
`merge ${otherBranch} ${customId}_UNIQUE ${overrideType} ${customTags?.join(' ')}`,
|
`merge ${otherBranch} ${customId}_UNIQUE ${overrideType} ${customTags?.join(' ')}`,
|
||||||
],
|
],
|
||||||
@ -262,8 +250,6 @@ export const cherryPick = function (
|
|||||||
error.hash = {
|
error.hash = {
|
||||||
text: `cherryPick ${sourceId} ${targetId}`,
|
text: `cherryPick ${sourceId} ${targetId}`,
|
||||||
token: `cherryPick ${sourceId} ${targetId}`,
|
token: `cherryPick ${sourceId} ${targetId}`,
|
||||||
line: '1',
|
|
||||||
loc: { first_line: 1, last_line: 1, first_column: 1, last_column: 1 },
|
|
||||||
expected: ['cherry-pick abc'],
|
expected: ['cherry-pick abc'],
|
||||||
};
|
};
|
||||||
throw error;
|
throw error;
|
||||||
@ -324,7 +310,6 @@ export const cherryPick = function (
|
|||||||
error.hash = {
|
error.hash = {
|
||||||
text: `cherryPick ${sourceId} ${targetId}`,
|
text: `cherryPick ${sourceId} ${targetId}`,
|
||||||
token: `cherryPick ${sourceId} ${targetId}`,
|
token: `cherryPick ${sourceId} ${targetId}`,
|
||||||
line: '1',
|
|
||||||
expected: ['cherry-pick abc'],
|
expected: ['cherry-pick abc'],
|
||||||
};
|
};
|
||||||
throw error;
|
throw error;
|
||||||
@ -361,8 +346,6 @@ export const checkout = function (branch: string) {
|
|||||||
error.hash = {
|
error.hash = {
|
||||||
text: `checkout ${branch}`,
|
text: `checkout ${branch}`,
|
||||||
token: `checkout ${branch}`,
|
token: `checkout ${branch}`,
|
||||||
line: '1',
|
|
||||||
loc: { first_line: 1, last_line: 1, first_column: 1, last_column: 1 },
|
|
||||||
expected: [`branch ${branch}`],
|
expected: [`branch ${branch}`],
|
||||||
};
|
};
|
||||||
throw error;
|
throw error;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user