Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/no-doubled-joshi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ const report: TextlintRuleModule<Options> = function (context, options = {}) {
}
// strict mode ではない時例外を除去する
if (!isStrict) {
if (matchExceptionRule(joshiTokenSurfaceTokens, tokens)) {
if (matchExceptionRule(joshiTokenSurfaceTokens, concatedJoshiTokens)) {
return;
}
}
Expand All @@ -292,11 +292,11 @@ const report: TextlintRuleModule<Options> = function (context, options = {}) {
if (differenceIndex <= minInterval) {
// 連続する助詞を集める
const startWord = toTextWithPrevWord(prev, {
tokens: tokens,
tokens: concatedJoshiTokens,
sentence: sentence
});
const endWord = toTextWithPrevWord(current, {
tokens: tokens,
tokens: concatedJoshiTokens,
sentence: sentence
});
// padding positionを計算する
Expand Down
12 changes: 7 additions & 5 deletions src/token-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,19 @@ export const create読点Matcher = (commaCharacters: string[]) => {
* @returns {Object}
*/
const concatToken = (aToken: KuromojiToken, bToken: KuromojiToken) => {
aToken.surface_form += bToken.surface_form;
aToken.pos += bToken.pos;
aToken.pos_detail_1 += bToken.surface_form;
return aToken;
return {
...aToken,
surface_form: aToken.surface_form + bToken.surface_form,
pos: aToken.pos + bToken.pos,
pos_detail_1: aToken.pos_detail_1 + bToken.surface_form
};
};
/**
* 助詞+助詞 というように連続しているtokenを結合し直したtokenの配列を返す
* @param {Array} tokens
* @returns {Array}
*/
export const concatJoishiTokens = (tokens: KuromojiToken[]) => {
export const concatJoishiTokens = (tokens: readonly KuromojiToken[]) => {
const newTokens: KuromojiToken[] = [];
tokens.forEach((token) => {
const prevToken = newTokens[newTokens.length - 1];
Expand Down