Compare commits

...

24 Commits
4.7.1 ... 4.9.0

Author SHA1 Message Date
a8017369d0 4.9.0 2018-06-23 23:04:49 +09:00
3f0b5e4318 ✌️ 2018-06-23 23:03:25 +09:00
aea8f93e02 Merge branch 'master' of https://github.com/syuilo/misskey 2018-06-23 22:55:57 +09:00
874411990b ✌️ 2018-06-23 22:55:32 +09:00
780268f70e Merge pull request #1771 from syuilo/patch-1
Use capital letters for othello label
2018-06-23 22:50:53 +09:00
3a8a374e87 Use capital letters for othello label 2018-06-23 22:25:22 +09:00
488f36d491 i18n 2018-06-23 21:56:47 +09:00
4d48b0be99 Fix type 2018-06-23 21:48:36 +09:00
44f3888c24 スペイン語を追加 2018-06-23 19:57:23 +09:00
a76fb4c173 i18n 2018-06-23 19:35:19 +09:00
e4aa003157 MFM: Improve search syntax 2018-06-23 19:31:28 +09:00
247f334334 Fix 2018-06-23 19:18:14 +09:00
509cdae832 Fix bug 2018-06-23 19:16:50 +09:00
5ff59b3339 4.8.0 2018-06-23 17:00:28 +09:00
2b1a785f24 きゃー 2018-06-23 16:58:54 +09:00
2c0b137848 リバーシのラベルを表示できるように 2018-06-23 16:55:52 +09:00
ef68e633cf Merge pull request #1768 from syuilo/greenkeeper/eslint-5.0.0
Update eslint to the latest version 🚀
2018-06-23 12:11:49 +09:00
e9e63ba950 Merge pull request #1767 from syuilo/greenkeeper/hard-source-webpack-plugin-0.9.0
Update hard-source-webpack-plugin to the latest version 🚀
2018-06-23 12:11:31 +09:00
3fd6167e71 Merge pull request #1766 from syuilo/greenkeeper/@types/node-10.3.5
Update @types/node to the latest version 🚀
2018-06-23 12:11:15 +09:00
6b0573ded1 Merge pull request #1769 from syuilo/greenkeeper/ts-node-7.0.0
fix(package): update ts-node to version 7.0.0
2018-06-23 12:11:08 +09:00
e2c3d4f2fb fix(package): update eslint to version 5.0.0 2018-06-23 02:46:37 +00:00
60229d73c9 fix(package): update hard-source-webpack-plugin to version 0.9.0 2018-06-23 02:35:38 +00:00
c6cbadc514 fix(package): update @types/node to version 10.3.5 2018-06-23 00:27:09 +00:00
3c3c67a34c fix(package): update ts-node to version 7.0.0
Closes #1765
2018-06-22 19:17:54 +00:00
17 changed files with 283 additions and 143 deletions

View File

@ -5,7 +5,7 @@
import * as fs from 'fs';
import * as yaml from 'js-yaml';
export type LangKey = 'de' | 'en' | 'fr' | 'ja' | 'pl';
export type LangKey = 'de' | 'en' | 'fr' | 'ja' | 'pl' | 'es';
export type LocaleObject = { [key: string]: any };
const loadLang = (lang: LangKey) => yaml.safeLoad(
@ -18,7 +18,8 @@ const langs: { [key: string]: LocaleObject } = {
'en': loadLang('en'),
'fr': loadLang('fr'),
'ja': native,
'pl': loadLang('pl')
'pl': loadLang('pl'),
'es': loadLang('es')
};
Object.entries(langs).map(([, locale]) => {

View File

@ -47,6 +47,7 @@ common:
e: "ここに書いてください"
f: "あなたが書くのを待っています..."
search: "検索"
delete: "削除"
loading: "読み込み中"
ok: "わかった"
@ -54,6 +55,14 @@ common:
update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
reversi:
drawn: "引き分け"
my-turn: "あなたのターンです"
opponent-turn: "相手のターンです"
turn-of: "{}のターンです"
past-turn-of: "{}のターン"
widgets:
analog-clock: "アナログ時計"
@ -750,6 +759,12 @@ desktop/views/pages/user/user.profile.vue:
muted: "ミュートしています"
unmute: "ミュート解除"
desktop/views/pages/user/user.header.vue:
posts: "投稿"
following: "フォロー"
followers: "フォロワー"
is-bot: "このアカウントはBotです"
desktop/views/pages/user/user.timeline.vue:
default: "投稿"
with-replies: "投稿と返信"

View File

@ -1,8 +1,8 @@
{
"name": "misskey",
"author": "syuilo <i@syuilo.com>",
"version": "4.7.1",
"clientVersion": "1.0.6735",
"version": "4.9.0",
"clientVersion": "1.0.6759",
"codename": "nighthike",
"main": "./built/index.js",
"private": true,
@ -65,7 +65,7 @@
"@types/mocha": "5.2.3",
"@types/mongodb": "3.0.21",
"@types/ms": "0.7.30",
"@types/node": "10.3.4",
"@types/node": "10.3.5",
"@types/nopt": "3.0.29",
"@types/parse5": "5.0.0",
"@types/pug": "2.0.4",
@ -102,7 +102,7 @@
"element-ui": "2.4.1",
"emojilib": "2.2.12",
"escape-regexp": "0.0.1",
"eslint": "4.19.1",
"eslint": "5.0.0",
"eslint-plugin-vue": "4.5.0",
"eventemitter3": "3.1.0",
"exif-js": "2.3.0",
@ -124,7 +124,7 @@
"gulp-typescript": "4.0.2",
"gulp-uglify": "3.0.0",
"gulp-util": "3.0.8",
"hard-source-webpack-plugin": "0.8.1",
"hard-source-webpack-plugin": "0.9.0",
"highlight.js": "9.12.0",
"html-minifier": "3.5.16",
"http-signature": "1.2.0",
@ -193,7 +193,7 @@
"textarea-caret": "3.1.0",
"tmp": "0.0.33",
"ts-loader": "4.4.1",
"ts-node": "6.1.2",
"ts-node": "7.0.0",
"tslint": "5.10.0",
"typescript": "2.9.2",
"typescript-eslint-parser": "16.0.0",

View File

@ -1,7 +1,7 @@
<template>
<div class="mk-google">
<input type="search" v-model="query" :placeholder="q">
<button @click="search">検索</button>
<button @click="search">%fa:search% %i18n:common.search%</button>
</div>
</template>

View File

@ -3,24 +3,33 @@
<header><b>{{ blackUser.name }}</b>() vs <b>{{ whiteUser.name }}</b>()</header>
<div style="overflow: hidden">
<p class="turn" v-if="!iAmPlayer && !game.isEnded">{{ turnUser.name }}のターンです<mk-ellipsis/></p>
<p class="turn" v-if="logPos != logs.length">{{ turnUser.name }}のターン</p>
<p class="turn1" v-if="iAmPlayer && !game.isEnded && !isMyTurn">相手のターンです<mk-ellipsis/></p>
<p class="turn2" v-if="iAmPlayer && !game.isEnded && isMyTurn" v-animate-css="{ classes: 'tada', iteration: 'infinite' }">あなたのターンです</p>
<p class="turn" v-if="!iAmPlayer && !game.isEnded">{{ '%i18n:common.reversi.turn-of%'.replace('{}', turnUser.name) }}<mk-ellipsis/></p>
<p class="turn" v-if="logPos != logs.length">{{ '%i18n:common.reversi.past-turn-of%'.replace('{}', turnUser.name) }}</p>
<p class="turn1" v-if="iAmPlayer && !game.isEnded && !isMyTurn">%i18n:common.reversi.opponent-turn%<mk-ellipsis/></p>
<p class="turn2" v-if="iAmPlayer && !game.isEnded && isMyTurn" v-animate-css="{ classes: 'tada', iteration: 'infinite' }">%i18n:common.reversi.my-turn%</p>
<p class="result" v-if="game.isEnded && logPos == logs.length">
<template v-if="game.winner"><b>{{ game.winner.name }}</b>の勝ち{{ game.settings.isLlotheo ? ' (ロセオ)' : '' }}</template>
<template v-else>引き分け</template>
<template v-else>%i18n:common.reversi.drawn%</template>
</p>
</div>
<div class="board" :style="{ 'grid-template-rows': `repeat(${ game.settings.map.length }, 1fr)`, 'grid-template-columns': `repeat(${ game.settings.map[0].length }, 1fr)` }">
<div v-for="(stone, i) in o.board"
:class="{ empty: stone == null, none: o.map[i] == 'null', isEnded: game.isEnded, myTurn: !game.isEnded && isMyTurn, can: turnUser ? o.canPut(turnUser.id == blackUser.id, i) : null, prev: o.prevPos == i }"
@click="set(i)"
:title="'[' + (o.transformPosToXy(i)[0] + 1) + ', ' + (o.transformPosToXy(i)[1] + 1) + '] (' + i + ')'"
>
<img v-if="stone === true" :src="`${blackUser.avatarUrl}?thumbnail&size=128`" alt="">
<img v-if="stone === false" :src="`${whiteUser.avatarUrl}?thumbnail&size=128`" alt="">
<div class="board">
<div class="labels-x" v-if="this.$store.state.settings.reversiBoardLabels">
<span v-for="i in game.settings.map[0].length">{{ String.fromCharCode(64 + i) }}</span>
</div>
<div class="flex">
<div class="labels-y" v-if="this.$store.state.settings.reversiBoardLabels">
<div v-for="i in game.settings.map.length">{{ i }}</div>
</div>
<div class="cells" :style="cellsStyle">
<div v-for="(stone, i) in o.board"
:class="{ empty: stone == null, none: o.map[i] == 'null', isEnded: game.isEnded, myTurn: !game.isEnded && isMyTurn, can: turnUser ? o.canPut(turnUser.id == blackUser.id, i) : null, prev: o.prevPos == i }"
@click="set(i)"
:title="`${String.fromCharCode(65 + o.transformPosToXy(i)[0])}${o.transformPosToXy(i)[1] + 1}`">
<img v-if="stone === true" :src="`${blackUser.avatarUrl}?thumbnail&size=128`" alt="">
<img v-if="stone === false" :src="`${whiteUser.avatarUrl}?thumbnail&size=128`" alt="">
</div>
</div>
</div>
</div>
@ -92,6 +101,12 @@ export default Vue.extend({
isMyTurn(): boolean {
if (this.turnUser == null) return null;
return this.turnUser.id == this.$store.state.i.id;
},
cellsStyle(): any {
return {
'grid-template-rows': `repeat(${ this.game.settings.map.length }, 1fr)`,
'grid-template-columns': `repeat(${ this.game.settings.map[0].length }, 1fr)`
};
}
},
@ -244,54 +259,97 @@ export default Vue.extend({
border-bottom dashed 1px #c4cdd4
> .board
display grid
grid-gap 4px
width 350px
height 350px
margin 0 auto
> div
background transparent
border-radius 6px
overflow hidden
$label-size = 32px
$gap = 4px
*
pointer-events none
user-select none
> .labels-x
height $label-size
padding-left $label-size
display flex
&.empty
border solid 2px #eee
> *
flex 1
display flex
align-items center
justify-content center
&.empty.can
background #eee
&:first-child
margin-left -($gap / 2)
&.empty.myTurn
border-color #ddd
&:last-child
margin-right -($gap / 2)
&.can
background #eee
cursor pointer
> .flex
display flex
&:hover
border-color darken($theme-color, 10%)
background $theme-color
> .labels-y
width $label-size
display flex
flex-direction column
&:active
background darken($theme-color, 10%)
> *
flex 1
display flex
align-items center
justify-content center
&.prev
box-shadow 0 0 0 4px rgba($theme-color, 0.7)
&:first-child
margin-top -($gap / 2)
&.isEnded
border-color #ddd
&:last-child
margin-bottom -($gap / 2)
&.none
border-color transparent !important
> .cells
flex 1
display grid
grid-gap $gap
> img
display block
width 100%
height 100%
> div
background transparent
border-radius 6px
overflow hidden
*
pointer-events none
user-select none
&.empty
border solid 2px #eee
&.empty.can
background #eee
&.empty.myTurn
border-color #ddd
&.can
background #eee
cursor pointer
&:hover
border-color darken($theme-color, 10%)
background $theme-color
&:active
background darken($theme-color, 10%)
&.prev
box-shadow 0 0 0 4px rgba($theme-color, 0.7)
&.isEnded
border-color #ddd
&.none
border-color transparent !important
> img
display block
width 100%
height 100%
> .graph
display grid

View File

@ -10,7 +10,7 @@
</div>
</div>
<div class="index" v-else>
<h1>Misskey %fa:circle%thell%fa:circle R%</h1>
<h1>Misskey Reversi</h1>
<p>他のMisskeyユーザーとリバーシで対戦しよう</p>
<div class="play">
<el-button round>フリーマッチ(準備中)</el-button>

View File

@ -54,6 +54,7 @@
<mk-switch v-model="$store.state.settings.showMaps" @change="onChangeShowMaps" text="%i18n:@show-maps%">
<span>%i18n:@show-maps-desc%</span>
</mk-switch>
<mk-switch v-model="$store.state.settings.reversiBoardLabels" @change="onChangeReversiBoardLabels" text="%i18n:common.show-reversi-board-labels%"/>
</section>
<section class="web" v-show="page == 'web'">
@ -369,6 +370,12 @@ export default Vue.extend({
value: v
});
},
onChangeReversiBoardLabels(v) {
this.$store.dispatch('settings/set', {
key: 'reversiBoardLabels',
value: v
});
},
onChangeGradientWindowHeader(v) {
this.$store.dispatch('settings/set', {
key: 'gradientWindowHeader',

View File

@ -5,19 +5,32 @@
<div class="fade"></div>
<div class="title">
<p class="name">{{ user | userName }}</p>
<p class="username"><mk-acct :user="user"/></p>
<p class="location" v-if="user.host === null && user.profile.location">%fa:map-marker%{{ user.profile.location }}</p>
<div>
<p v-if="user.isBot" title="%i18n:@is-bot%">%fa:robot%</p>
<p class="username"><mk-acct :user="user"/></p>
<p class="location" v-if="user.host === null && user.profile.location">%fa:map-marker% {{ user.profile.location }}</p>
<p class="birthday" v-if="user.host === null && user.profile.birthday">%fa:birthday-cake% {{ user.profile.birthday.replace('-', '').replace('-', '') + '' }} ({{ age }})</p>
</div>
</div>
</div>
<mk-avatar class="avatar" :user="user" :disable-preview="true"/>
<div class="body">
<misskey-flavored-markdown v-if="user.description" :text="user.description" :i="$store.state.i"/>
<div class="description">
<misskey-flavored-markdown v-if="user.description" :text="user.description" :i="$store.state.i"/>
</div>
<div class="status">
<span class="notes-count"><b>{{ user.notesCount | number }}</b>%i18n:@posts%</span>
<span class="following clickable" @click="showFollowing"><b>{{ user.followingCount | number }}</b>%i18n:@following%</span>
<span class="followers clickable" @click="showFollowers"><b>{{ user.followersCount | number }}</b>%i18n:@followers%</span>
</div>
</div>
</div>
</template>
<script lang="ts">
import Vue from 'vue';
import MkFollowingWindow from '../../components/following-window.vue';
import MkFollowersWindow from '../../components/followers-window.vue';
export default Vue.extend({
props: ['user'],
@ -64,7 +77,19 @@ export default Vue.extend({
(this as any).apis.updateBanner().then(i => {
this.user.bannerUrl = i.bannerUrl;
});
}
},
showFollowing() {
(this as any).os.new(MkFollowingWindow, {
user: this.user
});
},
showFollowers() {
(this as any).os.new(MkFollowersWindow, {
user: this.user
});
},
}
});
</script>
@ -118,7 +143,6 @@ root(isDark)
width 100%
padding 0 0 8px 154px
color #5e6367
font-family '游ゴシック', 'YuGothic', 'ヒラギノ角ゴ ProN W3', 'Hiragino Kaku Gothic ProN', 'Meiryo', 'メイリオ', sans-serif
> .name
display block
@ -127,15 +151,12 @@ root(isDark)
font-weight bold
font-size 1.8em
> .username
> .location
display inline-block
margin 0 16px 0 0
line-height 20px
opacity 0.8
> i
margin-right 4px
> div
> *
display inline-block
margin 0 16px 0 0
line-height 20px
opacity 0.8
> .avatar
display block
@ -151,6 +172,32 @@ root(isDark)
padding 16px 16px 16px 154px
color isDark ? #c5ced6 : #555
> .status
margin-top 16px
padding-top 16px
border-top solid 1px rgba(#000, isDark ? 0.2 : 0.1)
font-size 80%
> *
display inline-block
padding-right 16px
margin-right 16px
&:not(:last-child)
border-right solid 1px rgba(#000, isDark ? 0.2 : 0.1)
&.clickable
cursor pointer
&:hover
color isDark ? #fff : #000
> b
margin-right 4px
font-size 1rem
font-weight bold
color $theme-color
.header[data-darkmode]
root(true)

View File

@ -15,25 +15,12 @@
</button>
<button class="mute ui" @click="list">%fa:list% リストに追加</button>
</div>
<div class="birthday" v-if="user.host === null && user.profile.birthday">
<p>%fa:birthday-cake%{{ user.profile.birthday.replace('-', '年').replace('-', '月') + '日' }} ({{ age }})</p>
</div>
<div class="twitter" v-if="user.host === null && user.twitter">
<p>%fa:B twitter%<a :href="`https://twitter.com/${user.twitter.screenName}`" target="_blank">@{{ user.twitter.screenName }}</a></p>
</div>
<div class="status">
<p class="notes-count">%fa:angle-right%<a>{{ user.notesCount }}</a><b>投稿</b></p>
<p class="following">%fa:angle-right%<a @click="showFollowing">{{ user.followingCount }}</a>人を<b>フォロー</b></p>
<p class="followers">%fa:angle-right%<a @click="showFollowers">{{ user.followersCount }}</a>人の<b>フォロワー</b></p>
</div>
</div>
</template>
<script lang="ts">
import Vue from 'vue';
import * as age from 's-age';
import MkFollowingWindow from '../../components/following-window.vue';
import MkFollowersWindow from '../../components/followers-window.vue';
import MkUserListsWindow from '../../components/user-lists-window.vue';
export default Vue.extend({
@ -44,17 +31,6 @@ export default Vue.extend({
}
},
methods: {
showFollowing() {
(this as any).os.new(MkFollowingWindow, {
user: this.user
});
},
showFollowers() {
(this as any).os.new(MkFollowersWindow, {
user: this.user
});
},
stalk() {
(this as any).api('following/stalk', {
@ -152,40 +128,6 @@ root(isDark)
&:not(:last-child)
margin-bottom 12px
> .birthday
padding 16px
color isDark ? #e3e7ea : #555
border-bottom solid 1px isDark ? #21242f : #eee
> p
margin 0
> i
margin-right 8px
> .twitter
padding 16px
color isDark ? #e3e7ea : #555
border-bottom solid 1px isDark ? #21242f : #eee
> p
margin 0
> i
margin-right 8px
> .status
padding 16px
color isDark ? #e3e7ea : #555
border-bottom solid 1px isDark ? #21242f : #eee
> p
margin 8px 0
> i
margin-left 8px
margin-right 8px
.profile[data-darkmode]
root(true)

View File

@ -0,0 +1,21 @@
<template>
<div class="adsvaidqfznoartcbplullnejvxjphcn">
<p>%fa:B twitter%<a :href="`https://twitter.com/${user.twitter.screenName}`" target="_blank">@{{ user.twitter.screenName }}</a></p>
</div>
</template>
<script lang="ts">
import Vue from 'vue';
export default Vue.extend({
props: ['user']
});
</script>
<style lang="stylus" scoped>
.adsvaidqfznoartcbplullnejvxjphcn
padding 32px
background #1a94f2
color #fff
</style>

View File

@ -11,6 +11,7 @@
</div>
<div class="side">
<x-profile :user="user"/>
<a-twitter :user="user" v-if="user.host === null && user.twitter"/>
<mk-calendar @chosen="warp" :start="new Date(user.createdAt)"/>
<mk-activity :user="user"/>
<x-photos :user="user"/>
@ -35,6 +36,7 @@ import XProfile from './user.profile.vue';
import XPhotos from './user.photos.vue';
import XFollowersYouKnow from './user.followers-you-know.vue';
import XFriends from './user.friends.vue';
import XTwitter from './user.twitter.vue';
export default Vue.extend({
components: {
@ -43,7 +45,8 @@ export default Vue.extend({
XProfile,
XPhotos,
XFollowersYouKnow,
XFriends
XFriends,
XTwitter
},
data() {
return {

View File

@ -13,6 +13,7 @@
<ui-switch v-model="darkmode">%i18n:@dark-mode%</ui-switch>
<ui-switch v-model="$store.state.settings.circleIcons" @change="onChangeCircleIcons">%i18n:@circle-icons%</ui-switch>
<ui-switch v-model="$store.state.settings.iLikeSushi" @change="onChangeILikeSushi">%i18n:common.i-like-sushi%</ui-switch>
<ui-switch v-model="$store.state.settings.reversiBoardLabels" @change="onChangeReversiBoardLabels">%i18n:common.show-reversi-board-labels%</ui-switch>
<div>
<div>%i18n:@timeline%</div>
@ -182,6 +183,13 @@ export default Vue.extend({
});
},
onChangeReversiBoardLabels(v) {
this.$store.dispatch('settings/set', {
key: 'reversiBoardLabels',
value: v
});
},
onChangeShowReplyTarget(v) {
this.$store.dispatch('settings/set', {
key: 'showReplyTarget',

View File

@ -19,7 +19,8 @@ const defaultSettings = {
loadRemoteMedia: true,
disableViaMobile: false,
memo: null,
iLikeSushi: false
iLikeSushi: false,
reversiBoardLabels: false
};
const defaultDeviceSettings = {

View File

@ -9,7 +9,7 @@ export type TextElementSearch = {
};
export default function(text: string) {
const match = text.match(/^(.+?) 検索(\n|$)/);
const match = text.match(/^(.+?) (検索|Search)(\n|$)/i);
if (!match) return null;
return {
type: 'search',

View File

@ -47,16 +47,28 @@ export async function createPerson(value: any, resolver?: Resolver): Promise<IUs
const object = await resolver.resolve(value) as any;
if (
object == null ||
object.type !== 'Person' ||
typeof object.preferredUsername !== 'string' ||
typeof object.inbox !== 'string' ||
!validateUsername(object.preferredUsername) ||
!isValidName(object.name == '' ? null : object.name)
) {
log(`invalid person: ${JSON.stringify(object, null, 2)}`);
throw new Error('invalid person');
if (object == null) {
throw new Error('invalid person: object is null');
}
if (object.type != 'Person' && object.type != 'Service') {
throw new Error('invalid person: object is not a person or service');
}
if (typeof object.preferredUsername !== 'string') {
throw new Error('invalid person: preferredUsername is not a string');
}
if (typeof object.inbox !== 'string') {
throw new Error('invalid person: inbox is not a string');
}
if (!validateUsername(object.preferredUsername)) {
throw new Error('invalid person: invalid username');
}
if (!isValidName(object.name == '' ? null : object.name)) {
throw new Error('invalid person: invalid name');
}
const person: IPerson = object;
@ -81,6 +93,8 @@ export async function createPerson(value: any, resolver?: Resolver): Promise<IUs
const host = toUnicode(finger.subject.replace(/^.*?@/, '')).toLowerCase();
const isBot = object.type == 'Service';
// Create user
let user: IRemoteUser;
try {
@ -105,7 +119,8 @@ export async function createPerson(value: any, resolver?: Resolver): Promise<IUs
inbox: person.inbox,
endpoints: person.endpoints,
uri: person.id,
url: person.url
url: person.url,
isBot
}) as IRemoteUser;
} catch (e) {
// duplicate key error

View File

@ -7,7 +7,7 @@ export default (user: ILocalUser) => {
const id = `${config.url}/users/${user._id}`;
return {
type: 'Person',
type: user.isBot ? 'Service' : 'Person',
id,
inbox: `${id}/inbox`,
outbox: `${id}/outbox`,

View File

@ -93,6 +93,28 @@ describe('Text', () => {
assert.equal(tokens[0].type, 'inline-code');
assert.equal(tokens[0].content, '`var x = "Strawberry Pasta";`');
});
it('search', () => {
const tokens1 = analyze('a b c 検索');
assert.deepEqual([
{ type: 'search', content: 'a b c 検索', query: 'a b c'}
], tokens1);
const tokens2 = analyze('a b c Search');
assert.deepEqual([
{ type: 'search', content: 'a b c Search', query: 'a b c'}
], tokens2);
const tokens3 = analyze('a b c search');
assert.deepEqual([
{ type: 'search', content: 'a b c search', query: 'a b c'}
], tokens3);
const tokens4 = analyze('a b c SEARCH');
assert.deepEqual([
{ type: 'search', content: 'a b c SEARCH', query: 'a b c'}
], tokens4);
});
});
describe('syntax highlighting', () => {